Merge branch 'master' into 1.12

2017-10-03 16:45:30 +02:00 · 2017-10-03 16:45:30 +02:00 · c2f348b209
commit c2f348b209
parent 88794b0986 416124c9d2
1 changed files with 1 additions and 0 deletions
--- a/src/main/java/tschipp/carryon/common/config/Configs.java
+++ b/src/main/java/tschipp/carryon/common/config/Configs.java
@ -100,6 +100,7 @@ public class Configs {
    					"forestry:*",
    					"tconstruct:*",
    					"rustic:*",
+    					"botania:*",
    					"quark:colored_bed_*",
    					"immersiveengineering:*",
    					"embers:block_furnace",