aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums/OrePrefixes.java
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-08-01 20:19:32 +0200
committerDream-Master <dream-master@gmx.net>2017-08-01 20:19:32 +0200
commit822787b37d346b12e9b529636914b055ce7d0f1a (patch)
tree9fd872d5e1876b2d9f9309c3e20e02f655a3eb82 /src/main/java/gregtech/api/enums/OrePrefixes.java
parent4c294a70287fbb21848d8ef4c564839342fad72a (diff)
downloadGT5-Unofficial-822787b37d346b12e9b529636914b055ce7d0f1a.tar.gz
GT5-Unofficial-822787b37d346b12e9b529636914b055ce7d0f1a.tar.bz2
GT5-Unofficial-822787b37d346b12e9b529636914b055ce7d0f1a.zip
cherry pick
54fc4e222a4aee8fa122fa9767ba935c279c1ec0 Overhauled Fiberglass Circuit Board Renamed: Fiberglass Circuit Board -> Fiber-Reinforced Circuit Board Fiber-Reinforced Boards are now made by combining Epoxy Resin with either Glass Fiber or Carbon Fiber. Glass Fiber is produced from Borosilicate Glass, which is in turn produced from Glass and Boron. To make this feasible Salt and Rock Salt now yield Borax as a byproduct.
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":