diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-01 00:25:03 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-01 00:25:03 +0200 |
| commit | 528cd9a89f4342ca7fc9647b33835b67dd02984a (patch) | |
| tree | 5053b4181bb8290c52eb900a61ae12cdc0e6b65c /main/java/gregtech/common/blocks | |
| parent | 4b000b64ab6dd5b7f3e7e6efe939df9b307d068d (diff) | |
| parent | 27d4848463710e0824ab0f376bd69ac3625de517 (diff) | |
| download | GT5-Unofficial-528cd9a89f4342ca7fc9647b33835b67dd02984a.tar.gz GT5-Unofficial-528cd9a89f4342ca7fc9647b33835b67dd02984a.tar.bz2 GT5-Unofficial-528cd9a89f4342ca7fc9647b33835b67dd02984a.zip | |
Merge pull request #193 from pyure/master
#186: Hatch names and descriptive tooltips
Diffstat (limited to 'main/java/gregtech/common/blocks')
| -rw-r--r-- | main/java/gregtech/common/blocks/GT_Block_Ores.java | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/main/java/gregtech/common/blocks/GT_Block_Ores.java b/main/java/gregtech/common/blocks/GT_Block_Ores.java index 3353150340..a03f70f154 100644 --- a/main/java/gregtech/common/blocks/GT_Block_Ores.java +++ b/main/java/gregtech/common/blocks/GT_Block_Ores.java @@ -102,8 +102,10 @@ public class GT_Block_Ores return aMaterial.mDefaultLocalName + " Infused Stone";
case Vermiculite: case Bentonite: case Kaolinite: case Talc: case BasalticMineralSand: case GraniticMineralSand: case GlauconiteSand: case CassiteriteSand: case GarnetSand: case QuartzSand: case Pitchblende: case FullersEarth:
return aMaterial.mDefaultLocalName;
+ default:
+ return aMaterial.mDefaultLocalName + OrePrefixes.ore.mLocalizedMaterialPost;
}
- return aMaterial.mDefaultLocalName + OrePrefixes.ore.mLocalizedMaterialPost;
+
}
public boolean onBlockEventReceived(World p_149696_1_, int p_149696_2_, int p_149696_3_, int p_149696_4_, int p_149696_5_, int p_149696_6_)
@@ -260,8 +262,12 @@ public class GT_Block_Ores }
}
-
-/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar
- * Qualified Name: gregtech.common.blocks.GT_Block_Ores
- * JD-Core Version: 0.7.0.1
- */
\ No newline at end of file +
+
+/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar
+
+ * Qualified Name: gregtech.common.blocks.GT_Block_Ores
+
+ * JD-Core Version: 0.7.0.1
+
+ */
|