diff options
author | Dream-Master <dream-master@gmx.net> | 2017-08-01 10:19:12 +0200 |
---|---|---|
committer | Dream-Master <dream-master@gmx.net> | 2017-08-01 10:19:12 +0200 |
commit | 1ceb02303dbb0952618f7fe01028871934a9cb00 (patch) | |
tree | 827a6f3055e797b5c884e2c8f78dcca3a8c52c28 /src/main/java/gregtech/GT_Mod.java | |
parent | a3265450b750907ba36c4e8d78dd65b188a47682 (diff) | |
parent | fe11172e01fcc378f9979c41de598c2255e80064 (diff) | |
download | GT5-Unofficial-1ceb02303dbb0952618f7fe01028871934a9cb00.tar.gz GT5-Unofficial-1ceb02303dbb0952618f7fe01028871934a9cb00.tar.bz2 GT5-Unofficial-1ceb02303dbb0952618f7fe01028871934a9cb00.zip |
Merge branch 'experimental-test' into experimental
Diffstat (limited to 'src/main/java/gregtech/GT_Mod.java')
-rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 64486af72f..cd980e9543 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -276,6 +276,7 @@ public class GT_Mod implements IGT_Mod { 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); + gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre = tMainConfig.get("general", "MixedOreOnlyYieldsTwoThirdsOfPureOre", 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 |