diff options
author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2018-06-30 01:18:46 +0200 |
---|---|---|
committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2018-06-30 01:18:46 +0200 |
commit | 6a941c29254865f6dd89c5653df70f47af7e2799 (patch) | |
tree | 198f5e6893e7bd3cb4a9ea3c0f5548cfa201a299 /src/main/java/gregtech/api | |
parent | 5d09316f9aa2d6a633fc8518207a44e3a7662fd4 (diff) | |
download | GT5-Unofficial-6a941c29254865f6dd89c5653df70f47af7e2799.tar.gz GT5-Unofficial-6a941c29254865f6dd89c5653df70f47af7e2799.tar.bz2 GT5-Unofficial-6a941c29254865f6dd89c5653df70f47af7e2799.zip |
pulled small ores into code
-removed config for custom ores
-removed immensive engineering support
-removed magneticraft support
-removed PFAAGeologica support
+added small ores for GaGreg
+version bump
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r-- | src/main/java/gregtech/api/util/GT_ModHandler.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index 8891126b48..6cfd539c68 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -598,14 +598,14 @@ public class GT_ModHandler { } public static boolean addImmersiveEngineeringRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, int aChance2, ItemStack aOutput3, int aChance3){ - if(GregTech_API.mImmersiveEngineering && GT_Mod.gregtechproxy.mImmersiveEngineeringRecipes){ + /*if(GregTech_API.mImmersiveEngineering && GT_Mod.gregtechproxy.mImmersiveEngineeringRecipes){ blusunrize.immersiveengineering.common.IERecipes.addCrusherRecipe(aOutput1, aInput, 6000, aOutput2, 0.15f); - } + }*/ return true; } public static boolean addMagneticraftRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, int aChance2, ItemStack aOutput3, int aChance3){ - if(GregTech_API.mMagneticraft && GT_Mod.gregtechproxy.mMagneticraftRecipes){ + /* if(GregTech_API.mMagneticraft && GT_Mod.gregtechproxy.mMagneticraftRecipes){ ItemData tData = GT_OreDictUnificator.getAssociation(aInput); if(tData!=null&&tData.mPrefix!=null){ if(tData.mPrefix==OrePrefixes.ore||tData.mPrefix==OrePrefixes.oreBlackgranite||tData.mPrefix==OrePrefixes.oreEndstone||tData.mPrefix==OrePrefixes.oreNetherrack||tData.mPrefix==OrePrefixes.oreRedgranite){ @@ -615,6 +615,7 @@ public class GT_ModHandler { } } } + */ return true; } |