Merge branch 'unstable_blood' into unstable

Conflicts:
	src/main/java/gregtech/api/enums/MaterialBuilder.java
	src/main/java/gregtech/common/GT_RecipeAdder.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java

1 files changed, 3 insertions, 5 deletions

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
index 93722c52f7..043fe93347 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
@@ -1,9 +1,5 @@
 package gregtech.common.tools;

 

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Random;

-

 import gregtech.GT_Mod;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.OrePrefixes;

@@ -13,7 +9,6 @@ import gregtech.api.items.GT_MetaGenerated_Tool;
 import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

 import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.item.EntityItem;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.init.Blocks;

 import net.minecraft.item.ItemStack;

@@ -24,6 +19,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.IShearable;

 import net.minecraftforge.event.world.BlockEvent;

 

+import java.util.ArrayList;

+import java.util.List;

+

 public class GT_Tool_Chainsaw_LV

         extends GT_Tool_Saw {

     public int getToolDamagePerBlockBreak() {