> 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

1 files changed, 5 insertions, 0 deletions

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;