diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-07-19 12:48:32 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-07-19 12:48:32 +0200 |
| commit | 36b9c39bc3a157097f9f7bdcf9177f605dec56a0 (patch) | |
| tree | 9a19cd36ce6d8ba8a44517fe237aac9aac2e0bb2 /src | |
| parent | 4275b75df56171f9886cadf73ee66e1abb62071d (diff) | |
| download | GT5-Unofficial-36b9c39bc3a157097f9f7bdcf9177f605dec56a0.tar.gz GT5-Unofficial-36b9c39bc3a157097f9f7bdcf9177f605dec56a0.tar.bz2 GT5-Unofficial-36b9c39bc3a157097f9f7bdcf9177f605dec56a0.zip | |
Revert "try to ignore unification for steve carts metals"
This reverts commit 4275b75df56171f9886cadf73ee66e1abb62071d.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 9378ed1b05..6477b47191 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -1737,15 +1737,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } else if (tOre.mModID.equalsIgnoreCase("appliedenergistics2") && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.CertusQuartz) { GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; - } else if (tOre.mModID.equalsIgnoreCase("StevesCarts") && tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.Reinforced) { - GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); - GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; - } else if (tOre.mModID.equalsIgnoreCase("StevesCarts") && tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.Galgadorian) { - GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); - GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; - } else if (tOre.mModID.equalsIgnoreCase("StevesCarts") && tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.EnhancedGalgadorian) { - GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); - GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; } } if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) { |