Merge branch 'kotlin-1.8' into kotlin-1.8.8

This commit is contained in:
octarine-noise committed 2016-01-30 00:58:41 +01:00
commit 0a6c433530
8 files changed
+29 -10

No files matched your search

@@ -10,7 +10,7 @@ mods.natura.blocks.trees.LogTwoxTwo
mods.natura.blocks.trees.SimpleLog
// Thaumcraft
thaumcraft.common.blocks.BlockMagicalLog
thaumcraft.common.blocks.world.plants.BlockLogsTC
// Forestry
forestry.arboriculture.gadgets.BlockLog