Merge branch 'kotlin-1.8' into kotlin-1.9

2016-05-16 12:16:48 +02:00
parent 626bc69dad 6903bd2de2
commit 69db3d6608
4 changed files with 7 additions and 1 deletions
--- a/src/main/kotlin/mods/betterfoliage/client/texture/LeafRegistry.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/texture/LeafRegistry.kt
@@ -47,6 +47,7 @@ object LeafRegistry : BlockTextureInspector<TextureAtlasSprite>() {

    init {
        matchClassAndModel(Config.blocks.leaves, "minecraft:block/leaves", listOf("all"))
+        matchClassAndModel(Config.blocks.leaves, "minecraft:block/cube_all", listOf("all"))
    }

    operator fun get(state: IBlockState, world: IBlockAccess, pos: BlockPos, face: EnumFacing): LeafInfo? {