Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ellpeck 2017-06-16 22:14:56 +02:00
commit e34cef7744
2 changed files with 3 additions and 1 deletions

View file

@ -35,3 +35,5 @@ deanwhufc=actuallyadditions:itemCrystalEmpowered@2
witsend66=actuallyadditions:itemCrystalEmpowered@1
broccoli_bob=actuallyadditions:itemCrystal@3
dolinmyster=actuallyadditions:itemCrystalEmpowered@4
savos_darkran=actuallyadditions:itemCrystal@4
flanks255=actuallyadditions:itemCrystalEmpowered@3

View file

@ -28,7 +28,7 @@ public enum ConfigBoolValues{
DO_RICE_GEN("Rice Gen", ConfigCategories.WORLD_GEN, true, "Should Rice generate in the World?"),
DO_CANOLA_GEN("Canola Gen", ConfigCategories.WORLD_GEN, true, "Should Canola generate in the World?"),
DO_FLAX_GEN("Flax Gen", ConfigCategories.WORLD_GEN, true, "Should Canola generate in the World?"),
DO_FLAX_GEN("Flax Gen", ConfigCategories.WORLD_GEN, true, "Should Flax generate in the World?"),
DO_COFFEE_GEN("Coffee Gen", ConfigCategories.WORLD_GEN, true, "Should Coffee Plants generate in the World?"),
DO_LOTUS_GEN("Black Lotus Gen", ConfigCategories.WORLD_GEN, true, "Should Black Lotus generate in the World?"),
DO_TREASURE_CHEST_GEN("Treasure Chest Gen", ConfigCategories.WORLD_GEN, true, "Should Treasure Chests generate in the World?"),