Merge branch 'kotlin-1.10' into kotlin-1.11.2

src/main/resources/assets/betterfoliage/grass_models_default.cfg

@@ -1,2 +1,6 @@
+// Vanilla
 block/grass,top
 block/cube_bottom_top,top
+
+// Lithos Core
+block/soil/grass_master,top

src/main/resources/assets/betterfoliage/lang/en_us.lang

@@ -2,6 +2,8 @@ key.betterfoliage.gui=Open Settings
 
 betterfoliage.global.enabled=Enable Mod
 betterfoliage.global.enabled.tooltip=If set to false, BetterFoliage will not render anything
+betterfoliage.global.nVidia=nVidia GPU
+betterfoliage.global.nVidia.tooltip=Specify whether you have an nVidia GPU
 
 betterfoliage.enabled=Enable
 betterfoliage.enabled.tooltip=Is this feature enabled?
@@ -92,6 +94,19 @@ betterfoliage.blocks.cactusBlacklist.arrayEntry=%d entries
 betterfoliage.blocks.cactusWhitelist.tooltip=Blocks recognized as Cactus. Has an impact on Better Cactus
 betterfoliage.blocks.cactusBlacklist.tooltip=Blocks never accepted Cactus. Has an impact on Better Cactus
 
+betterfoliage.blocks.myceliumWhitelist=Mycelium Whitelist
+betterfoliage.blocks.myceliumBlacklist=Mycelium Blacklist
+betterfoliage.blocks.myceliumWhitelist.arrayEntry=%d entries
+betterfoliage.blocks.myceliumBlacklist.arrayEntry=%d entries
+betterfoliage.blocks.myceliumWhitelist.tooltip=Blocks recognized as Mycelium. Has an impact on Better Grass
+betterfoliage.blocks.myceliumBlacklist.tooltip=Blocks never accepted Mycelium. Has an impact on Better Grass
+
+betterfoliage.blocks.netherrackWhitelist=Netherrack Whitelist
+betterfoliage.blocks.netherrackBlacklist=Netherrack Blacklist
+betterfoliage.blocks.netherrackWhitelist.arrayEntry=%d entries
+betterfoliage.blocks.netherrackBlacklist.arrayEntry=%d entries
+betterfoliage.blocks.netherrackWhitelist.tooltip=Blocks recognized as Netherrack. Has an impact on Netherrack Vines
+betterfoliage.blocks.netherrackBlacklist.tooltip=Blocks never accepted Netherrack. Has an impact on Netherrack Vines
 
 betterfoliage.leaves=Extra Leaves
 betterfoliage.leaves.tooltip=Extra round leaves on leaf blocks

src/main/resources/assets/betterfoliage/log_models_default.cfg

@@ -1,5 +1,12 @@
+// Vanilla
 block/column_side,end,end,side
 block/cube_column,end,end,side
 block/cube_all,all,all,all
 
+// Agricultural Revolution
 agriculturalrevolution:block/palmlog,top,top,texture
+
+// Lithos Core
+block/column_top,end,end,side_a,side_b
+block/column_side_x,end,end,side_a,side_b
+block/column_side_z,end,end,side_a,side_b

src/main/resources/assets/betterfoliage/mycelium_blocks_default.cfg

@@ -0,0 +1,5 @@
+// Vanilla
+net.minecraft.block.BlockMycelium
+
+// NetherEx
+nex.block.BlockMycelium

src/main/resources/assets/betterfoliage/netherrack_blocks_default.cfg

@@ -0,0 +1,5 @@
+// Vanilla
+net.minecraft.block.BlockNetherrack
+
+// NetherEx
+nex.block.BlockNetherrack