Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable

1 files changed, 5 insertions, 0 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java
index 399c5d6bdd..dd54ad1b9d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java
@@ -1,6 +1,7 @@
 package gregtech.common.blocks;

 

 import gregtech.api.GregTech_API;

+import gregtech.api.enums.Materials;

 import net.minecraft.block.Block;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.ItemBlock;

@@ -24,6 +25,10 @@ public class GT_Item_Ores
         return this.field_150939_a.getUnlocalizedName() + "." + getDamage(aStack);

     }

 

+    public String getItemStackDisplayName(ItemStack aStack) {

+    	return Materials.getLocalizedNameForItem(super.getItemStackDisplayName(aStack), getDamage(aStack) % 1000);

+    }

+

     public boolean placeBlockAt(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int side, float hitX, float hitY, float hitZ, int aMeta) {

         short tDamage = (short) getDamage(aStack);

         if (tDamage > 0) {