diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-06-24 20:36:08 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-06-24 20:36:08 +0200 |
| commit | de5992daf970326153eb713fe7587d044eae2fda (patch) | |
| tree | bae77aa181a1c955d5bacfb1f8716315d0c9639e /src/main/java/gregtech/GT_Mod.java | |
| parent | e401ef5f788e131114b618a140a562e2633faa2a (diff) | |
| parent | c2eaf942e3d2fc62272caa27162a6ad253af153d (diff) | |
| download | GT5-Unofficial-de5992daf970326153eb713fe7587d044eae2fda.tar.gz GT5-Unofficial-de5992daf970326153eb713fe7587d044eae2fda.tar.bz2 GT5-Unofficial-de5992daf970326153eb713fe7587d044eae2fda.zip | |
Merge branch 'BrickedBlastFurnace' into experimental
Diffstat (limited to 'src/main/java/gregtech/GT_Mod.java')
| -rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 1c8e8bf6c1..d6295cb82c 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -264,7 +264,7 @@ public class GT_Mod implements IGT_Mod { Calendar now = Calendar.getInstance(); gregtechproxy.mAprilFool = GregTech_API.sSpecialFile.get(ConfigCategories.general, "AprilFool", now.get(Calendar.MONTH) == Calendar.APRIL && now.get(Calendar.DAY_OF_MONTH) == 1); gregtechproxy.mCropNeedBlock = tMainConfig.get("general", "CropNeedBlockBelow", true).getBoolean(true); - gregtechproxy.mReenableSimplifiedChemicalRecipes = tMainConfig.get("general", "ReenableSimplifiedChemicalRecipes", false).getBoolean(false); + gregtechproxy.mReenableSimplifiedChemicalRecipes = tMainConfig.get("general", "ReenableSimplifiedChemicalRecipes", true).getBoolean(false); gregtechproxy.mAMHInteraction = tMainConfig.get("general", "AllowAutoMaintenanceHatchInteraction", false).getBoolean(false); GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", true); GregTech_API.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false); @@ -273,6 +273,8 @@ public class GT_Mod implements IGT_Mod { GregTech_API.mRFExplosions = GregTech_API.sOPStuff.get(ConfigCategories.general, "RFExplosions", false); GregTech_API.meIOLoaded = Loader.isModLoaded("EnderIO"); gregtechproxy.mForceFreeFace = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "forceFreeFace",true); + gregtechproxy.mBrickedBlastFurnace = tMainConfig.get("general", "BrickedBlastFurnace", true).getBoolean(true); + gregtechproxy.mEasierEVPlusCables = tMainConfig.get("general", "EasierEVPlusCables", false).getBoolean(false); GregTech_API.mUseOnlyGoodSolderingMaterials = GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "useonlygoodsolderingmaterials", GregTech_API.mUseOnlyGoodSolderingMaterials); gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties.get("havestLevel", "activateHarvestLevelChange", false);//TODO CHECK |