Merge branch 'kotlin-1.8' into kotlin-1.8.8

2016-01-30 12:24:50 +01:00
parent 0a6c433530 b246c7acd0
commit ef574a13ac
6 changed files with 13 additions and 9 deletions
--- a/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt
@@ -28,7 +28,7 @@ class RenderLog : AbstractRenderColumn(BetterFoliageMod.MOD_ID) {
            "x" -> Axis.X
            "y" -> Axis.Y
            "z" -> Axis.Z
-            else -> null
+            else -> if (Config.roundLogs.defaultY) Axis.Y else null
        }
    }