aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-08-11 14:21:03 +0200
committerGitHub <noreply@github.com>2017-08-11 14:21:03 +0200
commit987d1ec11ee58929e68b21867d95d658cc03a9b5 (patch)
treee1e8beb0af1ad878b4b8af1abb816ddc817f1540
parent46420e73cbfedab2e7c1c21fd5a23a37827a20c2 (diff)
parent885c8b00e91c4053eb5a9e3a1a4bdef081932241 (diff)
downloadGT5-Unofficial-987d1ec11ee58929e68b21867d95d658cc03a9b5.tar.gz
GT5-Unofficial-987d1ec11ee58929e68b21867d95d658cc03a9b5.tar.bz2
GT5-Unofficial-987d1ec11ee58929e68b21867d95d658cc03a9b5.zip
Merge pull request #1149 from joakibj/fix-orebasalticmineralsand
Fix oreBasalticMineralSand properly being mapped to "ore" prefix
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index c3aef3336a..11da9f1538 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -795,6 +795,7 @@ public enum OrePrefixes {
for (OrePrefixes tPrefix : values())
if (aOre.startsWith(tPrefix.toString())) {
if (tPrefix == oreNether && aOre.equals("oreNetherQuartz")) return ore;
+ if (tPrefix == oreBasalt && aOre.equals("oreBasalticMineralSand")) return ore;
return tPrefix;
}
return null;