aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/GT_Mod.java
diff options
context:
space:
mode:
authorMauveCloud <mauvecloud@yahoo.com>2017-03-22 10:23:13 -0700
committerMauveCloud <mauvecloud@yahoo.com>2017-03-22 10:23:13 -0700
commite8c819e75fb5cc03eb798442a680b36a04f2a765 (patch)
treee1435dee357acfabf79ad937a9c90d68e817f653 /src/main/java/gregtech/GT_Mod.java
parentd7203bccbde715d006783615c4c05a646d58ccaa (diff)
parentf4dae834dacbac9d765ad597681a53fc067da674 (diff)
downloadGT5-Unofficial-e8c819e75fb5cc03eb798442a680b36a04f2a765.tar.gz
GT5-Unofficial-e8c819e75fb5cc03eb798442a680b36a04f2a765.tar.bz2
GT5-Unofficial-e8c819e75fb5cc03eb798442a680b36a04f2a765.zip
Merge remote-tracking branch 'refs/remotes/Blood-Asp/unstable' into unstable
Diffstat (limited to 'src/main/java/gregtech/GT_Mod.java')
-rw-r--r--src/main/java/gregtech/GT_Mod.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 4ad00b4f78..4a068f752d 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -263,6 +263,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");
+ GregTech_API.mUseOnlyGoodSolderingMaterials = GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "useonlygoodsolderingmaterials", GregTech_API.mUseOnlyGoodSolderingMaterials);
+
if (tMainConfig.get("general", "hardermobspawners", true).getBoolean(true)) {
Blocks.mob_spawner.setHardness(500.0F).setResistance(6000000.0F);
}