Merge branch 'kotlin-1.10' into kotlin-1.11.2

2017-07-05 15:09:28 +02:00
parent 61076789db 813719c7f2
commit 6c98940d3e
17 changed files with 49 additions and 28 deletions
--- a/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt
@@ -20,7 +20,7 @@ import net.minecraftforge.fml.relauncher.SideOnly

 class RenderLog : AbstractRenderColumn(BetterFoliageMod.MOD_ID) {

-    override val moveToCutout: Boolean get() = false
+    override val addToCutout: Boolean get() = false

    override fun isEligible(ctx: BlockContext) =
        Config.enabled && Config.roundLogs.enabled &&