aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorcharles <johnch18@isu.edu>2021-03-30 11:40:39 -0600
committercharles <johnch18@isu.edu>2021-03-30 11:40:39 -0600
commit286a75db05173d7c338ce99bda4fd3a8cb68f9f6 (patch)
treed725b3c3816c83acf89a7433b8d251fae8592143 /src/main/java/gregtech/api/enums
parent5630eeea4486b1631631d5fe1615d6dfd093ed9b (diff)
parente8a9f612f94c01ab857e691e8e6f1b8742a72d18 (diff)
downloadGT5-Unofficial-286a75db05173d7c338ce99bda4fd3a8cb68f9f6.tar.gz
GT5-Unofficial-286a75db05173d7c338ce99bda4fd3a8cb68f9f6.tar.bz2
GT5-Unofficial-286a75db05173d7c338ce99bda4fd3a8cb68f9f6.zip
Merge https://github.com/GTNewHorizons/GT5-Unofficial into mccoverfix
Fixing my sh*t because apparently I can't use git
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index 59c20d412b..ba91886c99 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -703,7 +703,7 @@ public enum OrePrefixes {
if (!enableUnusedTriplePlates && !(aMaterial == Materials.Paper)) plateTriple.mDisabledItems.add(aMaterial);
if (!enableUnusedQuadPlates && !(aMaterial == Materials.Paper)) plateQuadruple.mDisabledItems.add(aMaterial);
if (!enableUnusedQuinPlates && !(aMaterial == Materials.Paper)) plateQuintuple.mDisabledItems.add(aMaterial);
- if (!(enableUnusedDensePlates || GregTech_API.mGTPlusPlus) && !(aMaterial == Materials.Iron || aMaterial == Materials.Copper || aMaterial == Materials.Lead || aMaterial == Materials.Paper))
+ if (!(enableUnusedDensePlates || GregTech_API.mGTPlusPlus) && !(aMaterial == Materials.Iron || aMaterial == Materials.Copper || aMaterial == Materials.Lead || aMaterial == Materials.Paper || aMaterial == Materials.Thaumium || aMaterial == Materials.Titanium))
plateDense.mDisabledItems.add(aMaterial);
//Rotors
if (!enableUnusedRotors && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome || aMaterial == Materials.Tin || aMaterial == Materials.Osmium ||