diff options
| author | John <Techlone@users.noreply.github.com> | 2017-03-01 01:00:29 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-01 01:00:29 +0500 |
| commit | 2246de7cf49bdce9da2127bcde0c5a73c6b750bb (patch) | |
| tree | 21854a0abfc2592578ab1c656b14cdc047ed2645 /src/main/java/gregtech/api/enums/OrePrefixes.java | |
| parent | b2157c63206fb11e9c5568d0ca07933d565c8128 (diff) | |
| parent | e73ee32ddbd9fcc5a4f5fb1378f5451119dacebe (diff) | |
| download | GT5-Unofficial-2246de7cf49bdce9da2127bcde0c5a73c6b750bb.tar.gz GT5-Unofficial-2246de7cf49bdce9da2127bcde0c5a73c6b750bb.tar.bz2 GT5-Unofficial-2246de7cf49bdce9da2127bcde0c5a73c6b750bb.zip | |
Merge pull request #7 from Blood-Asp/unstable
Update
Diffstat (limited to 'src/main/java/gregtech/api/enums/OrePrefixes.java')
| -rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 98a7843b3d..2cb50871fa 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -697,11 +697,13 @@ public enum OrePrefixes { if (!enableUnusedFoil && !(aMaterial == Materials.Zinc || aMaterial == Materials.Aluminium || aMaterial == Materials.Silicon || aMaterial == Materials.Gold || aMaterial == Materials.Electrum || aMaterial == Materials.Platinum || aMaterial == Materials.Osmiridium || aMaterial == Materials.Osmium || aMaterial == Materials.AnnealedCopper || aMaterial == Materials.Steel || aMaterial == Materials.Copper || aMaterial == Materials.YttriumBariumCuprate - || aMaterial == Materials.VanadiumGallium || aMaterial == Materials.NiobiumTitanium || aMaterial == Materials.Naquadah)) + || aMaterial == Materials.VanadiumGallium || aMaterial == Materials.NiobiumTitanium || aMaterial == Materials.Naquadah || aMaterial == Materials.Manganese || + aMaterial == Materials.Plastic || aMaterial == Materials.Silicone)) foil.mDisabledItems.add(aMaterial); //Fine Wire if (!enableUnusedFineWires && !(aMaterial == Materials.Steel || aMaterial == Materials.AnnealedCopper || aMaterial == Materials.Platinum || aMaterial == Materials.Osmium || - aMaterial == Materials.Tin || aMaterial == Materials.Lead || aMaterial == Materials.SolderingAlloy)) + aMaterial == Materials.Tin || aMaterial == Materials.Lead || aMaterial == Materials.SolderingAlloy || aMaterial == Materials.Copper || aMaterial == Materials.Electrum || + aMaterial == Materials.Gold || aMaterial == Materials.RedAlloy || aMaterial == Materials.Graphene || aMaterial == Materials.NiobiumTitanium || aMaterial == Materials.YttriumBariumCuprate )) wireFine.mDisabledItems.add(aMaterial); //Gears if (!enableUnusedGears && !(aMaterial == Materials.Aluminium || aMaterial == Materials.Titanium || aMaterial == Materials.Iron || aMaterial == Materials.Copper || |