Merge branch 'kotlin-1.10' into kotlin-1.11.2

2017-08-12 18:57:10 +02:00
parent e29d224df4 3b7c44b062
commit 50399052b0
25 changed files with 280 additions and 135 deletions
--- a/src/main/resources/assets/betterfoliage/log_models_default.cfg
+++ b/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