aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums/OrePrefixes.java
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-08-02 23:06:17 +0200
committerDream-Master <dream-master@gmx.net>2017-08-02 23:06:17 +0200
commit71ff139f3ae2f9988897a8ce18656d370d8eb0d7 (patch)
tree922a3b7d7bc15648e3da3004bad4e3c7a47b3a71 /src/main/java/gregtech/api/enums/OrePrefixes.java
parent9f769ded41914aabd4fa0c511a07e0f62f5cf98d (diff)
parentd5dfab598e52a922f7d7692e6b867217ff5b1c83 (diff)
downloadGT5-Unofficial-71ff139f3ae2f9988897a8ce18656d370d8eb0d7.tar.gz
GT5-Unofficial-71ff139f3ae2f9988897a8ce18656d370d8eb0d7.tar.bz2
GT5-Unofficial-71ff139f3ae2f9988897a8ce18656d370d8eb0d7.zip
Merge branch 'HP-Wrough-Iron-Update' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/enums/OrePrefixes.java')
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index 9d510937a7..7e05be550b 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -920,8 +920,11 @@ public enum OrePrefixes {
}
switch (aMaterial.mName) {
case "Glass":
+ case "BorosilicateGlass":
if (name().startsWith("gem")) return mLocalizedMaterialPre + aMaterial.mDefaultLocalName + " Crystal";
if (name().startsWith("plate")) return mLocalizedMaterialPre + aMaterial.mDefaultLocalName + " Pane";
+ if (name().startsWith("ingot")) return mLocalizedMaterialPre + aMaterial.mDefaultLocalName + " Bar";
+ if (name().startsWith("nugget")) return mLocalizedMaterialPre + aMaterial.mDefaultLocalName + " Chip";
break;
case "Wheat":
if (name().startsWith("dust")) return mLocalizedMaterialPre + "Flour";
@@ -941,6 +944,7 @@ public enum OrePrefixes {
case "Rubber":
case "Polyethylene":
case "Epoxid":
+ case "EpoxidFiberReinforced":
case "Polydimethylsiloxane":
case "Silicone":
case "Polysiloxane":