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/octarinecore/client/render/AbstractBlockRenderingHandler.kt
+++ b/src/main/kotlin/mods/octarinecore/client/render/AbstractBlockRenderingHandler.kt
@@ -33,7 +33,7 @@ val blockColors = ThreadLocal<BlockColors>()

 abstract class AbstractBlockRenderingHandler(modId: String) : ResourceHandler(modId) {

-    open val moveToCutout: Boolean get() = true
+    open val addToCutout: Boolean get() = true

    // ============================
    // Custom rendering