Merge branch 'kotlin-1.8' into kotlin-1.9

2016-04-19 21:00:48 +02:00
parent c0685d829b a6cc354965
commit f37cb273f1
8 changed files with 27 additions and 10 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) {

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

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