aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2016-11-06 23:50:18 +0100
committerGitHub <noreply@github.com>2016-11-06 23:50:18 +0100
commitbccf31f9be17f74bb0f9205b157e7322e00e3fd9 (patch)
treec8f49bcfb6230983d203b41c2d1f5e416f20952e
parent8839346c3853d6d53d69087f29bae983b5f41823 (diff)
parent7e69841b567635e22ed0c5ad3aefb598d3a0ed16 (diff)
downloadGT5-Unofficial-bccf31f9be17f74bb0f9205b157e7322e00e3fd9.tar.gz
GT5-Unofficial-bccf31f9be17f74bb0f9205b157e7322e00e3fd9.tar.bz2
GT5-Unofficial-bccf31f9be17f74bb0f9205b157e7322e00e3fd9.zip
Merge pull request #22 from Ugachaga/experimental
Fix parsing oreNetherStar and oreBasalticMineralSand
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index a77bf9385a..956f24bc2d 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -611,6 +611,8 @@ public enum OrePrefixes {
for (OrePrefixes tPrefix : values())
if (aOre.startsWith(tPrefix.toString())) {
if (tPrefix == oreNether && aOre.equals("oreNetherQuartz")) return ore;
+ if (tPrefix == oreNether && aOre.equals("oreNetherStar")) return ore;
+ if (tPrefix == oreBasalt && aOre.equals("oreBasalticMineralSand")) return ore;
return tPrefix;
}
return null;