Merge remote-tracking branch 'origin/unstable' into OilRefining

Conflicts:
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GT_Tool.java
index a1596ba93e..5f54f7bdc3 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool.java
@@ -14,6 +14,7 @@ import net.minecraft.stats.AchievementList;
 import net.minecraft.util.DamageSource;

 import net.minecraft.util.EntityDamageSource;

 import net.minecraft.util.IChatComponent;

+import net.minecraft.world.World;

 import net.minecraftforge.event.world.BlockEvent;

 

 import java.util.List;

@@ -145,4 +146,9 @@ public abstract class GT_Tool
     public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {

         return aOriginalDamage;

     }

+

+	@Override

+	public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World worldObj, int aX, int aY, int aZ) {

+		return aDefault;

+	}

 }