diff options
| author | DreamMasterXXL <dream-master@gmx.net> | 2020-11-29 20:28:44 +0100 |
|---|---|---|
| committer | DreamMasterXXL <dream-master@gmx.net> | 2020-11-29 20:28:44 +0100 |
| commit | 9576c7981e8663c7d9bf9e66ea78e3b5c50fcee4 (patch) | |
| tree | 35f4e54dc8ad809a1636d411949427c31cabeb3c /src/main | |
| parent | ab7424afc3ce9c831c9fb0a038ff357f6c5274ea (diff) | |
| download | GT5-Unofficial-9576c7981e8663c7d9bf9e66ea78e3b5c50fcee4.tar.gz GT5-Unofficial-9576c7981e8663c7d9bf9e66ea78e3b5c50fcee4.tar.bz2 GT5-Unofficial-9576c7981e8663c7d9bf9e66ea78e3b5c50fcee4.zip | |
add(BloodArsenal)add blood infused iron to metal and add fine wires for the vampire ring
Diffstat (limited to 'src/main')
| -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 || |