aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-11-25 21:45:11 +0100
committerDream-Master <dream-master@gmx.net>2017-11-28 19:07:46 +0100
commitbae94274653b9b0cddf5c8c2b83967e23733ef47 (patch)
tree44a402fd82393790e8ed4838c483adc6a1b30d55 /src/main/java/gregtech/api
parenta3cf54ad0389d54651f8458d2ee3c8e55acbe58f (diff)
downloadGT5-Unofficial-bae94274653b9b0cddf5c8c2b83967e23733ef47.tar.gz
GT5-Unofficial-bae94274653b9b0cddf5c8c2b83967e23733ef47.tar.bz2
GT5-Unofficial-bae94274653b9b0cddf5c8c2b83967e23733ef47.zip
cherry pick
Commit: 0305f8626e4d99bdc406ebba276a2183059fdfe8 [0305f86] Oredict fixes
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index 5f8ea2f655..1b918e9000 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -707,8 +707,9 @@ public enum OrePrefixes {
aMaterial == Materials.AnnealedCopper || aMaterial == Materials.Steel || aMaterial == Materials.Copper || aMaterial == Materials.YttriumBariumCuprate
|| aMaterial == Materials.VanadiumGallium || aMaterial == Materials.NiobiumTitanium || aMaterial == Materials.Naquadah || aMaterial == Materials.Manganese ||
aMaterial == Materials.Plastic || aMaterial == Materials.Silicone || aMaterial == Materials.PolyvinylChloride || aMaterial == Materials.PolyphenyleneSulfide ||
- aMaterial == Materials.Nichrome || aMaterial == Materials.BlackSteel || aMaterial == Materials.Titanium || aMaterial == Materials.TungstenSteel ||
- aMaterial == Materials.Tungsten || aMaterial == Materials.HSSG || aMaterial == Materials.NaquadahAlloy || aMaterial == Materials.Duranium))
+ aMaterial == Materials.Nichrome || aMaterial == Materials.BlackSteel || aMaterial == Materials.Titanium || aMaterial == Materials.TungstenSteel ||
+ aMaterial == Materials.Tungsten || aMaterial == Materials.HSSG || aMaterial == Materials.NaquadahAlloy || aMaterial == Materials.Duranium ||
+ aMaterial == Materials.Europium))
foil.mDisabledItems.add(aMaterial);
//Fine Wire
if (!enableUnusedFineWires && !(aMaterial == Materials.Steel || aMaterial == Materials.AnnealedCopper || aMaterial == Materials.Platinum || aMaterial == Materials.Osmium ||