diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-09-13 11:18:35 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-09-13 11:20:47 +0200 |
| commit | 1f8415223bc693eafedb9a145ec228004890cb28 (patch) | |
| tree | be44bc1e781dc094503d4c0e452a88a6a3d7fe96 /src/main/java/gregtech | |
| parent | f8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35 (diff) | |
| download | GT5-Unofficial-1f8415223bc693eafedb9a145ec228004890cb28.tar.gz GT5-Unofficial-1f8415223bc693eafedb9a145ec228004890cb28.tar.bz2 GT5-Unofficial-1f8415223bc693eafedb9a145ec228004890cb28.zip | |
Revert "cherry pick"
This reverts commit 493cce8427b46fd27c77e822297491acb9b42fe6.
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 8 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 47fdd895dd..3d6bae86dc 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -21,7 +21,6 @@ import gregtech.common.GT_DummyWorld; import gregtech.common.GT_Network; import gregtech.common.GT_Proxy; import gregtech.common.GT_RecipeAdder; -import gregtech.common.blocks.GT_Block_Ores_Abstract; import gregtech.common.entities.GT_Entity_Arrow; import gregtech.common.entities.GT_Entity_Arrow_Potion; import gregtech.common.items.GT_MetaGenerated_Tool_01; @@ -283,13 +282,6 @@ public class GT_Mod implements IGT_Mod { gregtechproxy.enableMarbleOres = GregTech_API.sWorldgenFile.get("general", "enableMarbleOres", gregtechproxy.enableMarbleOres); gregtechproxy.enableBasaltOres = GregTech_API.sWorldgenFile.get("general", "enableBasaltOres", gregtechproxy.enableBasaltOres); - Materials[] tDisableOres = new Materials[]{Materials.Chrome, Materials.Naquadria, Materials.Silicon, Materials.Cobalt, Materials.Cadmium, Materials.Indium, Materials.Tungsten, - Materials.Adamantium, Materials.Mithril, Materials.DarkIron, Materials.Rutile, Materials.Alduorite, Materials.Magnesium, Materials.Nikolite}; - for(Materials tMat : tDisableOres){ - if(!GregTech_API.sMaterialComponents.get("disableLaserDrillOres", tMat.mName, false)) - GT_Block_Ores_Abstract.aBlockedOres.add(tMat); - } - 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 if(gregtechproxy.mChangeHarvestLevels) { diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index 6304755e85..7ef9b42ef9 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -79,7 +79,6 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa Materials.ShadowIron.mHasParentMod = false; Materials.ShadowSteel.mHasParentMod = false; Materials.AstralSilver.mHasParentMod = false; - Materials.Adamantium.mHasParentMod = false; Materials.Trinium.mHasParentMod = false; } if (!aEnableThaumcraftMats) { |