diff options
| author | Prometheus0000 <prometheus0000000@gmail.com> | 2020-12-03 15:02:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 15:02:06 -0500 |
| commit | 3ea02985a752745280981021bba93323ae39cf2c (patch) | |
| tree | 7b4a062b9bb3d98b09142db1d3f77774490f2466 /src/main/java/gregtech/api/enums | |
| parent | 926bcc78f0245bd894733ba629b9e3e4343b6aed (diff) | |
| parent | 26035bacd145da77b9b7109f574503cb41f302e1 (diff) | |
| download | GT5-Unofficial-3ea02985a752745280981021bba93323ae39cf2c.tar.gz GT5-Unofficial-3ea02985a752745280981021bba93323ae39cf2c.tar.bz2 GT5-Unofficial-3ea02985a752745280981021bba93323ae39cf2c.zip | |
Merge pull request #13 from GTNewHorizons/experimental
update
Diffstat (limited to 'src/main/java/gregtech/api/enums')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index c7df2b219d..b46d26e02d 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1778,6 +1778,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Inolashite, Mercassium, MeteoricIron, + BloodInfusedIron, MeteoricSteel, Naquadah, diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 86c2812c5c..59c20d412b 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -731,7 +731,7 @@ public enum OrePrefixes { //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.Copper || aMaterial == Materials.Electrum || - aMaterial == Materials.Gold || aMaterial == Materials.RedAlloy || aMaterial == Materials.Graphene || aMaterial == Materials.NiobiumTitanium || aMaterial == Materials.YttriumBariumCuprate )) + aMaterial == Materials.Gold || aMaterial == Materials.RedAlloy || aMaterial == Materials.Graphene || aMaterial == Materials.NiobiumTitanium || aMaterial == Materials.YttriumBariumCuprate || aMaterial == Materials.BloodInfusedIron)) wireFine.mDisabledItems.add(aMaterial); //Gears if (!enableUnusedGears && !(aMaterial == Materials.Aluminium || aMaterial == Materials.Titanium || aMaterial == Materials.Iron || aMaterial == Materials.Copper || |