diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-09-03 17:57:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-03 17:57:34 +0200 |
| commit | 6df7f36bd91815c71881aed11dc8b37975823736 (patch) | |
| tree | 19fdb02e6c7f3435c8c39136ce73337ef5e14b7e /src/main/java/gregtech/GT_Mod.java | |
| parent | 5e87d49f2954f22fd830383420cc5d27e7378160 (diff) | |
| parent | a6a74841389345b08e68d678e454dd76a46cc2a4 (diff) | |
| download | GT5-Unofficial-6df7f36bd91815c71881aed11dc8b37975823736.tar.gz GT5-Unofficial-6df7f36bd91815c71881aed11dc8b37975823736.tar.bz2 GT5-Unofficial-6df7f36bd91815c71881aed11dc8b37975823736.zip | |
Merge branch 'unstable' into CircuitChemistryUpdateFollowup
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 1502024deb..eb51de7e96 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -271,6 +271,7 @@ public class GT_Mod implements IGT_Mod { gregtechproxy.mForceFreeFace = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "forceFreeFace",false);
gregtechproxy.mEasierIVPlusCables = tMainConfig.get("general", "EasierIVPlusCables", false).getBoolean(false);
gregtechproxy.mBrickedBlastFurnace = tMainConfig.get("general", "BrickedBlastFurnace", true).getBoolean(true);
+ gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre = tMainConfig.get("general", "MixedOreOnlyYieldsTwoThirdsOfPureOre", false).getBoolean(false);
gregtechproxy.enableBlackGraniteOres = GregTech_API.sWorldgenFile.get("general", "enableBlackGraniteOres", gregtechproxy.enableBlackGraniteOres);
gregtechproxy.enableRedGraniteOres = GregTech_API.sWorldgenFile.get("general", "enableRedGraniteOres", gregtechproxy.enableRedGraniteOres);
gregtechproxy.enableMarbleOres = GregTech_API.sWorldgenFile.get("general", "enableMarbleOres", gregtechproxy.enableMarbleOres);
|