> Why does Git make me do these? arghhh...

Merge branch 'master' of https://github.com/draknyte1/GTplusplus

# Conflicts:
#	src/Java/gtPlusPlus/core/material/ALLOY.java
#	src/Java/gtPlusPlus/core/material/ELEMENT.java
#	src/Java/gtPlusPlus/core/material/Material.java
#	src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java

2 files changed, 8 insertions, 2 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
index 89deeb931d..3d3dcee94c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.xmod.gregtech.api.items;
 
-import static gregtech.api.enums.GT_Values.MOD_ID_RC;
-
 import java.util.*;
 import java.util.Map.Entry;
 
@@ -147,6 +145,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool implements
 	}
 
 
+	@SuppressWarnings("unchecked")
 	public void addAdditionalToolTips(final List aList, final ItemStack aStack) {
 		final long tMaxDamage = getToolMaxDamage(aStack);
 		final Materials tMaterial = getPrimaryMaterial(aStack);
@@ -171,6 +170,8 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool implements
 		}
 	}
 
+	@Override
+	@SuppressWarnings("unchecked")
 	public void addAdditionalToolTips(final List aList, final ItemStack aStack, final EntityPlayer aPlayer) {
 		final long tMaxDamage = getToolMaxDamage(aStack);
 		final Materials tMaterial = getPrimaryMaterial(aStack);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java
index a980a299d5..cf167888f3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java
@@ -339,6 +339,7 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
 		}
 	}
 
+	@Override
 	public boolean canWrench(final EntityPlayer player, final int x, final int y, final int z) {
 		System.out.println("canWrench");
 		if(player==null) {
@@ -354,6 +355,7 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
 		return (tStats != null) && tStats.isWrench();
 	}
 
+	@Override
 	public void wrenchUsed(final EntityPlayer player, final int x, final int y, final int z) {
 		if(player==null) {
 			return;
@@ -367,14 +369,17 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
 		}
 	}
 
+	@Override
 	public boolean canUse(final ItemStack stack, final EntityPlayer player, final int x, final int y, final int z){
 		return this.canWrench(player, x, y, z);
 	}
 
+	@Override
 	public void used(final ItemStack stack, final EntityPlayer player, final int x, final int y, final int z){
 		this.wrenchUsed(player, x, y, z);
 	}
 
+	@Override
 	public boolean shouldHideFacades(final ItemStack stack, final EntityPlayer player) {
 		if(player==null) {
 			return false;