Merge branch 'mat-display-name' of https://github.com/squeek502/TinkersConstruct

Conflicts:
	src/main/java/tconstruct/library/tools/ToolMaterial.java

src/main/java/tconstruct/library/tools/ToolMaterial.java

@@ -7,9 +7,6 @@ import net.minecraft.util.StatCollector;
  */
 public class ToolMaterial
 {
-    // mining level, durability, mining speed, baseDamage, handle modifier,
-    // Reinforced level, shoddy/spiny level, color/style on name
-
     public final String materialName;
     public final int harvestLevel;
     public final int durability;
@@ -20,6 +17,16 @@ public class ToolMaterial
     public final float stonebound;
     public final String tipStyle;
 
+
+    @Deprecated
+    public String displayName;
+    @Deprecated
+    public ToolMaterial(String name, String displayName, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability)
+    {
+        this(name, level, durability, speed, damage, handle, reinforced, stonebound, style);
+        this.displayName = prefixName();
+    }
+
     public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style)
     {
         this.materialName = name;