diff options
| author | Antifluxfield <lyj_299792458@163.com> | 2017-12-12 21:10:29 +0800 |
|---|---|---|
| committer | Antifluxfield <lyj_299792458@163.com> | 2017-12-12 21:10:29 +0800 |
| commit | 22fb5955b0356a9b174312a6300348446a523f5c (patch) | |
| tree | 594feea7970baa612d517d19a1fcb95144ab369f /src/main/java/gregtech/api/enums/OrePrefixes.java | |
| parent | 0cce0e6a1af627fe536aa11097373c17547c242b (diff) | |
| parent | 79999604ecb7795cafca5dac21f8df33f8da62ee (diff) | |
| download | GT5-Unofficial-22fb5955b0356a9b174312a6300348446a523f5c.tar.gz GT5-Unofficial-22fb5955b0356a9b174312a6300348446a523f5c.tar.bz2 GT5-Unofficial-22fb5955b0356a9b174312a6300348446a523f5c.zip | |
Merge remote-tracking branch 'origin/experimental' into GT6-pipes
Diffstat (limited to 'src/main/java/gregtech/api/enums/OrePrefixes.java')
| -rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 5 |
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 ||
|