Automatic synchronization

34 files changed, 2504 insertions, 242 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index 2b04356f52..b904b04556 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -11,6 +11,8 @@ import gtPlusPlus.core.block.general.LightGlass;
 import gtPlusPlus.core.block.general.MiningExplosives;
 import gtPlusPlus.core.block.general.PlayerDoors;
 import gtPlusPlus.core.block.general.antigrief.BlockWitherProof;
+import gtPlusPlus.core.block.general.redstone.BlockGenericRedstoneDetector;
+import gtPlusPlus.core.block.general.redstone.BlockGenericRedstoneTest;
 import gtPlusPlus.core.block.machine.CircuitProgrammer;
 import gtPlusPlus.core.block.machine.DecayablesChest;
 import gtPlusPlus.core.block.machine.FishTrap;
@@ -141,6 +143,9 @@ public final class ModBlocks {
 		
 		blockPooCollector = new Machine_PooCollector();
 
+		new BlockGenericRedstoneDetector();
+		new BlockGenericRedstoneTest();
+
 	}
 
 
diff --git a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java b/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
new file mode 100644
index 0000000000..b84c96be99
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
@@ -0,0 +1,370 @@
+package gtPlusPlus.core.block.general.redstone;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Random;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler;
+import gtPlusPlus.core.util.minecraft.InventoryUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public abstract class BlockGenericRedstone extends BlockContainer {
+
+
+	@SuppressWarnings("deprecation")
+	public BlockGenericRedstone(String aUnlocalizedSuffix, String aDisplayName) {
+		super(Material.redstoneLight);
+		this.setBlockName("blockGenericRedstone." + aUnlocalizedSuffix);
+		this.setHardness(3f);
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockGenericRedstone." + aUnlocalizedSuffix);
+		LanguageRegistry.addName(this, aDisplayName);
+
+	}
+
+
+	private final HashMap<Integer, HashMap<ForgeDirection, IIcon>> mTextures = new HashMap<Integer, HashMap<ForgeDirection, IIcon>>();
+
+	/**
+	 * A map of the textures used for this blocks. The key is the meta, then each internal map holds textures tied to each forge direction. Do not use unknown direction.
+	 * @return
+	 */
+	public HashMap<Integer, HashMap<ForgeDirection, IIcon>> getTextureArray() {		
+		return mTextures;
+	}
+	
+	public abstract void generateTextureArray(final IIconRegister iicon);
+
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public final void registerBlockIcons(final IIconRegister iicon) {
+		generateTextureArray(iicon);
+		this.blockIcon = iicon.registerIcon("redstone_block");		
+	}
+
+	
+	/**
+	 * Called upon block activation (right click on the block.)
+	 */
+	@Override
+	public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+			final int side, final float lx, final float ly, final float lz) {
+
+		if (world.isRemote) {
+			return true;
+		}
+
+		boolean mDidTool = false;
+		// Check For Tools
+		try {
+			final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName());
+			final Item mHandItem = mHandStack.getItem();
+			if (ItemUtils.isItemGregtechTool(mHandStack)) {
+
+				Logger.INFO("Found Tool in players hand!");
+				
+				final TileEntityRedstoneHandler tile = (TileEntityRedstoneHandler) world.getTileEntity(x, y, z);
+				if (tile != null) {					
+					if (tile.isScrewdriverable()) {
+						if (ItemUtils.isToolScrewdriver(mHandStack)){
+							mDidTool = tile.onScrewdriverRMB();
+							PlayerUtils.messagePlayer(player, "Adjusted Light level by 0.0625f. "+tile.getLightBrightness());
+						}
+					}
+					if (tile.isMalletable()) {
+						if (ItemUtils.isToolMallet(mHandStack)){
+							mDidTool = tile.onMalletRMB();
+							PlayerUtils.messagePlayer(player, "Light Mode active: "+mDidTool);
+						}
+					}
+					if (tile.isWrenchable()) {
+						if (ItemUtils.isToolWrench(mHandStack)){
+							mDidTool = tile.onWrenchRMB();
+						}
+					}					
+				}				
+			}
+		}
+		catch (final Throwable t) {}
+		if (mDidTool) {
+			return true;
+		}
+		
+		return false;
+	}
+
+
+
+	@Override
+	public void onBlockClicked(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer) {
+
+		boolean mDidTool = false;
+		// Check For Tools
+		try {
+			final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(aWorld, aPlayer.getDisplayName());
+			final Item mHandItem = mHandStack.getItem();
+			if (mHandItem instanceof GT_MetaGenerated_Tool_01) {
+
+				final TileEntityRedstoneHandler tile = (TileEntityRedstoneHandler) aWorld.getTileEntity(aX, aY, aZ);
+				if (tile != null) {					
+					if (tile.isScrewdriverable()) {
+						if (ItemUtils.isToolScrewdriver(mHandStack)){
+							mDidTool = tile.onScrewdriverLMB();
+						}
+					}
+					if (tile.isMalletable()) {
+						if (ItemUtils.isToolMallet(mHandStack)){
+							mDidTool = tile.onMalletLMB();
+						}
+					}
+					if (tile.isWrenchable()) {
+						if (ItemUtils.isToolWrench(mHandStack)){
+							mDidTool = tile.onWrenchLMB();
+						}
+					}					
+				}				
+			}
+		}
+		catch (Throwable t) {}
+
+		if (!mDidTool && !aPlayer.capabilities.isCreativeMode) {
+			super.onBlockClicked(aWorld, aX, aY, aZ, aPlayer);			
+		}
+		else {
+			return;
+		}		
+	}
+
+	@Override
+	public abstract TileEntity createNewTileEntity(final World world, final int p_149915_2_);
+
+	@Override
+	public void breakBlock(final World world, final int x, final int y, final int z, final Block block,
+			final int number) {
+		InventoryUtils.dropInventoryItems(world, x, y, z, block);
+		super.breakBlock(world, x, y, z, block, number);
+	}
+
+	@Override
+	public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity,
+			final ItemStack stack) {
+		if (stack.hasDisplayName()) {
+			((TileEntityRedstoneHandler) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName());
+		}
+	}
+
+	@Override
+	public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+			final int z) {
+		return false;
+	}
+
+	@Override
+	public int getLightValue() {
+		return super.getLightValue();
+	}
+
+	@Override
+	public int onBlockPlaced(World p_149660_1_, int p_149660_2_, int p_149660_3_, int p_149660_4_, int p_149660_5_,
+			float p_149660_6_, float p_149660_7_, float p_149660_8_, int p_149660_9_) {
+		// TODO Auto-generated method stub
+		return super.onBlockPlaced(p_149660_1_, p_149660_2_, p_149660_3_, p_149660_4_, p_149660_5_, p_149660_6_,
+				p_149660_7_, p_149660_8_, p_149660_9_);
+	}
+
+	@Override
+	public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) {
+		TileEntityRedstoneHandler aThis = getTileEntity(world, x, y, z);
+		if (aThis != null) {
+			return aThis.isProvidingWeakPower(world, x, y, z, side);
+		}
+		return 0;	
+	}
+
+	@Override
+	public boolean canProvidePower() {
+		return false;	
+	}
+
+	@Override
+	public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int side) {		
+		TileEntityRedstoneHandler aThis = getTileEntity(world, x, y, z);
+		if (aThis != null) {
+			return aThis.isProvidingStrongPower(world, x, y, z, side);
+		}
+		return 0;
+	}
+
+	@Override
+	public boolean hasComparatorInputOverride() {
+		// TODO Auto-generated method stub
+		return super.hasComparatorInputOverride();
+	}
+
+	@Override
+	public int getComparatorInputOverride(World p_149736_1_, int p_149736_2_, int p_149736_3_, int p_149736_4_,
+			int p_149736_5_) {
+		// TODO Auto-generated method stub
+		return super.getComparatorInputOverride(p_149736_1_, p_149736_2_, p_149736_3_, p_149736_4_, p_149736_5_);
+	}
+
+	@Override
+	public boolean canConnectRedstone(IBlockAccess world, int x, int y, int z, int side) {
+		TileEntityRedstoneHandler aThis = getTileEntity(world, x, y, z);
+		if (aThis != null) {
+			return aThis.canConnectRedstone(world, x, y, z, side);
+		}
+		return false;
+	}
+
+	@Override
+	public boolean shouldCheckWeakPower(IBlockAccess world, int x, int y, int z, int side) {
+		TileEntityRedstoneHandler aThis = getTileEntity(world, x, y, z);
+		if (aThis != null) {
+			return aThis.shouldCheckWeakPower(world, x, y, z, side);
+		}
+        return isNormalCube();
+	}
+
+	@Override
+	public boolean getWeakChanges(IBlockAccess world, int x, int y, int z) {
+		TileEntityRedstoneHandler aThis = getTileEntity(world, x, y, z);
+		if (aThis != null) {
+			return aThis.getWeakChanges(world, x, y, z);
+		}
+		return false;
+	}
+
+
+	/**
+	 * Gets the block's texture. Args: side, meta
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public abstract IIcon getIcon(final int side, final int meta);
+
+	@Override
+	public int damageDropped(final int damage) {
+		return damage;
+	}
+
+	@Override
+	public abstract void getSubBlocks(final Item item, final CreativeTabs tab, final List list);
+
+
+	/**
+	 * Called whenever the block is added into the world. Args: world, x, y, z
+	 */
+	public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
+		TileEntityRedstoneHandler aThis = getTileEntity(aWorld, aX, aY, aZ);
+
+		if (!aWorld.isRemote) {
+			if (aThis.hasUpdatedRecently() && !aWorld.isBlockIndirectlyGettingPowered(aX, aY, aZ)) {
+				aWorld.scheduleBlockUpdate(aX, aY, aZ, this, 4);
+			} else if (!aThis.hasUpdatedRecently() && aWorld.isBlockIndirectlyGettingPowered(aX, aY, aZ)) {
+				aWorld.setBlock(aX, aY, aZ, Blocks.lit_redstone_lamp, 0, 2);
+			}
+		}
+	}
+
+	/**
+	 * Lets the block know when one of its neighbor changes. Doesn't know which
+	 * neighbor changed (coordinates passed are their own) Args: x, y, z, neighbor
+	 * Block
+	 */
+	public void onNeighborBlockChange(World aWorld, int aX, int aY, int aZ, Block p_149695_5_) {
+
+		TileEntityRedstoneHandler aThis = getTileEntity(aWorld, aX, aY, aZ);
+
+		if (!aWorld.isRemote) {
+			if (aThis.hasUpdatedRecently() && !aWorld.isBlockIndirectlyGettingPowered(aX, aY, aZ)) {
+				aWorld.scheduleBlockUpdate(aX, aY, aZ, this, 4);
+			} else if (!aThis.hasUpdatedRecently() && aWorld.isBlockIndirectlyGettingPowered(aX, aY, aZ)) {
+				aWorld.setBlock(aX, aY, aZ, Blocks.lit_redstone_lamp, 0, 2);
+			}
+		}
+	}
+
+	/**
+	 * Ticks the block if it's been scheduled
+	 */
+	public void updateTick(World aWorld, int aX, int aY, int aZ, Random p_149674_5_) {
+		TileEntityRedstoneHandler aTile = getTileEntity(aWorld, aX, aY, aZ);
+		// Client side handling
+		if (aTile != null) {
+			this.setLightLevel(aTile.getLightBrightness());
+		}
+		// Only continue on server
+		if (aWorld.isRemote) {
+			return;
+		}
+		if (aTile != null) {
+			if (aTile.isGettingIndirectlyPowered()) {
+			}
+		}
+	}
+
+	public TileEntityRedstoneHandler getTileEntity(IBlockAccess world, int aX, int aY, int aZ) {
+		TileEntity aTemp = world.getTileEntity(aX, aY, aZ);
+		if (aTemp != null) {
+			if (aTemp instanceof TileEntityRedstoneHandler) {
+				TileEntityRedstoneHandler g = (TileEntityRedstoneHandler) aTemp;
+				if (g != null) {
+					return g;
+				}
+			}
+		}
+		return null;
+	}
+
+
+	/**
+	 * Gets an item for the block being called on. Args: world, x, y, z
+	 */
+	@SideOnly(Side.CLIENT)
+	@Override
+	public abstract Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_);
+
+	/**
+	 * Returns an item stack containing a single instance of the current block type.
+	 * 'i' is the block's subtype/damage and is ignored for blocks which do not
+	 * support subtypes. Blocks which cannot be harvested should return null.
+	 */
+	@Override
+	protected abstract ItemStack createStackedBlock(int p_149644_1_);
+
+	@Override
+	public abstract ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int metadata,	final int fortune);
+
+	@Override
+	public abstract Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_);
+
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java b/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java
new file mode 100644
index 0000000000..43247110f1
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java
@@ -0,0 +1,131 @@
+package gtPlusPlus.core.block.general.redstone;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Random;
+
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class BlockGenericRedstoneDetector extends BlockGenericRedstone {
+
+	public BlockGenericRedstoneDetector() {
+		super("detector", "Redstone Detector");
+		setTickRandomly(true);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
+		return new TileEntityRedstoneDetector();
+	}
+	
+	public class TileEntityRedstoneDetector extends TileEntityRedstoneHandler {
+		public TileEntityRedstoneDetector() {
+			super(0);
+		}
+
+		@Override
+		protected Class<? extends TileEntity> getTileEntityClass() {
+			return this.getClass();
+		}
+
+		@Override
+		protected String getTileEntityNameForRegistration() {
+			return "TileEntityRedstoneDetector";
+		}		
+	}
+
+	@Override
+	public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List aList) {
+		aList.add(ItemUtils.getSimpleStack(this));
+	}
+
+
+	@Override
+	public void updateTick(World aWorld, int aX, int aY, int aZ, Random aRand) {		
+		super.updateTick(aWorld, aX, aY, aZ, aRand);
+	}
+
+	@Override
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+		// TODO Auto-generated method stub
+		return ItemUtils.getSimpleStack(this).getItem();
+	}
+
+	@Override
+	public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) {
+		// TODO Auto-generated method stub
+		return ItemUtils.getSimpleStack(this).getItem();
+	}
+
+	@Override
+	protected ItemStack createStackedBlock(int p_149644_1_) {
+		return ItemUtils.simpleMetaStack(this, p_149644_1_, 1);
+	}	
+	
+	public void generateTextureArray(final IIconRegister iicon) {
+		HashMap<Integer, HashMap<ForgeDirection, IIcon>> aTextures = new HashMap<Integer, HashMap<ForgeDirection, IIcon>>();
+
+		
+		//New Block for Each Meta
+		int aMeta = 0;
+		{
+			HashMap<ForgeDirection, IIcon> aTempMap = new HashMap<ForgeDirection, IIcon>();
+			aTempMap.put(ForgeDirection.UP, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+			aTempMap.put(ForgeDirection.DOWN, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+			aTempMap.put(ForgeDirection.NORTH, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+			aTempMap.put(ForgeDirection.SOUTH, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+			aTempMap.put(ForgeDirection.EAST, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+			aTempMap.put(ForgeDirection.WEST, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+			aTextures.put(aMeta++, aTempMap);
+		}
+		
+	}
+
+	@Override
+	public IIcon getIcon(int side, int meta) {
+		HashMap<ForgeDirection, IIcon> aTemp = getTextureArray().get(meta);
+		if (aTemp != null) {
+			IIcon aSide = aTemp.get(ForgeDirection.getOrientation(side));
+			if (aSide != null) {
+				return aSide;
+			}
+			else {
+				//Smart calculate missing sides				
+				if (side <= 1) {
+					for (int ss = 0; ss < 2; ss++) {
+						aSide = aTemp.get(ForgeDirection.getOrientation(side));
+						if (aSide != null) {
+							return aSide;
+						}						
+					}
+				}					
+				for (int ss = 2; ss < 6; ss++) {
+					aSide = aTemp.get(ForgeDirection.getOrientation(side));
+					if (aSide != null) {
+						return aSide;
+					}						
+				}				
+			}
+		}
+		return blockIcon;
+	}
+
+	@Override
+	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
+		ArrayList<ItemStack> aDrops = new ArrayList<ItemStack>();
+		aDrops.add(ItemUtils.getSimpleStack(this));
+		return aDrops;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java b/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java
new file mode 100644
index 0000000000..df8a929302
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java
@@ -0,0 +1,5 @@
+package gtPlusPlus.core.block.general.redstone;
+
+public class BlockGenericRedstoneEmitter {
+
+}
diff --git a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java b/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java
new file mode 100644
index 0000000000..0f1f983cd0
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java
@@ -0,0 +1,201 @@
+package gtPlusPlus.core.block.general.redstone;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Random;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.world.explosions.ExplosionHandler;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class BlockGenericRedstoneTest extends BlockGenericRedstone {
+
+	public BlockGenericRedstoneTest() {
+		super("test", "Redstone Test");
+		setTickRandomly(true);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
+		return new TileEntityRedstoneTest();
+	}
+	
+	public class TileEntityRedstoneTest extends TileEntityRedstoneHandler {
+		public TileEntityRedstoneTest() {
+			super(2);
+		}
+
+		@Override
+		public boolean isScrewdriverable() {
+			return true;
+		}
+
+		@Override
+		public boolean onScrewdriverLMB() {
+			return super.onScrewdriverLMB();
+		}
+
+		@Override
+		public boolean onScrewdriverRMB() {
+			if (this.mLightValue + 0.0625f <= 1) {
+				this.mLightValue += 0.0625f;
+			}
+			else {
+				this.mLightValue = 0;
+			}
+			this.markForUpdate();
+			return true;
+		}
+
+		@Override
+		public boolean isMalletable() {
+			return true;
+		}
+
+		@Override
+		public boolean onMalletLMB() {
+			return super.onMalletLMB();
+		}
+
+		@Override
+		public boolean onMalletRMB() {
+			this.mLightMode = Utils.invertBoolean(mLightMode);
+			this.markForUpdate();
+			return mLightMode;
+		}
+
+		@Override
+		public boolean isWrenchable() {
+			return true;
+		}
+
+		@Override
+		public boolean onWrenchLMB() {
+			return super.onWrenchLMB();
+		}
+
+		@Override
+		public boolean onWrenchRMB() {
+			Logger.INFO("Found Wrench");
+			ExplosionHandler explode = new ExplosionHandler();
+			explode.createExplosion(this.worldObj, null, this.xCoord, this.yCoord, this.zCoord, 1f, false, true);
+			return true;
+		}	
+
+		@Override
+		protected Class<? extends TileEntity> getTileEntityClass() {
+			return this.getClass();
+		}
+
+		@Override
+		protected String getTileEntityNameForRegistration() {
+			return "TileEntityRedstoneTest";
+		}
+
+		@Override
+		public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) {
+			return super.isProvidingWeakPower(world, x, y, z, side);
+		}
+
+		@Override
+		public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int side) {
+			return super.isProvidingStrongPower(world, x, y, z, side);
+		}	
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List aList) {
+		aList.add(ItemUtils.getSimpleStack(this));
+	}
+
+
+	@Override
+	public void updateTick(World aWorld, int aX, int aY, int aZ, Random aRand) {		
+		super.updateTick(aWorld, aX, aY, aZ, aRand);
+	}
+
+	@Override
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+		return ItemUtils.getSimpleStack(this).getItem();
+	}
+
+	@Override
+	public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) {
+		return ItemUtils.getSimpleStack(this).getItem();
+	}
+
+	@Override
+	protected ItemStack createStackedBlock(int p_149644_1_) {
+		return ItemUtils.simpleMetaStack(this, p_149644_1_, 1);
+	}	
+	
+	public void generateTextureArray(final IIconRegister iicon) {
+		HashMap<Integer, HashMap<ForgeDirection, IIcon>> aTextures = new HashMap<Integer, HashMap<ForgeDirection, IIcon>>();
+
+		
+		//New Block for Each Meta
+		int aMeta = 0;
+		{
+			HashMap<ForgeDirection, IIcon> aTempMap = new HashMap<ForgeDirection, IIcon>();
+			aTempMap.put(ForgeDirection.UP, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+			aTempMap.put(ForgeDirection.DOWN, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+			aTempMap.put(ForgeDirection.NORTH, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+			aTempMap.put(ForgeDirection.SOUTH, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+			aTempMap.put(ForgeDirection.EAST, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+			aTempMap.put(ForgeDirection.WEST, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+			aTextures.put(aMeta++, aTempMap);
+		}
+		
+	}
+
+	@Override
+	public IIcon getIcon(int side, int meta) {
+		HashMap<ForgeDirection, IIcon> aTemp = getTextureArray().get(meta);
+		if (aTemp != null) {
+			IIcon aSide = aTemp.get(ForgeDirection.getOrientation(side));
+			if (aSide != null) {
+				return aSide;
+			}
+			else {
+				//Smart calculate missing sides				
+				if (side <= 1) {
+					for (int ss = 0; ss < 2; ss++) {
+						aSide = aTemp.get(ForgeDirection.getOrientation(side));
+						if (aSide != null) {
+							return aSide;
+						}						
+					}
+				}					
+				for (int ss = 2; ss < 6; ss++) {
+					aSide = aTemp.get(ForgeDirection.getOrientation(side));
+					if (aSide != null) {
+						return aSide;
+					}						
+				}				
+			}
+		}
+		return blockIcon;
+	}
+
+	@Override
+	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
+		ArrayList<ItemStack> aDrops = new ArrayList<ItemStack>();
+		aDrops.add(ItemUtils.getSimpleStack(this));
+		return aDrops;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
index 1600d9944f..6ae1a52aba 100644
--- a/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
+++ b/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
@@ -51,6 +51,8 @@ public class CircuitProgrammer extends BlockContainer implements ITileTooltip
 	@SuppressWarnings("deprecation")
 	public CircuitProgrammer(){
 		super(Material.iron);
+		this.setHardness(5f);
+		this.setResistance(1f);
 		this.setBlockName("blockCircuitProgrammer");
 		this.setCreativeTab(AddToCreativeTab.tabMachines);
 		GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockCircuitProgrammer");
diff --git a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java
index b5e78f23ef..037ec61ced 100644
--- a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java
+++ b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java
@@ -51,6 +51,7 @@ public class FishTrap extends BlockContainer implements ITileTooltip
 		super(Material.iron);
 		this.setBlockName("blockFishTrap");
 		this.setHardness(5f);
+		this.setResistance(1f);
 		this.setCreativeTab(AddToCreativeTab.tabMachines);
 		GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockFishTrap");
 		LanguageRegistry.addName(this, "Fish Catcher");
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
index 23fdfe9733..945cf7b581 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
@@ -38,6 +38,8 @@ public class Machine_PooCollector extends BlockContainer {
 
 	public Machine_PooCollector() {
 		super(Material.iron);
+		this.setHardness(5f);
+		this.setResistance(1f);
 		this.setBlockName("blockPooCollector");
 		this.setCreativeTab(AddToCreativeTab.tabMachines);
 		GameRegistry.registerBlock(this, ItemBlockMeta.class,"blockPooCollector");
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
index f57c09b62d..c6fcc83d01 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
@@ -3,10 +3,20 @@ package gtPlusPlus.core.common.compat;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble;
+import gtPlusPlus.core.item.bauble.MonsterKillerBaseBauble;
 import gtPlusPlus.core.item.general.ItemCloakingDevice;
 import gtPlusPlus.core.item.general.ItemHealingDevice;
 import gtPlusPlus.core.item.general.ItemSlowBuildingRing;
 import gtPlusPlus.core.lib.LoadedMods;
+import net.minecraft.entity.monster.EntityBlaze;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.entity.monster.EntityGhast;
+import net.minecraft.entity.monster.EntityMagmaCube;
+import net.minecraft.entity.monster.EntityPigZombie;
+import net.minecraft.entity.monster.EntitySkeleton;
+import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.entity.monster.EntityZombie;
 
 public class COMPAT_Baubles {
 
@@ -34,6 +44,13 @@ public class COMPAT_Baubles {
 		catch (Throwable t) {
 			t.printStackTrace();
 		}
+
+		ModItems.itemAmuletMonsterKiller_Zombie = new MonsterKillerBaseBauble(new Class[] {EntityZombie.class}, "Zombie", 3);
+		ModItems.itemAmuletMonsterKiller_Skeleton = new MonsterKillerBaseBauble(new Class[] {EntitySkeleton.class}, "Skeleton", 3);
+		ModItems.itemAmuletMonsterKiller_Spider = new MonsterKillerBaseBauble(new Class[] {EntitySpider.class}, "Spider", 3);
+		ModItems.itemAmuletMonsterKiller_Creeper = new MonsterKillerBaseBauble(new Class[] {EntityCreeper.class}, "Creeper", 4);
+		ModItems.itemAmuletMonsterKiller_Enderman = new MonsterKillerBaseBauble(new Class[] {EntityEnderman.class}, "Enderman", 4);
+		ModItems.itemAmuletMonsterKiller_Nether = new MonsterKillerBaseBauble(new Class[] {EntityPigZombie.class, EntityGhast.class, EntityMagmaCube.class, EntityBlaze.class}, "Hellish", 6);
 		
 		if (LoadedMods.PlayerAPI){
 			ModItems.itemSlowBuildingRing = new ItemSlowBuildingRing();
diff --git a/src/Java/gtPlusPlus/core/handler/AchievementHandler.java b/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
index 482ca66f09..4cd5431ebd 100644
--- a/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
@@ -71,7 +71,7 @@ public class AchievementHandler {
 		this.registerAchievement("rtg", -16, -10, GregtechItemList.RTG.get(1), aBaseAchievementName, false);
 		this.registerAchievement("dehydrate", -15, -10, GregtechItemList.GT_Dehydrator_HV.get(1), aBaseAchievementName, false);
 		this.registerAchievement("semifluid", -14, -10, GregtechItemList.Generator_SemiFluid_HV.get(1), aBaseAchievementName, false);
-		this.registerAchievement("earlywasher", -13, -10, GregtechItemList.SimpleDustWasher.get(1), aBaseAchievementName, false);
+		this.registerAchievement("earlywasher", -13, -10, GregtechItemList.SimpleDustWasher_ULV.get(1), aBaseAchievementName, false);
 		this.registerAchievement("advancedsteam", -12, -10, GregtechItemList.Boiler_Advanced_MV.get(1), aBaseAchievementName, false);
 		this.registerAchievement("pollutionremoval", -11, -10, GregtechItemList.Pollution_Cleaner_IV.get(1), aBaseAchievementName, false);
 		this.registerAchievement("hiampxform", -10, -10, GregtechItemList.Transformer_HA_HV_MV.get(1), aBaseAchievementName, false);		
diff --git a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
index ef91647c1a..fda7760607 100644
--- a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
@@ -1,22 +1,16 @@
 package gtPlusPlus.core.handler.events;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-
 import gregtech.api.enums.ItemList;
-import gregtech.api.util.GT_Utility;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.GTplusplus.INIT_PHASE;
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.handler.events.BlockEventHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 
 public class GeneralTooltipEventHandler {
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index e8f0e31458..68aacd6943 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -32,6 +32,7 @@ import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble;
 import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble;
 import gtPlusPlus.core.item.bauble.HealthBoostBauble;
 import gtPlusPlus.core.item.bauble.ModularBauble;
+import gtPlusPlus.core.item.bauble.MonsterKillerBaseBauble;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.CoalTar;
 import gtPlusPlus.core.item.chemistry.GenericChem;
@@ -345,6 +346,15 @@ public final class ModItems {
 	public static CoreItem itemDetCable;
 	public static ItemThrowableBomb itemBomb;
 
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Zombie;
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Skeleton;
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Spider;
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Creeper;
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Enderman;
+	
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Nether;
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Infernal;
+
 	static {
 		Logger.INFO("Items!");
 		//Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is called upon.
@@ -522,7 +532,13 @@ public final class ModItems {
 			MaterialGenerator.generate(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN);
 			MaterialGenerator.generate(ELEMENT.STANDALONE.HYPOGEN);
 			MaterialGenerator.generate(ELEMENT.STANDALONE.CHRONOMATIC_GLASS);
-
+			
+			//Custom Materials that are from Runescape
+			MaterialGenerator.generate(ELEMENT.STANDALONE.BLACK_METAL);
+			MaterialGenerator.generate(ELEMENT.STANDALONE.WHITE_METAL);
+			MaterialGenerator.generate(ELEMENT.STANDALONE.GRANITE, false, false);
+			MaterialGenerator.generate(ELEMENT.STANDALONE.RUNITE, false);
+			MaterialGenerator.generate(ELEMENT.STANDALONE.DRAGON_METAL, false);
 
 			//Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though
 			if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
@@ -634,6 +650,17 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.TITANSTEEL);
 			MaterialGenerator.generate(ALLOY.ARCANITE);
 			MaterialGenerator.generate(ALLOY.OCTIRON);			
+
+			MaterialGenerator.generate(ALLOY.BABBIT_ALLOY, false);
+			MaterialGenerator.generate(ALLOY.BLACK_TITANIUM, false);
+			
+			
+			
+			
+			
+			
+			
+			
 			
 			//Must be the final Alloy to Generate
 			MaterialGenerator.generate(ALLOY.QUANTUM);
@@ -812,7 +839,7 @@ public final class ModItems {
 		else {
 			itemHotTitaniumIngot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1);
 		}
-		GT_Values.RA.addBlastRecipe(ELEMENT.getInstance().TITANIUM.getIngot(1), null, itemHotTitaniumIngot, null, 10 * 20, 512, Materials.Titanium.mBlastFurnaceTemp);
+		GT_Values.RA.addBlastRecipe(ELEMENT.getInstance().TITANIUM.getIngot(1), CI.getNumberedCircuit(16), itemHotTitaniumIngot, null, 10 * 20, 500, Materials.Titanium.mBlastFurnaceTemp);
 
 		//Special Sillyness
 		if (true) {
diff --git a/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
index cc7979825a..2d9b35ac63 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
@@ -3,20 +3,16 @@ package gtPlusPlus.core.item.bauble;
 import java.util.List;
 
 import baubles.api.BaubleType;
-import baubles.api.IBauble;
-import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.GT_Values;
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
-import ic2.api.item.IElectricItemManager;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -28,23 +24,12 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
-@Optional.InterfaceList(value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
-		@Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") })
-public class BatteryPackBaseBauble extends BaseBauble implements IElectricItem, IElectricItemManager, IBauble {
+public class BatteryPackBaseBauble extends ElectricBaseBauble {
 
-	final int mTier;
-	private final double maxValueEU;
 
 	public BatteryPackBaseBauble(int tier) {		
-		super(BaubleType.BELT, "GTPP.BattPack.0" + tier + ".name", 0);
-		mTier = tier;
-		maxValueEU = GT_Values.V[mTier] * 20 * 300;
-		String aUnlocalName = "GTPP.BattPack.0" + mTier + ".name";
-		this.setUnlocalizedName(aUnlocalName);
-		this.setTextureName(CORE.MODID + ":" + "chargepack/"+tier);
-		this.setMaxDamage(27);
-		this.setMaxStackSize(1);
-		this.setNoRepair();
+		super(BaubleType.BELT, tier, GT_Values.V[tier] * 20 * 300, "GTPP.BattPack.0" + tier + ".name");
+		String aUnlocalName = "GTPP.BattPack.0" + tier + ".name";
 		this.setCreativeTab(AddToCreativeTab.tabMachines);		
 		if (GameRegistry.findItem(CORE.MODID, aUnlocalName) == null) {
 			GameRegistry.registerItem(this, aUnlocalName);			
@@ -82,46 +67,11 @@ public class BatteryPackBaseBauble extends BaseBauble implements IElectricItem,
 	}
 
 	@Override
-	public Item getChargedItem(final ItemStack itemStack) {
-		final ItemStack x = itemStack.copy();
-		x.setItemDamage(27);
-		return x.getItem();
-	}
-
-	@Override
-	public Item getEmptyItem(final ItemStack itemStack) {
-		final ItemStack x = itemStack.copy();
-		x.setItemDamage(0);
-		return x.getItem();
-	}
-
-	@Override
-	public double getMaxCharge(final ItemStack itemStack) {
-		return maxValueEU;
-	}
-
-	@Override
-	public int getTier(final ItemStack itemStack) {
-		return mTier;
-	}
-
-	@Override
-	public double getTransferLimit(final ItemStack itemStack) {
-		return GT_Values.V[mTier];
-	}
-
-	@Override
 	public String getItemStackDisplayName(final ItemStack p_77653_1_) {
 		return (EnumChatFormatting.BLUE + super.getItemStackDisplayName(p_77653_1_) + EnumChatFormatting.GRAY);
 	}
 
 	@Override
-	public double getDurabilityForDisplay(final ItemStack stack) {
-		// return 1.0D - getEnergyStored(stack) / this.capacity;
-		return 1.0D - (this.getCharge(stack) / this.getMaxCharge(stack));
-	}
-
-	@Override
 	public boolean showDurabilityBar(final ItemStack stack) {
 		return true;
 	}
@@ -140,71 +90,17 @@ public class BatteryPackBaseBauble extends BaseBauble implements IElectricItem,
 		String aString2 = StatCollector.translateToLocal("GTPP.battpack.tooltip.2");
 		String aString3 = StatCollector.translateToLocal("GTPP.battpack.tooltip.3");
 		String aString4 = StatCollector.translateToLocal("GTPP.battpack.tooltip.4");
-
-		String aEuInfo = StatCollector.translateToLocal("GTPP.info.euInfo");
-		String aTier = StatCollector.translateToLocal("GTPP.machines.tier");
-		String aInputLimit = StatCollector.translateToLocal("GTPP.info.inputLimit");
-		String aCurrentPower = StatCollector.translateToLocal("GTPP.info.currentPower");
+		
 		String aEU = StatCollector.translateToLocal("GTPP.info.eu");	
 		String aEUT = aEU+"/t";
 
 		list.add(EnumChatFormatting.GREEN + aString1 + EnumChatFormatting.GRAY);
 		list.add(EnumChatFormatting.GREEN + aString2+" " + (int) getTransferLimit(stack) + aEUT +" "+ aString3 + EnumChatFormatting.GRAY);
 		list.add(EnumChatFormatting.GREEN + aString4 + EnumChatFormatting.GRAY);
-		list.add("");
-		list.add(EnumChatFormatting.GOLD + aEuInfo + EnumChatFormatting.GRAY);
-		list.add(EnumChatFormatting.GRAY + aTier+": [" + EnumChatFormatting.YELLOW + this.getTier(stack)
-		+ EnumChatFormatting.GRAY + "] "+aInputLimit+": [" + EnumChatFormatting.YELLOW
-		+ this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT);
-		list.add(EnumChatFormatting.GRAY + aCurrentPower +": [" + EnumChatFormatting.YELLOW + (long) this.getCharge(stack)
-		+ EnumChatFormatting.GRAY + aEU +"] [" + EnumChatFormatting.YELLOW
-		+ MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + EnumChatFormatting.GRAY
-		+ "%]");
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
 	@Override
-	public double charge(final ItemStack stack, final double amount, final int tier, final boolean ignoreTransferLimit,
-			final boolean simulate) {
-
-		if (!simulate) {
-			ElectricItem.manager.charge(stack, amount, tier, true, simulate);
-
-		}
-		return ElectricItem.manager.charge(stack, amount, tier, true, simulate);
-	}
-
-	@Override
-	public double discharge(final ItemStack stack, final double amount, final int tier,
-			final boolean ignoreTransferLimit, final boolean externally, final boolean simulate) {
-		if (!simulate) {
-			ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate);
-		}
-
-		return ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate);
-	}
-
-	@Override
-	public double getCharge(final ItemStack stack) {
-		return ElectricItem.manager.getCharge(stack);
-	}
-
-	@Override
-	public boolean canUse(final ItemStack stack, final double amount) {
-		return ElectricItem.manager.canUse(stack, amount);
-	}
-
-	@Override
-	public boolean use(final ItemStack stack, final double amount, final EntityLivingBase entity) {
-		return ElectricItem.manager.use(stack, amount, entity);
-	}
-
-	@Override
-	public void chargeFromArmor(final ItemStack stack, final EntityLivingBase entity) {
-		ElectricItem.manager.chargeFromArmor(stack, entity);
-	}
-
-	@Override
 	public String getToolTip(final ItemStack stack) {
 		return ElectricItem.manager.getToolTip(stack);
 	}
@@ -219,11 +115,6 @@ public class BatteryPackBaseBauble extends BaseBauble implements IElectricItem,
 		return true;
 	}
 
-	@Override
-	public BaubleType getBaubleType(final ItemStack arg0) {
-		return BaubleType.BELT;
-	}
-
 	@Override // TODO
 	public void onEquipped(final ItemStack arg0, final EntityLivingBase arg1) {
 
@@ -349,4 +240,10 @@ public class BatteryPackBaseBauble extends BaseBauble implements IElectricItem,
 		}
 	}
 
+	@Override
+	public String getTextureNameForBauble() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
new file mode 100644
index 0000000000..fb490285e9
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
@@ -0,0 +1,199 @@
+package gtPlusPlus.core.item.bauble;
+
+import java.util.List;
+
+import baubles.api.BaubleType;
+import baubles.api.IBauble;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.GT_Values;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
+import ic2.api.item.ElectricItem;
+import ic2.api.item.IElectricItem;
+import ic2.api.item.IElectricItemManager;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
+@Optional.InterfaceList(value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
+@Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") })
+public abstract class ElectricBaseBauble extends BaseBauble implements IElectricItem, IElectricItemManager, IBauble {
+
+	public final int mTier;
+	private final double maxValueEU;
+	private final BaubleType mType;
+
+	public ElectricBaseBauble(BaubleType aType, int aTier, double aMaxEU, String aUnlocalName) {		
+		super(aType, aUnlocalName, 0);
+		mType = aType;
+		mTier = aTier;
+		maxValueEU = aMaxEU;
+		this.setUnlocalizedName(aUnlocalName);
+		this.setTextureName(getTextureNameForBauble());
+		this.setMaxDamage(27);
+		this.setMaxStackSize(1);
+		this.setNoRepair();
+		this.setCreativeTab(AddToCreativeTab.tabMachines);		
+		if (GameRegistry.findItem(CORE.MODID, aUnlocalName) == null) {
+			GameRegistry.registerItem(this, aUnlocalName);			
+		}		
+	}
+	
+	public abstract String getTextureNameForBauble();
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
+		ItemStack itemStack = new ItemStack(this, 1);
+		ItemStack charged;
+		if (this.getEmptyItem(itemStack) == this) {
+			charged = new ItemStack(this, 1);
+			ElectricItem.manager.charge(charged, 0.0D, Integer.MAX_VALUE, true, false);
+			itemList.add(charged);
+		}
+		if (this.getChargedItem(itemStack) == this) {
+			charged = new ItemStack(this, 1);
+			ElectricItem.manager.charge(charged, Double.POSITIVE_INFINITY, Integer.MAX_VALUE, true, false);
+			itemList.add(charged);
+		}
+
+	}
+
+	@Override
+	public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_,
+			final boolean p_77663_5_) {
+		super.onUpdate(itemStack, worldObj, player, p_77663_4_, p_77663_5_);
+	}
+
+	@Override
+	public boolean canProvideEnergy(final ItemStack itemStack) {
+		double aItemCharge = ElectricItem.manager.getCharge(itemStack);		
+		return aItemCharge > 0;
+	}
+
+	@Override
+	public final Item getChargedItem(final ItemStack itemStack) {
+		final ItemStack x = itemStack.copy();
+		x.setItemDamage(27);
+		return x.getItem();
+	}
+
+	@Override
+	public final Item getEmptyItem(final ItemStack itemStack) {
+		final ItemStack x = itemStack.copy();
+		x.setItemDamage(0);
+		return x.getItem();
+	}
+
+	@Override
+	public final double getMaxCharge(final ItemStack itemStack) {
+		return maxValueEU;
+	}
+
+	@Override
+	public final int getTier(final ItemStack itemStack) {
+		return mTier;
+	}
+
+	@Override
+	public final double getTransferLimit(final ItemStack itemStack) {
+		return GT_Values.V[mTier];
+	}
+
+	@Override
+	public final double getDurabilityForDisplay(final ItemStack stack) {
+		return 1.0D - (this.getCharge(stack) / this.getMaxCharge(stack));
+	}
+
+	@Override
+	public boolean showDurabilityBar(final ItemStack stack) {
+		return true;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		list.add("");
+		String aEuInfo = StatCollector.translateToLocal("GTPP.info.euInfo");
+		String aTier = StatCollector.translateToLocal("GTPP.machines.tier");
+		String aInputLimit = StatCollector.translateToLocal("GTPP.info.inputLimit");
+		String aCurrentPower = StatCollector.translateToLocal("GTPP.info.currentPower");
+		String aEU = StatCollector.translateToLocal("GTPP.info.eu");	
+		String aEUT = aEU+"/t";
+
+		list.add(EnumChatFormatting.GOLD + aEuInfo + EnumChatFormatting.GRAY);
+		list.add(EnumChatFormatting.GRAY + aTier+": [" + EnumChatFormatting.YELLOW + this.getTier(stack)
+		+ EnumChatFormatting.GRAY + "] "+aInputLimit+": [" + EnumChatFormatting.YELLOW
+		+ this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT);
+		list.add(EnumChatFormatting.GRAY + aCurrentPower +": [" + EnumChatFormatting.YELLOW + (long) this.getCharge(stack)
+		+ EnumChatFormatting.GRAY + aEU +"] [" + EnumChatFormatting.YELLOW
+		+ MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + EnumChatFormatting.GRAY
+		+ "%]");
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
+	@Override
+	public final double charge(final ItemStack stack, final double amount, final int tier, final boolean ignoreTransferLimit,
+			final boolean simulate) {
+		/*if (!simulate) {
+			ElectricItem.manager.charge(stack, amount, tier, true, simulate);
+		}*/
+		
+		return ElectricItem.manager.charge(stack, amount, tier, true, simulate);
+	}
+
+	@Override
+	public final double discharge(final ItemStack stack, final double amount, final int tier,
+			final boolean ignoreTransferLimit, final boolean externally, final boolean simulate) {
+		/*if (!simulate) {
+			ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate);
+		}*/
+
+		return ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate);
+	}
+
+	@Override
+	public final double getCharge(final ItemStack stack) {
+		return ElectricItem.manager.getCharge(stack);
+	}
+
+	@Override
+	public final boolean canUse(final ItemStack stack, final double amount) {
+		return ElectricItem.manager.canUse(stack, amount);
+	}
+
+	@Override
+	public final boolean use(final ItemStack stack, final double amount, final EntityLivingBase entity) {
+		return ElectricItem.manager.use(stack, amount, entity);
+	}
+
+	@Override
+	public final void chargeFromArmor(final ItemStack stack, final EntityLivingBase entity) {
+		ElectricItem.manager.chargeFromArmor(stack, entity);
+	}
+
+	@Override
+	public String getToolTip(final ItemStack stack) {
+		//return ElectricItem.manager.getToolTip(stack);
+		return null;
+	}
+
+	@Override
+	public final BaubleType getBaubleType(final ItemStack arg0) {
+		return mType;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java
new file mode 100644
index 0000000000..aa89ff1627
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java
@@ -0,0 +1,175 @@
+package gtPlusPlus.core.item.bauble;
+
+import java.util.List;
+
+import baubles.api.BaubleType;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.GT_Values;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.AABB;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import ic2.api.item.ElectricItem;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
+public class MonsterKillerBaseBauble extends ElectricBaseBauble {
+
+	private final Class[] mTargets;
+
+	public MonsterKillerBaseBauble(Class[] aMonsterBaseClassArray, String aMonsterTypeName, int aPowerTier) {
+		super(BaubleType.AMULET, aPowerTier, GT_Values.V[aPowerTier] * 20 * 300,
+				"GTPP.MonsterKiller." + aMonsterTypeName + ".name");
+		mTargets = aMonsterBaseClassArray;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
+		ItemStack itemStack = new ItemStack(this, 1);
+		ItemStack charged;
+		if (this.getEmptyItem(itemStack) == this) {
+			charged = new ItemStack(this, 1);
+			ElectricItem.manager.charge(charged, 0.0D, Integer.MAX_VALUE, true, false);
+			itemList.add(charged);
+		}
+		if (this.getChargedItem(itemStack) == this) {
+			charged = new ItemStack(this, 1);
+			ElectricItem.manager.charge(charged, Double.POSITIVE_INFINITY, Integer.MAX_VALUE, true, false);
+			itemList.add(charged);
+		}
+
+	}
+
+	@Override
+	public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_,
+			final boolean p_77663_5_) {
+		super.onUpdate(itemStack, worldObj, player, p_77663_4_, p_77663_5_);
+	}
+
+	@Override
+	public boolean canProvideEnergy(final ItemStack itemStack) {
+		double aItemCharge = ElectricItem.manager.getCharge(itemStack);
+		return aItemCharge > 0;
+	}
+
+	@Override
+	public String getItemStackDisplayName(final ItemStack p_77653_1_) {
+		return (EnumChatFormatting.WHITE + super.getItemStackDisplayName(p_77653_1_) + EnumChatFormatting.GRAY);
+	}
+
+	@Override
+	public boolean showDurabilityBar(final ItemStack stack) {
+		return true;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		list.add("");
+		String aString1 = StatCollector.translateToLocal("GTPP.monsterkiller.tooltip.1");
+		String aString2 = StatCollector.translateToLocal("GTPP.monsterkiller.tooltip.2");
+		String aString3 = StatCollector.translateToLocal("GTPP.monsterkiller.tooltip.3");
+		String aString4 = StatCollector.translateToLocal("GTPP.monsterkiller.tooltip.4");
+		String aEU = StatCollector.translateToLocal("GTPP.info.eu");
+		String aEUT = aEU + "/t";
+
+		list.add(EnumChatFormatting.GREEN + aString1 + EnumChatFormatting.GRAY);
+		list.add(EnumChatFormatting.GREEN + aString2 + " " + (int) getTransferLimit(stack) + aEUT + " " + aString3
+				+ EnumChatFormatting.GRAY);
+		list.add("");
+		list.add("" + EnumChatFormatting.GREEN + aString4 + " " + EnumChatFormatting.GRAY);
+		for (Class cz : mTargets) {
+			list.add("- " + EnumChatFormatting.DARK_GREEN + cz.getSimpleName().replace("Entity", "") + EnumChatFormatting.GRAY);
+		}
+
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
+	@Override
+	public boolean canEquip(final ItemStack arg0, final EntityLivingBase arg1) {
+		return true;
+	}
+
+	@Override
+	public boolean canUnequip(final ItemStack arg0, final EntityLivingBase arg1) {
+		return true;
+	}
+
+	@Override
+	public void onEquipped(final ItemStack arg0, final EntityLivingBase arg1) {
+
+	}
+
+	@Override
+	public void onUnequipped(final ItemStack arg0, final EntityLivingBase arg1) {
+
+	}
+
+	@Override // TODO
+	public void onWornTick(final ItemStack aBaubleStack, final EntityLivingBase aPlayerEntity) {
+		if (aPlayerEntity == null) {
+			return;
+		}
+		EntityPlayer aPlayer = (EntityPlayer) aPlayerEntity;
+		if (!aPlayer.worldObj.isRemote) {
+			if (this.getCharge(aBaubleStack) >= getTransferLimit(aBaubleStack)) {
+				AABB aPlayerBox = new AABB(aPlayerEntity, 5, 5, 5);
+				if (this.mTargets != null && this.mTargets.length > 0) {
+					for (Class clazz : mTargets) {
+						AutoMap<?> aEnts = EntityUtils.getEntitiesWithinBoundingBox(clazz, aPlayerBox);
+						if (aEnts.isEmpty()) {
+							continue;
+						} else {
+							EntityLiving aClosest = null;
+							double aEntityDistance = Short.MIN_VALUE;
+							for (Object ent : aEnts) {
+								if (!EntityLiving.class.isInstance(ent)) {
+									continue;
+								} else {
+									double aCurEntDis = EntityUtils.getDistance(aPlayerEntity, (Entity) ent);
+									if (aEntityDistance == Short.MIN_VALUE || aCurEntDis < aEntityDistance) {
+										aEntityDistance = aCurEntDis;
+										aClosest = (EntityLiving) ent;
+									}
+								}
+							}
+							if (aClosest != null) {
+								float aEntHealth = aClosest.getHealth();
+								float aEntMaxHealth = aClosest.getMaxHealth();
+								double aEntHealthPerc = MathUtils.findPercentage(aEntHealth, aEntMaxHealth);
+								long aEuUsage = (long) (aEntHealthPerc * 50 * aEntMaxHealth);
+								if (this.discharge(aBaubleStack, aEuUsage, mTier, true, false, false) > 0) {
+									aClosest.setDead();
+									PlayerUtils.messagePlayer(aPlayer, "Removed 1x "+aClosest.getCommandSenderName());
+									break;
+								}
+							} else {
+								continue;
+							}
+						}
+					}
+				}
+			} else {
+				return;
+			}
+		}
+	}
+
+	@Override
+	public String getTextureNameForBauble() {
+		return CORE.MODID + ":" + "baubles/itemAmulet";
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 02afada849..ec1d51b502 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -2,8 +2,11 @@ package gtPlusPlus.core.item.chemistry;
 
 import gregtech.api.enums.TextureSet;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
+import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.material.NONMATERIAL;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -18,9 +21,28 @@ public class GenericChem extends ItemPackage {
 	 * Materials
 	 */	
 	
-	public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, "", 0);//Not a GT Inherited Material
-	public static final Material NYLON = new Material("Nylon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{45, 45, 45}, 300, 600, 44, 48, true, "", 0);//Not a GT Inherited Material
-	public static final Material TEFLON = new Material("Teflon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{75, 45, 75}, 300, 600, 44, 48, true, "", 0);//Not a GT Inherited Material
+	public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, null, 0);//Not a GT Inherited Material
+	public static final Material NYLON = new Material("Nylon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{45, 45, 45}, 300, 600, 44, 48, true, null, 0);//Not a GT Inherited Material
+	
+	//Refined PTFE
+	public static final Material TEFLON = new Material(
+			"Teflon",
+			MaterialState.SOLID,
+			TextureSet.SET_SHINY,
+			new short[] { 75, 45, 75 },
+			330, 640,
+			-1, -1,
+			false,
+			null,
+			0,
+			new MaterialStack[] {
+					new MaterialStack(NONMATERIAL.PTFE, 75),
+					new MaterialStack(NONMATERIAL.PLASTIC, 15),
+					new MaterialStack(ELEMENT.getInstance().CARBON, 5),
+					new MaterialStack(ELEMENT.getInstance().SODIUM, 5)
+					});// Not a GT
+																										// Inherited
+																										// Material
 
 	//public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
 	//public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
diff --git a/src/Java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java b/src/Java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java
new file mode 100644
index 0000000000..9fd7bf7020
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java
@@ -0,0 +1,117 @@
+package gtPlusPlus.core.item.wearable.armour.hazmat;
+
+import java.util.List;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.wearable.armour.ArmourLoader;
+import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class ArmourHazmat extends BaseArmourHelm {
+
+	public IIcon iconHelm;
+
+	public ArmourHazmat() {
+		super(ArmourLoader.TinFoilArmour, 0);
+	}
+
+	@SideOnly(Side.CLIENT)
+	public void registerIcons(IIconRegister ir) {
+		this.iconHelm = ir.registerIcon(CORE.MODID + ":itemHatTinFoil");
+	}
+
+	@Override
+	public int getRenderIndex() {
+		return 0;
+	}
+
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconFromDamage(int par1) {
+		return this.iconHelm;
+	}
+
+	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
+		return CORE.MODID + ":textures/models/TinFoil.png";
+	}
+
+	public EnumRarity getRarity(ItemStack itemstack) {
+		return EnumRarity.rare;
+	}
+
+	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
+		return false;
+	}
+
+	@Override
+	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
+		return super.getArmorDisplay(player, armor, slot);
+	}
+
+	@Override
+	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
+
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	@Override
+	public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
+		aList.add("DoomSquirter's protection against cosmic radiation!");
+		aList.add("General paranoia makes the wearer unable to collect xp");
+		aList.add("Movement speed is also reduced, to keep you safe");
+		aList.add("This hat may also have other strange powers");
+	}
+
+	@Override
+	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
+			int slot) {
+		return new ArmorProperties(0, 0, 0);
+	}
+
+	@Override
+	public boolean isDamageable() {
+		return false;
+	}
+
+	@Override
+	public boolean itemInteractionForEntity(ItemStack p_111207_1_, EntityPlayer p_111207_2_,
+			EntityLivingBase p_111207_3_) {
+		return super.itemInteractionForEntity(p_111207_1_, p_111207_2_, p_111207_3_);
+	}
+
+	@Override
+	public void onUpdate(ItemStack aStack, World aWorld, Entity aEntity, int p_77663_4_, boolean p_77663_5_) {
+		super.onUpdate(aStack, aWorld, aEntity, p_77663_4_, p_77663_5_);
+	}
+
+	@Override
+	public boolean onEntityItemUpdate(EntityItem entityItem) {
+		return super.onEntityItemUpdate(entityItem);
+	}
+
+	@Override
+	public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
+		if (itemStack != null && player != null && world != null && !world.isRemote) {
+			if (player instanceof EntityPlayer) {
+				
+			}
+		}
+		super.onArmorTick(world, player, itemStack);
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 4edd36c51f..d2639a220f 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -190,7 +190,7 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20),
 					new MaterialStack(NICHROME, 10)
 			});
-	
+
 	public static final Material NITINOL_60 = new Material(
 			"Nitinol 60", //Material Name
 			MaterialState.SOLID, //State
@@ -474,7 +474,7 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().CARBON, 50),
 					new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50)
 			});
-	
+
 	public static final Material TUNGSTEN_TITANIUM_CARBIDE = new Material(
 			"Tungsten Titanium Carbide", //Material Name
 			MaterialState.SOLID, //State
@@ -549,7 +549,7 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 50),
 					new MaterialStack(ELEMENT.getInstance().CARBON, 50)
 			});
-	
+
 	public static final Material ARCANITE = new Material(
 			"Arcanite", //Material Name
 			MaterialState.SOLID, //State
@@ -680,7 +680,7 @@ public final class ALLOY {
 					new MaterialStack(TRINIUM_NAQUADAH, 9),
 					new MaterialStack(ELEMENT.getInstance().CARBON, 1)
 			});
-	
+
 	public static final Material TRINIUM_REINFORCED_STEEL = new Material(
 			"Arceus Alloy 2B", //Material Name
 			MaterialState.SOLID, //State
@@ -697,8 +697,8 @@ public final class ALLOY {
 					new MaterialStack(ALLOY.TUNGSTENSTEEL, 20),
 					new MaterialStack(ALLOY.OSMIRIDIUM, 10)
 			});
-	
-	
+
+
 
 	/*
 	 * Witchery Material
@@ -719,12 +719,12 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().THAUMIUM, 30),
 					new MaterialStack(ELEMENT.getInstance().IRON, 35)
 			});
-	
-	
+
+
 	/*
 	 * Top Tier Alloys
 	 */
-	
+
 	//0lafe Compound
 	public static final Material LAFIUM = new Material(
 			"Lafium Compound", //Material Name
@@ -768,12 +768,12 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
 					new MaterialStack(ALLOY.OSMIRIDIUM, 6)
 			});
-	
+
 	//Piky Alloy
 	public static final Material PIKYONIUM = new Material(
 			"Pikyonium 64B", //Material Name
 			MaterialState.SOLID, //State
-            new short[]{52, 103, 186, 0}, //Material Colour
+			new short[]{52, 103, 186, 0}, //Material Colour
 			7850, //Melting Point in C
 			11765, //Boiling Point in C
 			-1,
@@ -787,10 +787,10 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().CERIUM, 6),
 					new MaterialStack(ELEMENT.getInstance().ANTIMONY, 4),
 					new MaterialStack(ELEMENT.getInstance().PLATINUM, 4),					
-					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
 					new MaterialStack(ALLOY.TUNGSTENSTEEL, 8)
 			});
-	
+
 	//Piky Alloy
 	public static final Material ABYSSAL = new Material(
 			"Abyssal Alloy", //Material Name
@@ -812,7 +812,7 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().RADON, 2),
 					new MaterialStack(ELEMENT.getInstance().GERMANIUM, 2),
 			});
-	
+
 	//Titansteel
 	public static final Material TITANSTEEL = new Material(
 			"Titansteel", //Material Name
@@ -830,8 +830,8 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().TERRA, 1),
 					new MaterialStack(ELEMENT.getInstance().PERDITIO, 1),
 			});
-	
-	
+
+
 	public static final Material OCTIRON = new Material(
 			"Octiron", //Material Name
 			MaterialState.SOLID, //State
@@ -849,7 +849,62 @@ public final class ALLOY {
 					new MaterialStack(STEEL_BLACK, 10),
 					new MaterialStack(ELEMENT.getInstance().THAUMIUM, 25)
 			});
+
+
+
+	public static final Material BLACK_TITANIUM = new Material(
+			"Black Titanium", //Material Name
+			MaterialState.SOLID, //State
+			null, //Material Colour
+			Materials.Titanium.mMeltingPoint*4, //Melting Point in C
+			Materials.Titanium.mMeltingPoint*16,
+			-1,
+			-1,
+			true, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 55),
+					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 12),
+					new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 8),
+					new MaterialStack(ELEMENT.getInstance().COBALT, 6),
+					new MaterialStack(ELEMENT.getInstance().MANGANESE, 4),
+					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 4),
+					new MaterialStack(ELEMENT.getInstance().PALLADIUM, 4),
+					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().ARGON, 5)
+			});
 	
+	public static final Material BABBIT_ALLOY = new Material(
+			"Babbit Alloy", //Material Name
+			MaterialState.SOLID, //State
+			null, //Material Colour
+			268, //Melting Point in C
+			589,
+			-1,
+			-1,
+			true, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().TIN, 10),
+					new MaterialStack(ELEMENT.getInstance().LEAD, 72),
+					new MaterialStack(ELEMENT.getInstance().ANTIMONY, 16),
+					new MaterialStack(ELEMENT.getInstance().ARSENIC, 2)
+			});
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 	//Quantum
 	public static final Material QUANTUM = new Material(
 			"Quantum", //Material Name
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 62e1163a39..e972992391 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -11,7 +11,7 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
 public final class ELEMENT {
 
-	public static final String[] NAMES = new String[]{"Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminum", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Cesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};	
+	public static final String[] NAMES = new String[]{"Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};	
 	
 	//First 50 Elements
 	public final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen);
@@ -68,7 +68,7 @@ public final class ELEMENT {
 	public final Material TELLURIUM = new Material("Tellurium", MaterialState.SOLID, new short[]{210, 210, 210}, 449, 989, 52, 76, false, "Te", 0);//Not a GT Inherited Material
 	public final Material IODINE = new Material("Iodine", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{96, 96, 96}, 114, 184, 53, 74, false, "I", 0);//Not a GT Inherited Material
 	public final Material XENON = new Material("Xenon", MaterialState.GAS, new short[]{255, 255, 255}, -111, -108, 54, 77, false, "Xe", 0);//Not a GT Inherited Material
-	public final Material CESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Caesium);
+	public final Material CAESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Caesium);
 	public final Material BARIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Barium);
 	public final Material LANTHANUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lanthanum);
 	public final Material CERIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Cerium);
@@ -212,7 +212,15 @@ public final class ELEMENT {
 		public static final Material ASTRAL_TITANIUM = new Material("Astral Titanium", MaterialState.SOLID, TextureSets.REFINED.get(), new short[] {220, 160, 240, 2}, INSTANCE.TITANIUM.getMeltingPointC()+7500, INSTANCE.TITANIUM.getBoilingPointC()+7500, 145, 133, true, "✧◇✧", 0);//Not a GT Inherited Material
 		public static final Material CHRONOMATIC_GLASS = new Material("Chromatic Glass", MaterialState.SOLID, new short[]{255, 255, 255, 3}, 9200, 17550, 40, 51, false, "⌘☯𓍰 𓍱 𓍲 𓍳 𓍴 𓍵 𓍶 𓍷 𓍸 ☯⌘ ", 0);//Not a GT Inherited Material
 		public static final Material ADVANCED_NITINOL = new Material("Advanced Nitinol", MaterialState.SOLID, TextureSets.ENRICHED.get(), ALLOY.NITINOL_60.getRGB(), 8400, 14377, 40, 51, true, "⚷⚙⚷ Ni4Ti6", 0);//Not a GT Inherited Material
-		public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
+		public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75, 2}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
+		
+		
+		//Runescape materials
+		public static final Material BLACK_METAL = new Material("Black Metal", MaterialState.SOLID, TextureSet.SET_METALLIC, new short[] {5, 5, 5}, 2350, 4650, 24, 17, false, "҈", 0, new MaterialStack[]{new MaterialStack(getInstance().LEAD, 15), new MaterialStack(getInstance().TUNGSTEN, 25), new MaterialStack(getInstance().CARBON, 60)});//Not a GT Inherited Material
+		public static final Material WHITE_METAL = new Material("White Metal", MaterialState.SOLID, TextureSet.SET_METALLIC, new short[] {255, 255, 255}, 4560, 7580, 35, 41, false, "҉", 0, new MaterialStack[]{new MaterialStack(getInstance().COPPER, 5), new MaterialStack(getInstance().ANTIMONY, 10), new MaterialStack(getInstance().PLATINUM, 10), new MaterialStack(getInstance().TIN, 75)});//Not a GT Inherited Material
+		public static final Material GRANITE = new Material("Ancient Granite", MaterialState.SOLID, TextureSet.SET_SAND, new short[] {107, 107, 107}, 500, 2000, 16, 12, false, "«»", 0, false);//Not a GT Inherited Material
+		public static final Material RUNITE = new Material("Runite", MaterialState.SOLID, TextureSet.SET_FINE, new short[] {60, 200, 190}, 6750, 11550, 73, 87, true, "§", 0);//Not a GT Inherited Material
+		public static final Material DRAGON_METAL = new Material("Dragonblood", MaterialState.SOLID, TextureSet.SET_SHINY, new short[] {220, 40, 20, 2}, 10160, 17850, 96, 105, true, "۞", 0);//Not a GT Inherited Material
 		
 	}
 
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 58a7f68afe..8fb3c5fc3b 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -141,7 +141,7 @@ public class Material {
 		this (materialName, defaultState, set, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, true, true, inputs);
 	}	
 
-	public Material(final String materialName, final MaterialState defaultState, final TextureSet set, final long durability, short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean generateCells, boolean generateFluid, final MaterialStack... inputs){
+	public Material(final String materialName, final MaterialState defaultState, final TextureSet set, final long durability, short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, String chemicalSymbol, final int radiationLevel, boolean generateCells, boolean generateFluid, final MaterialStack... inputs){
 
 		if (mMaterialMap.add(this)) {
 
@@ -442,6 +442,11 @@ public class Material {
 
 
 			//Makes a Fancy Chemical Tooltip
+			
+			if (chemicalSymbol == null) {
+				chemicalSymbol = "";
+			}
+			
 			this.vChemicalSymbol = chemicalSymbol;
 			if (this.vMaterialInput != null){
 				this.vChemicalFormula = this.getToolTip(chemicalSymbol, OrePrefixes.dust.mMaterialAmount / M, true);
diff --git a/src/Java/gtPlusPlus/core/material/NONMATERIAL.java b/src/Java/gtPlusPlus/core/material/NONMATERIAL.java
index 4da34ae16c..7ab72d50bc 100644
--- a/src/Java/gtPlusPlus/core/material/NONMATERIAL.java
+++ b/src/Java/gtPlusPlus/core/material/NONMATERIAL.java
@@ -27,7 +27,11 @@ public class NONMATERIAL {
 	//Wrought Iron
 	public static final Material WROUGHT_IRON = MaterialUtils.generateMaterialFromGtENUM(Materials.WroughtIron);
 
-	
+	//PTFE
+	public static final Material PTFE = MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterial("Polytetrafluoroethylene", "Plastic"));
+
+	//Plastic
+	public static final Material PLASTIC = MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterial("Plastic", "Rubber"));
 	
 	
 	static {
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index a4dc366aee..68f7bdd762 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -2127,6 +2127,21 @@ public class RECIPES_GREGTECH {
 
 	private static void sifterRecipes() {		
 
+		// Rare Earth Processing
+		GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1),
+				new ItemStack[] { 
+						ELEMENT.getInstance().YTTRIUM.getSmallDust(1),
+						ELEMENT.getInstance().NEODYMIUM.getSmallDust(1),
+						ELEMENT.getInstance().LANTHANUM.getSmallDust(1),
+						ELEMENT.getInstance().CERIUM.getSmallDust(1),
+						ELEMENT.getInstance().CADMIUM.getSmallDust(1),
+						ELEMENT.getInstance().CAESIUM.getSmallDust(1),
+						ELEMENT.getInstance().YTTERBIUM.getTinyDust(1),
+						ELEMENT.getInstance().SAMARIUM.getTinyDust(1),
+						ELEMENT.getInstance().GADOLINIUM.getTinyDust(1)
+						},
+				new int[] { 2000, 2000, 2000, 2000, 2000, 2000, 1000, 1000, 1000 }, 20 * 30, 500);
+		
 		// Zirconium
 		GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIlmenite", 1),
 				new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1),
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 54d9994edc..c26b01d0f7 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -702,26 +702,26 @@ public class RECIPES_Machines {
 						RECIPE_IndustrialMultiTankController);
 			}
 
-			ItemStack mSemiFluidgen = ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1);
 			//Semi-Fluid Generators
-			GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_LV.get(1L, new Object[0]), CI.bitsd,
-					new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'),
-							ItemList.Electric_Piston_LV, Character.valueOf('E'), ItemList.Electric_Motor_LV,
-							Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
-							mSemiFluidgen, Character.valueOf('G'),
-							OrePrefixes.gearGt.get(Materials.Steel) });
-			GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_MV.get(1L, new Object[0]), CI.bitsd,
-					new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
-							ItemList.Electric_Piston_MV, Character.valueOf('E'), ItemList.Electric_Motor_MV,
-							Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
-							mSemiFluidgen, Character.valueOf('G'),
-							OrePrefixes.gearGt.get(Materials.Aluminium) });
-			GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_HV.get(1L, new Object[0]), CI.bitsd,
-					new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'),
-							ItemList.Electric_Piston_HV, Character.valueOf('E'), ItemList.Electric_Motor_HV,
-							Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'),
-							mSemiFluidgen, Character.valueOf('G'),
-							OrePrefixes.gearGt.get(Materials.StainlessSteel) });
+			ItemStack mSemiFluidgen = ItemUtils.getItemStackFromFQRN("IC2:blockGenerator:7", 1);
+			mSemiFluidgen.setItemDamage(7);
+					//ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1);			
+			ItemStack[] aSemifluids = new ItemStack[] {mSemiFluidgen, GregtechItemList.Generator_SemiFluid_LV.get(1), GregtechItemList.Generator_SemiFluid_MV.get(1), GregtechItemList.Generator_SemiFluid_HV.get(1)};
+			for (int o=1;o<4;o++) {
+				CORE.RA.addSixSlotAssemblingRecipe(
+						new ItemStack[] {
+								aSemifluids[o-1],
+								CI.getElectricPiston(o, GTNH ? 4 : 2),
+								CI.getElectricMotor(o, GTNH ? 2 : 1),
+								CI.getTieredComponent(OrePrefixes.circuit, o, GTNH ? 4 : 2),
+								CI.getPlate(o, GTNH ? 8 : 4),
+								CI.getGear(o-1, GTNH ? 4 : 2)
+						},
+						CI.getAlternativeTieredFluid(o, 144 * 4),
+						aSemifluids[o],
+						20 * 30,
+						(int) GT_Values.V[o]);
+			}			
 
 			if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter){
 				//Industrial Blast Smelter
@@ -849,15 +849,15 @@ public class RECIPES_Machines {
 			if (CORE.ConfigSwitches.enableMachine_SimpleWasher){
 				ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1);
 				ItemStack washerPipe;
+				
+				
 				if (CORE.ConfigSwitches.enableCustom_Pipes){
 					washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1);
 					RecipeUtils.addShapedGregtechRecipe(
 							plateWrought, CI.electricPump_LV, plateWrought,
 							plateWrought, washerPipe, plateWrought,
 							plateWrought, CI.machineCasing_ULV, plateWrought,
-							GregtechItemList.SimpleDustWasher.get(1));
-				}
-				else {			
+							GregtechItemList.SimpleDustWasher_ULV.get(1));
 				}
 				//Add Recipe
 				washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeCopper", 1);					
@@ -865,7 +865,69 @@ public class RECIPES_Machines {
 						plateWrought, CI.electricPump_LV, plateWrought,
 						plateWrought, washerPipe, plateWrought,
 						plateWrought, CI.machineCasing_ULV, plateWrought,
-						GregtechItemList.SimpleDustWasher.get(1));
+						GregtechItemList.SimpleDustWasher_ULV.get(1));
+				
+				int aSimpleWasherTier = 2;
+				int aSlot = 0;
+				ItemStack[][] aInputsForSimpleWashers = new ItemStack[4][6];
+
+				aInputsForSimpleWashers[0] = new ItemStack[] {
+						CI.getTieredMachineHull(2),
+						CI.getTieredComponent(OrePrefixes.screw, 2, GTNH ? 16 : 8),
+						CI.getTieredComponent(OrePrefixes.plate, 1, GTNH ? 8 : 4),
+						CI.getTieredComponent(OrePrefixes.rod, 2, GTNH ? 4 : 2),
+						CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 3 : 1),
+						
+				};
+				aInputsForSimpleWashers[1] = new ItemStack[] {
+						CI.getTieredMachineHull(4),
+						CI.getTieredComponent(OrePrefixes.screw, 4, GTNH ? 24 : 12),
+						CI.getTieredComponent(OrePrefixes.plate, 3, GTNH ? 12 : 6),
+						CI.getTieredComponent(OrePrefixes.rod, 4, GTNH ? 6 : 3),
+						CI.getTieredComponent(OrePrefixes.circuit, 4, GTNH ? 4 : 2),
+						
+				};
+				aInputsForSimpleWashers[2] = new ItemStack[] {
+						CI.getTieredMachineHull(6),
+						CI.getTieredComponent(OrePrefixes.screw, 6, GTNH ? 48 : 24),
+						CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 16 : 8),
+						CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 8 : 4),
+						CI.getTieredComponent(OrePrefixes.circuit, 6, GTNH ? 6 : 3),
+						
+				};
+				aInputsForSimpleWashers[3] = new ItemStack[] {
+						CI.getTieredMachineHull(8),
+						CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 64 : 32),
+						CI.getTieredComponent(OrePrefixes.plate, 7, GTNH ? 32 : 16),
+						CI.getTieredComponent(OrePrefixes.rod, 8, GTNH ? 10 : 5),
+						CI.getTieredComponent(OrePrefixes.circuit, 8, GTNH ? 8 : 4),
+						
+				};
+				
+				
+				
+				
+				
+				
+				ItemStack[] aSimpleWashers = new ItemStack[] {GregtechItemList.SimpleDustWasher_MV.get(1), GregtechItemList.SimpleDustWasher_EV.get(1), GregtechItemList.SimpleDustWasher_LuV.get(1), GregtechItemList.SimpleDustWasher_UV.get(1)};
+				for (int i=0;i<4;i++) {
+					
+					CORE.RA.addSixSlotAssemblingRecipe(
+							aInputsForSimpleWashers[aSlot],
+							CI.getTieredFluid(aSimpleWasherTier, 144 * aSimpleWasherTier), 
+							aSimpleWashers[aSlot], 
+							20 * 15 * aSimpleWasherTier,
+							(int) GT_Values.V[aSimpleWasherTier]);
+					
+					aSimpleWasherTier += 2;
+					aSlot++;
+				}
+				
+				
+				
+				
+				
+				
 			}
 
 			if (CORE.ConfigSwitches.enableMachine_Pollution && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index ba592bcb65..ca334fe0d3 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -369,6 +369,7 @@ public class CI {
 		return Materials._NULL;
 	}
 
+	@Deprecated
 	public static String getTieredComponent(OrePrefixes type, int tier){
 		Object material = getMaterialFromTier(tier);
 		if (material != null){
@@ -769,6 +770,10 @@ public class CI {
 
 		ItemStack aTempStack = null;
 		
+		if (aPrefix == OrePrefixes.rod) {
+			aPrefix = OrePrefixes.stick;
+		}
+		
 		if (aPrefix == OrePrefixes.gear || aPrefix == OrePrefixes.gearGt) {
 			m = aMaster[0][aTier];
 		}
diff --git a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
index bb7004350d..c3670ef959 100644
--- a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
+++ b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -7,6 +7,7 @@ import gtPlusPlus.core.block.general.BlockSuperLight.TileEntitySuperLight;
 import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.tileentities.general.*;
+import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler;
 import gtPlusPlus.core.tileentities.machines.*;
 import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
 
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java b/src/Java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java
new file mode 100644
index 0000000000..eda0c65e46
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java
@@ -0,0 +1,468 @@
+package gtPlusPlus.core.tileentities.general.redstone;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.api.interfaces.IToolable;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.EnumSkyBlock;
+import net.minecraft.world.IBlockAccess;
+
+public abstract class TileEntityRedstoneHandler extends TileEntity implements IToolable {
+
+	private final int mTileType;
+	private BlockPos mTilePos;
+	private boolean mRequiresUpdate = false;
+	private Long mStartTime;
+	private Byte mRedstoneLevel;
+	
+	public boolean mLightMode = false;
+	public float mLightValue = 0;	
+	
+	/**
+	 * Sets the Redstone Handler Type. 
+	 * @param aTileType - A type of the handler designated by an int. 0 = receiver, 1 = emitter, 2 = both, anything else = nothing.
+	 */
+	public TileEntityRedstoneHandler(int aTileType) {
+		mTileType = aTileType;
+		registerTileEntity();
+	}
+	
+	private void registerTileEntity() {
+		if (!EntityUtils.isTileEntityRegistered(getTileEntityClass(), getTileEntityNameForRegistration())) {
+			GameRegistry.registerTileEntity(getTileEntityClass(), getTileEntityNameForRegistration());
+		}
+	}
+	
+	protected abstract Class<? extends TileEntity> getTileEntityClass();
+	
+	protected abstract String getTileEntityNameForRegistration();
+	
+	public Block getBlock() {
+		return mTilePos != null ? mTilePos.getBlockAtPos() : Blocks.redstone_block;
+	}
+
+	public final boolean isLight() {
+		return mLightMode;
+	}	
+	
+	public final float getLightBrightness() {
+		if (!isLight()) {
+			return 0;
+		}
+		else {
+			return mLightValue;
+		}
+	}
+	
+	@Override
+	public void readFromNBT(NBTTagCompound aNBT) {
+		mStartTime = aNBT.getLong("mStartTime");
+		mInvName = aNBT.getString("mInvName");
+		mLightValue = aNBT.getFloat("mLightValue");
+		mLightMode = aNBT.getBoolean("mLightMode");
+		mRedstoneLevel = aNBT.getByte("mRedstoneLevel");
+		super.readFromNBT(aNBT);
+	}
+
+	@Override
+	public void writeToNBT(NBTTagCompound aNBT) {
+		aNBT.setInteger("mTileType", mTileType);
+		aNBT.setLong("mStartTime", mStartTime);
+		aNBT.setString("mInvName", mInvName);
+		aNBT.setFloat("mLightValue", getLightBrightness());
+		aNBT.setBoolean("mLightMode", isLight());
+		aNBT.setByte("mRedstoneLevel", mRedstoneLevel);
+		super.writeToNBT(aNBT);
+	}
+	
+
+	private boolean mHasUpdatedRecently = false;
+	
+	private final boolean init() {
+		if (mTilePos == null) {
+			try {
+				mTilePos = new BlockPos(this);
+			} catch (Throwable t) {
+				return false;
+			}
+		}
+		if (mStartTime == null) {
+			try {
+				mStartTime = System.currentTimeMillis();
+			} catch (Throwable t) {
+				return false;
+			}
+		}
+		return true;
+	}
+	private Long mLastUpdate;
+	private String mInvName = "";
+	
+	@Override
+	public void updateEntity() {		
+		//Handle init
+		if (!init()) {
+			return;
+		}		
+		if (mRequiresUpdate || mLastUpdate == null) {
+			mRequiresUpdate = false;
+			mHasUpdatedRecently = true;
+			mLastUpdate = System.currentTimeMillis();
+			if (mTilePos.world.getBlockLightValue(xCoord, yCoord, zCoord) != getLightBrightness()/0.0625f) {
+				mTilePos.getBlockAtPos().setLightLevel(getLightBrightness()/0.0625f);
+				mTilePos.world.setLightValue(EnumSkyBlock.Block, xCoord, yCoord, zCoord, (int) (getLightBrightness()/0.0625f));	
+				mTilePos.world.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord);
+				Logger.INFO("Updating Light");
+			}	
+			mTilePos.world.scheduleBlockUpdate(xCoord, yCoord, zCoord, mTilePos.getBlockAtPos(), 1);		
+			markDirty();
+		}		
+		if (Utils.getMillisSince(mLastUpdate, System.currentTimeMillis()) >= 5000) {
+			if (mHasUpdatedRecently) {
+				mHasUpdatedRecently = false;
+				this.markForUpdate();
+			}
+		}		
+		
+		if (Utils.getMillisSince(mStartTime, System.currentTimeMillis()) % 50 == 0) {
+			
+		}
+		
+		
+		
+		super.updateEntity();
+	}
+	
+	public final void markForUpdate() {
+		mRequiresUpdate = true;
+	}
+	
+	public final boolean hasUpdatedRecently() {
+		return mHasUpdatedRecently;
+	}
+
+	@Override
+	public int getBlockMetadata() {
+		return super.getBlockMetadata();
+	}
+
+	@Override
+	public void markDirty() {
+		super.markDirty();
+	}
+
+	@Override
+	public boolean canUpdate() {
+		return true;
+	}
+	
+	public void setRedstoneState(boolean aRedstoneActive) {
+		
+	}
+	
+	public void setCurrentTextureArray(IIcon[] aTextures) {
+		
+	}
+	
+    /**
+     * Used to see if one of the blocks next to you or your block is getting power from a neighboring block. Used by
+     * items like TNT or Doors so they don't have redstone going straight into them.  Args: x, y, z
+     */
+	public boolean isGettingIndirectlyPowered() {
+		if (mTilePos == null) {
+			return false;
+		}
+		return mTilePos.world.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord);
+	}
+	
+	public int getStrongestIndirectPower() {
+		if (mTilePos == null) {
+			return 0;
+		}
+		return mTilePos.world.getStrongestIndirectPower(xCoord, yCoord, zCoord);		
+	}
+	
+    /**
+     * Gets the power level from a certain block face.  Args: x, y, z, direction
+     */
+	public int getIndirectPowerForSide(int aSide) {
+		if (mTilePos == null || aSide <0 || aSide > 5) {
+			return 0;
+		}
+		return mTilePos.world.getIndirectPowerLevelTo(xCoord, yCoord, zCoord, aSide);		
+	}
+	
+	/**
+     * Returns the highest redstone signal strength powering the given block. Args: X, Y, Z.
+     */
+	public int getBlockPowerInput() {
+		if (mTilePos == null) {
+			return 0;
+		}
+		return mTilePos.world.getBlockPowerInput(xCoord, yCoord, zCoord);		
+	}	
+	
+    /**
+     * Determine if this block can make a redstone connection on the side provided,
+     * Useful to control which sides are inputs and outputs for redstone wires.
+     *
+     * Side:
+     *  -1: UP
+     *   0: NORTH
+     *   1: EAST
+     *   2: SOUTH
+     *   3: WEST
+     *
+     * @param world The current world
+     * @param x X Position
+     * @param y Y Position
+     * @param z Z Position
+     * @param side The side that is trying to make the connection
+     * @return True to make the connection
+     */
+	public boolean canConnectRedstone(IBlockAccess world, int x, int y, int z, int side) {
+		if (mTilePos == null) {
+			return false;
+		}
+		return canAcceptRedstoneSignal() || canSupplyRedstoneSignal();
+	}
+
+    /**
+     * Called to determine whether to allow the a block to handle its own indirect power rather than using the default rules.
+     * @param world The world
+     * @param x The x position of this block instance
+     * @param y The y position of this block instance
+     * @param z The z position of this block instance
+     * @param side The INPUT side of the block to be powered - ie the opposite of this block's output side
+     * @return Whether Block#isProvidingWeakPower should be called when determining indirect power
+     */
+	public boolean shouldCheckWeakPower(IBlockAccess world, int x, int y, int z, int side) {
+		if (mTilePos == null) {
+			return false;
+		}
+        return getBlock().isNormalCube();
+	}
+
+    /**
+     * If this block should be notified of weak changes.
+     * Weak changes are changes 1 block away through a solid block.
+     * Similar to comparators.
+     *
+     * @param world The current world
+     * @param x X Position
+     * @param y Y position
+     * @param z Z position
+     * @param side The side to check
+     * @return true To be notified of changes
+     */
+	public boolean getWeakChanges(IBlockAccess world, int x, int y, int z) {
+		if (mTilePos == null) {
+			return false;
+		}
+		return false;
+	}
+	
+	
+	/**
+	 * Override this to change the level of redstone output.
+	 * @return
+	 */
+	public int getRedstoneLevel() {
+		if (mTilePos == null || mRedstoneLevel == null) {
+			return 0;
+		}
+		else {
+			if (canSupplyRedstoneSignal()) {				
+				if (this.hasUpdatedRecently()) {
+					int aInputPower = getInputPowerLevel();
+					mRedstoneLevel = (byte) ((aInputPower >= 0 && aInputPower <= 127) ? aInputPower : 0);					
+				}
+				return mRedstoneLevel;				
+			}
+		}		
+		return 0;
+	}
+	
+	
+	public boolean providesWeakPower() {
+		return isProvidingPower();
+	}
+	
+	public boolean providesStrongPower() {
+		return isProvidingPower();
+	}
+
+
+	/**
+	 * Returns the amount of week power this block is providing to a side.
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @param side
+	 * @return
+	 */
+	public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) {		
+		if (!providesWeakPower()) {
+			return 0;
+		}
+		return getOutputPowerLevel();
+	}
+	/**
+	 * Returns the amount of strong power this block is providing to a side.
+	 * @param world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @param side
+	 * @return
+	 */
+	public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int side) {
+		if (!providesStrongPower()) {
+			return 0;
+		}
+		return getOutputPowerLevel();
+	}
+	
+	
+	
+	
+	
+	
+	
+	/*
+	 * Alk's Simplified Redstone Handling functions (Fuck redstone)
+	 */
+	
+	/**
+	 * 
+	 * @return - Does this Block supply redstone signal at all?
+	 */
+	public final boolean isPowered() {
+		return canAcceptRedstoneSignal() && getInputPowerLevel() > 0;
+	}
+	
+	/**
+	 * 
+	 * @return - Can this Block provide redstone signal at all?
+	 */
+	public final boolean isProvidingPower() {
+		return canSupplyRedstoneSignal() && getOutputPowerLevel() > 0;
+	}
+	
+	/**
+	 * 
+	 * @return - (0-15) Redstone Output signal level
+	 */
+	public final int getOutputPowerLevel() {
+		return getRedstoneLevel();
+	}
+	
+	/**
+	 * 
+	 * @return (0-15) Redstone Input Signal level
+	 */
+	public final int getInputPowerLevel() {
+		return getBlockPowerInput();
+	}
+	
+	/**
+	 * 
+	 * @return - Does this Tile Entity support outputting redstone?
+	 */
+	public final boolean canSupplyRedstoneSignal() {
+		return mTileType == 1 || mTileType == 2;
+	}
+	
+	/**
+	 * 
+	 * @return - Does this Tile Entity support inputting redstone?
+	 */
+	public final boolean canAcceptRedstoneSignal() {
+		return mTileType == 0 || mTileType == 2;
+	}
+
+
+	@Override
+	public boolean isScrewdriverable() {
+		return false;
+	}
+
+
+	@Override
+	public boolean onScrewdriverLMB() {
+		return false;
+	}
+
+
+	@Override
+	public boolean onScrewdriverRMB() {
+		return false;
+	}
+
+
+	@Override
+	public boolean isWrenchable() {
+		return false;
+	}
+
+
+	@Override
+	public boolean onWrenchLMB() {
+		return false;
+	}
+
+
+	@Override
+	public boolean onWrenchRMB() {
+		return false;
+	}
+
+
+	@Override
+	public boolean isMalletable() {
+		return false;
+	}
+
+
+	@Override
+	public boolean onMalletLMB() {
+		return false;
+	}
+
+
+	@Override
+	public boolean onMalletRMB() {
+		return false;
+	}
+
+
+	public void setCustomName(String displayName) {
+		this.mInvName = displayName;		
+	}
+	
+	public String getCustomName() {
+		return this.mInvName;
+	}
+
+	public String getInventoryName() {
+		return this.hasCustomInventoryName() ? this.mInvName : "container.redstone.generic";
+	}
+
+	public boolean hasCustomInventoryName() {
+		return (this.mInvName != null) && !this.mInvName.equals("");
+	}
+	
+	
+	
+	
+	
+	
+}
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
index 18954f12b6..6bb4c932dc 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.core.tileentities.machines;
 
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -15,7 +14,6 @@ import net.minecraft.entity.passive.EntitySheep;
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.entity.passive.IAnimals;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
@@ -132,17 +130,17 @@ public class TileEntityAdvPooCollector extends TileEntityBaseFluidCollector {
 	}
 
 	@Override
-	public Item itemToSpawnInWorldIfTankIsFull() {
+	public ItemStack itemToSpawnInWorldIfTankIsFull() {		
 		int a = MathUtils.randInt(0, 75);
-		Item aItem = null;		
+		ItemStack aItem = null;		
 		if (a <= 30) {
-			aItem = AgriculturalChem.dustDirt;
+			aItem = ItemUtils.getSimpleStack(AgriculturalChem.dustDirt);
 		}
 		else if (a <= 40) {
-			aItem = ItemUtils.getItemStackOfAmountFromOreDict("dustManureByproducts", 1).getItem();
+			aItem = ItemUtils.getItemStackOfAmountFromOreDict("dustManureByproducts", 1);
 		}
 		else if (a <= 55) {
-			aItem = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallManureByproducts", 1).getItem();
+			aItem = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallManureByproducts", 1);
 		}		
 		return aItem;
 	}
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
index 78b8f74799..cdae4cf829 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
@@ -2,7 +2,6 @@ package gtPlusPlus.core.tileentities.machines;
 
 import java.util.List;
 
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
@@ -11,7 +10,6 @@ import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.entity.item.EntityItem;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.NetworkManager;
@@ -208,9 +206,11 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem
 				this.tank.fill(FluidUtils.getFluidStack(fluidToProvide(), aFluidAmount), true);
 			}
 			else {
-				ItemStack aDirtStack = ItemUtils.getSimpleStack(itemToSpawnInWorldIfTankIsFull());
-				if (aDirtStack != null)
-				if (!this.mInventory.addItemStack(aDirtStack)) {
+				ItemStack aDirtStack = ItemUtils.getSimpleStack(itemToSpawnInWorldIfTankIsFull(), 1);				
+				if (!ItemUtils.checkForInvalidItems(aDirtStack)) {
+					return;
+				}				
+				if (!this.mInventory.addItemStack(aDirtStack)) {					
 					EntityItem entity = new EntityItem(worldObj, xCoord, yCoord+1.5, zCoord, aDirtStack);
 					worldObj.spawnEntityInWorld(entity);
 				}
@@ -230,7 +230,7 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem
 	
 	public abstract Fluid fluidToProvide();
 	
-	public abstract Item itemToSpawnInWorldIfTankIsFull();
+	public abstract ItemStack itemToSpawnInWorldIfTankIsFull();
 	
 	
 	
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
index f6570c6cc6..25348a31f8 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
@@ -12,7 +12,6 @@ import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.entity.passive.EntityMooshroom;
 import net.minecraft.entity.passive.EntitySheep;
 import net.minecraft.entity.passive.IAnimals;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
@@ -53,7 +52,11 @@ public class TileEntityPooCollector extends TileEntityBaseFluidCollector {
 			}
 			else {
 				return false;
+			}			
+			if (!ItemUtils.checkForInvalidItems(aPoop)) {
+				return false;
 			}
+			
 			//Add poop to world
 			//Logger.INFO("Adding animal waste for "+aPooMaker.getCommandSenderName());
 			
@@ -123,17 +126,17 @@ public class TileEntityPooCollector extends TileEntityBaseFluidCollector {
 	}
 
 	@Override
-	public Item itemToSpawnInWorldIfTankIsFull() {
+	public ItemStack itemToSpawnInWorldIfTankIsFull() {
 		int a = MathUtils.randInt(0, 100);
-		Item aItem = null;		
+		ItemStack aItem = null;		
 		if (a <= 30) {
-			aItem = AgriculturalChem.dustDirt;
+			aItem = ItemUtils.getSimpleStack(AgriculturalChem.dustDirt);
 		}
 		else if (a <= 40) {
-			aItem = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallManureByproducts", 1).getItem();
+			aItem = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallManureByproducts", 1);
 		}
 		else if (a <= 55) {
-			aItem = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyManureByproducts", 1).getItem();
+			aItem = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyManureByproducts", 1);
 		}		
 		return aItem;
 	}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java
index 839cb164cb..8c5a9f6581 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java
@@ -1,24 +1,30 @@
 package gtPlusPlus.core.util.minecraft;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
 
 import cpw.mods.fml.common.registry.EntityRegistry;
-
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.AABB;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import ic2.core.IC2Potion;
+import ic2.core.item.armor.ItemArmorHazmat;
 import net.minecraft.block.Block;
-import net.minecraft.entity.*;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 
-import gregtech.api.util.GT_Utility;
-
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import ic2.core.IC2Potion;
-import ic2.core.item.armor.ItemArmorHazmat;
-
 public class EntityUtils {
 
 	public static void setEntityOnFire(final Entity entity, final int length){
@@ -125,5 +131,60 @@ public class EntityUtils {
 	public static void doDamage(Entity entity, DamageSource dmg, int i) {		
 		entity.attackEntityFrom(dmg, i);		
 	}
+	
+	public static boolean isTileEntityRegistered(Class aTileClass, String aTileName) {
+		Field aRegistry = ReflectionUtils.getField(ReflectionUtils.getClass("net.minecraft.tileentity.TileEntity"), "nameToClassMap");	
+		Field aRegistry2 = ReflectionUtils.getField(ReflectionUtils.getClass("net.minecraft.tileentity.TileEntity"), "classToNameMap");
+		try {
+			Object o = aRegistry.get(null);
+			if (o != null) {
+			    Map nameToClassMap = (Map) o;			    
+			    if (!nameToClassMap.containsKey(aTileName)) {			    	
+			    	 o = aRegistry2.get(null);
+						if (o != null) {
+						    Map classToNameMap = (Map) o;			    
+						    if (!classToNameMap.containsKey(aTileClass)) {
+								return false;		    	
+						    }	
+						    else {
+						    	return true;
+						    } 
+						}			    		    	
+			    }	
+			    else {
+			    	return true;
+			    }
+			}
+		} catch (IllegalArgumentException | IllegalAccessException e) {			
+			e.printStackTrace();
+		}
+		return false;
+	}
+	
+	public static double getDistance(Entity p1, Entity p2) {
+	    return Math.sqrt( Math.pow(p1.posX - p2.posX, 2) + Math.pow(p1.posY - p2.posY, 2) + Math.pow(p1.posZ - p2.posZ, 2));
+	}
+	
+	public static AutoMap<Entity> getEntitiesWithinBoundingBoxExcluding(Entity aExclusion, AABB aBoundingBox){
+		
+		if (aExclusion == null) {
+			return new AutoMap<Entity>();
+		}
+		else {
+			List<Entity> aEntities = aBoundingBox.world().getEntitiesWithinAABBExcludingEntity(aExclusion, aBoundingBox.get());			
+			return new AutoMap<Entity>(aEntities);			
+		}
+	}
+	
+	public static AutoMap<Entity> getEntitiesWithinBoundingBox(Class aEntityType, AABB aBoundingBox){
+		
+		if (aEntityType == null) {
+			return new AutoMap<Entity>();
+		}
+		else {
+			List<Entity> aEntities = aBoundingBox.world().getEntitiesWithinAABB(aEntityType, aBoundingBox.get());			
+			return new AutoMap<Entity>(aEntities);			
+		}
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
new file mode 100644
index 0000000000..c529f60ba1
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
@@ -0,0 +1,349 @@
+package gtPlusPlus.core.util.minecraft;
+
+import static gregtech.api.GregTech_API.sBioHazmatList;
+import static gregtech.api.GregTech_API.sElectroHazmatList;
+import static gregtech.api.GregTech_API.sFrostHazmatList;
+import static gregtech.api.GregTech_API.sGasHazmatList;
+import static gregtech.api.GregTech_API.sHeatHazmatList;
+import static gregtech.api.GregTech_API.sRadioHazmatList;
+
+import java.util.Collections;
+import java.util.HashMap;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gregtech.api.objects.GT_HashSet;
+import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.util.GT_ModHandler;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.GTplusplus.INIT_PHASE;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.util.Utils;
+import ic2.core.item.armor.ItemArmorHazmat;
+import ic2.core.item.armor.ItemArmorNanoSuit;
+import ic2.core.item.armor.ItemArmorQuantumSuit;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
+
+public class HazmatUtils {
+
+	public static final GT_HashSet<GT_ItemStack> sHazmatList = new GT_HashSet<GT_ItemStack>();
+
+	private static final HashMap<String, AutoMap<String>> mToolTips = new HashMap<String, AutoMap<String>>();
+
+	private static boolean mInit = false;
+	private static HazmatUtils mInstance;
+
+	public static void init() {
+		if (mInit) {
+			return;
+		}
+
+		mInstance = new HazmatUtils();
+
+		sHazmatList.add(GT_ModHandler.getIC2Item("hazmatHelmet", 1L, 32767));
+		sHazmatList.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767));
+		sHazmatList.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767));
+		sHazmatList.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767));
+
+		// Make Nano a hazmat suit
+		addProtection(ItemUtils.getItemStackFromFQRN("IC2:itemArmorNanoHelmet:27", 1));
+		addProtection(ItemUtils.getItemStackFromFQRN("IC2:itemArmorNanoChestplate:27", 1));
+		addProtection(ItemUtils.getItemStackFromFQRN("IC2:itemArmorNanoLegs:27", 1));
+		addProtection(ItemUtils.getItemStackFromFQRN("IC2:itemArmorNanoBoots:27", 1));
+
+		Logger.INFO("[Hazmat] Registered Nano as hazmat gear.");
+
+		// Make Quantum a hazmat suit
+		addProtection(ItemUtils.getItemStackFromFQRN("IC2:itemArmorQuantumHelmet:27", 1));
+		addProtection(ItemUtils.getItemStackFromFQRN("IC2:itemArmorQuantumChestplate:27", 1));
+		addProtection(ItemUtils.getItemStackFromFQRN("IC2:itemArmorQuantumLegs:27", 1));
+		addProtection(ItemUtils.getItemStackFromFQRN("IC2:itemArmorQuantumBoots:27", 1));
+		Logger.INFO("[Hazmat] Registered Quantum as hazmat gear.");
+
+		Utils.registerEvent(mInstance);
+		Logger.INFO("[Hazmat] Registered Tooltip handler for hazmat gear.");
+		mInit = true;
+
+	}
+
+	private final static String mToolTipText = "Provides protection from:";
+
+	@SubscribeEvent
+	public void onItemTooltip(ItemTooltipEvent event) {
+		//Logger.INFO("Ticking Hazmat handler");
+		if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED
+				&& GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.SERVER_START) {
+			//Logger.INFO("[Hazmat] Bad Phase : " + GTplusplus.CURRENT_LOAD_PHASE);
+			return;
+		}
+		if (event.itemStack == null || isVanillaHazmatPiece(event.itemStack)) {
+			//Logger.INFO("[Hazmat] Invalid Itemstack or vanilla hazmat");
+			return;
+		} else {
+			ItemStack aStackTemp = event.itemStack;
+			GT_ItemStack aStack = new GT_ItemStack(aStackTemp);
+			if (isNanoArmourPiece(aStackTemp) || isQuantumArmourPiece(aStackTemp)) {
+				event.toolTip.add(EnumChatFormatting.DARK_PURPLE+"Provides full hazmat protection.");				
+			}
+			else {
+				//Logger.INFO("[Hazmat] Finding Tooltip Data");
+				String[] aTooltips = getTooltips(aStack);
+				if (aTooltips == null || aTooltips.length == 0) {
+					//Logger.INFO("[Hazmat] No Info!");
+					return;
+				} else {
+					//Logger.INFO("[Hazmat] Found Tooltips!");
+					if (providesProtection(aStackTemp)) {
+						event.toolTip.add(EnumChatFormatting.LIGHT_PURPLE+"Provides full hazmat protection.");
+					} else {
+						event.toolTip.add(mToolTipText);
+						for (String r : aTooltips) {
+							event.toolTip.add(" - " + r);
+						}
+					}
+				}
+			}		
+		}
+	}
+
+	/**
+	 * Static function to replace
+	 * {@link #ic2.core.item.armor.ItemArmorHazmat.hasCompleteHazmat(EntityLivingBase)}.
+	 * Because IC2 doesn't let us register things ourself, anything registered via
+	 * GT/GT++ will return true.
+	 * 
+	 * @param living - Entity Wearing Armour
+	 * @return - Does {@link EntityLivingBase} have a full hazmat suit on?
+	 */
+	public static boolean hasCompleteHazmat(EntityLivingBase living) {
+		// Entity is Null, cannot have Hazmat.
+		if (living == null || living.isDead) {
+			return false;
+		} else {
+
+			// Map All Player Armour slots
+			AutoMap<ItemStack> aEquipment = new AutoMap<ItemStack>();
+			for (int i = 1; i < 5; ++i) {
+				ItemStack stack = living.getEquipmentInSlot(i);
+
+				// Item is Null, cannot have full suit
+				if (stack == null) {
+					return false;
+				} else {
+					aEquipment.put(stack);
+				}
+			}
+
+			// Compare Equipment to all items mapped for full hazmat.
+			for (ItemStack aSlotStack : aEquipment) {
+				if (!isHazmatPiece(aSlotStack)) {
+					return false;
+				}
+			}
+
+			// We are in some kind of full hazmat, huzzah!
+			return true;
+		}
+	}
+
+	/**
+	 * Is this item vanilla IC2 hazmat?
+	 * 
+	 * @param aArmour - The Armour to provide protection.
+	 * @return
+	 */
+	public static boolean isVanillaHazmatPiece(ItemStack aArmour) {
+		return aArmour != null ? aArmour.getItem() instanceof ItemArmorHazmat : false;
+	}
+	
+	/**
+	 * Is this item vanilla IC2 Nanosuit?
+	 * 
+	 * @param aArmour - The Armour to provide protection.
+	 * @return
+	 */
+	public static boolean isNanoArmourPiece(ItemStack aArmour) {
+		return aArmour != null ? aArmour.getItem() instanceof ItemArmorNanoSuit : false;
+	}
+	
+	/**
+	 * Is this item vanilla IC2 Quantum?
+	 * 
+	 * @param aArmour - The Armour to provide protection.
+	 * @return
+	 */
+	public static boolean isQuantumArmourPiece(ItemStack aArmour) {
+		return aArmour != null ? aArmour.getItem() instanceof ItemArmorQuantumSuit : false;
+	}
+
+	/**
+	 * Is this item a registered piece of full hazmat? (Provides all 6 protections)
+	 * 
+	 * @param aStack - The Armour to provide protection.
+	 * @return
+	 */
+	public static boolean isHazmatPiece(ItemStack aStack) {
+		return isVanillaHazmatPiece(aStack) || providesProtection(aStack);
+	}
+
+	/**
+	 * Registers the {@link ItemStack} to all types of protection. Provides full
+	 * hazmat protection. Frost, Fire, Bio, Gas, Radioaton & Electricity.
+	 * 
+	 * @param aStack - The Armour to provide protection.
+	 * @return - Did we register this ItemStack properly?
+	 */
+	public static boolean addProtection(ItemStack aVanStack) {
+		Logger.INFO("[Hazmat] Registering " + aVanStack.getDisplayName() + " for full Hazmat protection.");
+		GT_ItemStack aStack = getGtStackFromVanilla(aVanStack);
+		AutoMap<Boolean> aAdded = new AutoMap<Boolean>();
+		aAdded.put(addProtection_Frost(aStack));
+		aAdded.put(addProtection_Fire(aStack));
+		aAdded.put(addProtection_Biohazard(aStack));
+		aAdded.put(addProtection_Gas(aStack));
+		aAdded.put(addProtection_Radiation(aStack));
+		aAdded.put(addProtection_Electricty(aStack));
+		for (boolean b : aAdded) {
+			if (!b) {
+				return false;
+			}
+		}
+		Logger.INFO("[Hazmat] Protection added for all 6 damage types, registering to master Hazmat list.");
+		sHazmatList.add(aStack);
+		return true;
+	}
+
+	public static boolean addProtection_Frost(GT_ItemStack aStack) {
+		registerTooltip(aStack, EnumChatFormatting.AQUA + "Frost");
+		return addProtection_Generic(sFrostHazmatList, aStack);
+	}
+
+	public static boolean addProtection_Fire(GT_ItemStack aStack) {
+		registerTooltip(aStack, EnumChatFormatting.DARK_RED + "Heat");
+		return addProtection_Generic(sHeatHazmatList, aStack);
+	}
+
+	public static boolean addProtection_Biohazard(GT_ItemStack aStack) {
+		registerTooltip(aStack, EnumChatFormatting.GREEN + "Biohazards");
+		return addProtection_Generic(sBioHazmatList, aStack);
+	}
+
+	public static boolean addProtection_Gas(GT_ItemStack aStack) {
+		registerTooltip(aStack, EnumChatFormatting.WHITE + "Gas");
+		return addProtection_Generic(sGasHazmatList, aStack);
+	}
+
+	public static boolean addProtection_Radiation(GT_ItemStack aStack) {
+		registerTooltip(aStack, EnumChatFormatting.DARK_GREEN + "Radiation");
+		return addProtection_Generic(sRadioHazmatList, aStack);
+	}
+
+	public static boolean addProtection_Electricty(GT_ItemStack aStack) {
+		registerTooltip(aStack, EnumChatFormatting.YELLOW + "Electricity");
+		return addProtection_Generic(sElectroHazmatList, aStack);
+	}
+
+	private static boolean addProtection_Generic(GT_HashSet<GT_ItemStack> aSet, GT_ItemStack aStack) {
+		int aMapSize = aSet.size();
+		aSet.add(aStack);
+		return aMapSize < aSet.size();
+	}
+
+	/**
+	 * Does this item provide hazmat protection? (Protection against Frost, Heat,
+	 * Bio, Gas, Rads, Elec) An item may return false even if it protects against
+	 * all six damage types. This is because it's not actually registered as hazmat
+	 * correct.
+	 * 
+	 * @param aStack - The item to check for protection
+	 * @return
+	 */
+	public static boolean providesProtection(ItemStack aStack) {
+		return providesProtetion_Generic(sHazmatList, aStack);
+	}
+
+	public static boolean providesProtetion_Frost(ItemStack aStack) {
+		return providesProtetion_Generic(sFrostHazmatList, aStack);
+	}
+
+	public static boolean providesProtetion_Fire(ItemStack aStack) {
+		return providesProtetion_Generic(sHeatHazmatList, aStack);
+	}
+
+	public static boolean providesProtetion_Biohazard(ItemStack aStack) {
+		return providesProtetion_Generic(sBioHazmatList, aStack);
+	}
+
+	public static boolean providesProtetion_Gas(ItemStack aStack) {
+		return providesProtetion_Generic(sGasHazmatList, aStack);
+	}
+
+	public static boolean providesProtetion_Radiation(ItemStack aStack) {
+		return providesProtetion_Generic(sRadioHazmatList, aStack);
+	}
+
+	public static boolean providesProtetion_Electricity(ItemStack aStack) {
+		return providesProtetion_Generic(sElectroHazmatList, aStack);
+	}
+
+	private static boolean providesProtetion_Generic(GT_HashSet aSet, ItemStack aStack) {
+		if (isVanillaHazmatPiece(aStack)) {
+			return true;
+		}
+		return aSet.getMap().containsKey(aStack);
+	}
+
+	private static String[] getTooltips(GT_ItemStack aStack) {
+		String aKey = convertGtItemstackToStringData(aStack);
+		AutoMap<String> aTempTooltipData = mToolTips.get(aKey);
+		if (aTempTooltipData == null) {
+			//Logger.INFO("[Hazmat] Item was not mapped for TTs - "+aKey);
+			return new String[] {};
+		} else {
+			//Logger.INFO("[Hazmat] Item was mapped for TTs");
+			Collections.sort(aTempTooltipData);
+			//Logger.INFO("[Hazmat] Sorted TTs");
+			return aTempTooltipData.toArray();
+		}
+	}
+
+	private static void registerTooltip(GT_ItemStack aStack, String aTooltip) {
+		String aKey = convertGtItemstackToStringData(aStack);
+		Logger.INFO("[Hazmat] Mapping " + aTooltip + " for " + aKey);
+		AutoMap<String> aTempTooltipData = mToolTips.get(aKey);
+		if (aTempTooltipData == null) {
+			Logger.INFO("No data mapped yet, creating.");
+			aTempTooltipData = new AutoMap<String>();
+		}
+		aTempTooltipData.add(aTooltip);
+		mToolTips.put(convertGtItemstackToStringData(aStack), aTempTooltipData);
+	}
+
+	public static ItemStack getStackFromGtStack(GT_ItemStack aGtStack) {
+		return ItemUtils.simpleMetaStack(aGtStack.mItem, aGtStack.mMetaData, aGtStack.mStackSize);
+	}
+
+	public static GT_ItemStack getGtStackFromVanilla(ItemStack aStack) {
+		return new GT_ItemStack(aStack);
+	}
+
+	private static String convertGtItemstackToStringData(GT_ItemStack aStack) {
+		if (aStack == null) {
+			return "NULL";
+		} else {
+			return aStack.mItem.getUnlocalizedName() + "." + aStack.mMetaData + "." + aStack.mStackSize;
+		}
+	}
+	
+	private static String convertGtItemstackToStringDataIgnoreDamage(GT_ItemStack aStack) {
+		if (aStack == null) {
+			return "NULL";
+		} else {
+			return aStack.mItem.getUnlocalizedName() + "." + aStack.mStackSize;
+		}
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/InventoryUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/InventoryUtils.java
index 0d4394d773..8f12d20494 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/InventoryUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/InventoryUtils.java
@@ -7,54 +7,52 @@ import net.minecraft.entity.item.EntityItem;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 public class InventoryUtils {
 	
 	private final static Random mRandom = new Random();
 	
-	public static void dropInventoryItems(World world, int x, int y, int z, Block block){
-		 Object tileentity = world.getTileEntity(x, y, z);
-
-	        if (tileentity != null)
-	        {
-	            for (int i1 = 0; i1 < ((IInventory) tileentity).getSizeInventory(); ++i1)
-	            {
-	                ItemStack itemstack = ((IInventory) tileentity).getStackInSlot(i1);
-
-	                if (itemstack != null)
-	                {
-	                    float f = mRandom.nextFloat() * 0.8F + 0.1F;
-	                    float f1 = mRandom.nextFloat() * 0.8F + 0.1F;
-	                    EntityItem entityitem;
-
-	                    for (float f2 = mRandom.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem))
-	                    {
-	                        int j1 = mRandom.nextInt(21) + 10;
-
-	                        if (j1 > itemstack.stackSize)
-	                        {
-	                            j1 = itemstack.stackSize;
-	                        }
-
-	                        itemstack.stackSize -= j1;
-	                        entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
-	                        float f3 = 0.05F;
-	                        entityitem.motionX = (float)mRandom.nextGaussian() * f3;
-	                        entityitem.motionY = (float)mRandom.nextGaussian() * f3 + 0.2F;
-	                        entityitem.motionZ = (float)mRandom.nextGaussian() * f3;
-
-	                        if (itemstack.hasTagCompound())
-	                        {
-	                            entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy());
-	                        }
-	                    }
-	                }
-	            }
-
-	            world.func_147453_f(x, y, z, block);
-	        }
-	    
+	public static void dropInventoryItems(World world, int x, int y, int z, Block block) {
+		TileEntity tileentity = world.getTileEntity(x, y, z);
+
+		if (tileentity != null && tileentity instanceof IInventory
+				&& ((IInventory) tileentity).getSizeInventory() > 0) {
+			for (int i1 = 0; i1 < ((IInventory) tileentity).getSizeInventory(); ++i1) {
+				ItemStack itemstack = ((IInventory) tileentity).getStackInSlot(i1);
+
+				if (itemstack != null) {
+					float f = mRandom.nextFloat() * 0.8F + 0.1F;
+					float f1 = mRandom.nextFloat() * 0.8F + 0.1F;
+					EntityItem entityitem;
+
+					for (float f2 = mRandom.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) {
+						int j1 = mRandom.nextInt(21) + 10;
+
+						if (j1 > itemstack.stackSize) {
+							j1 = itemstack.stackSize;
+						}
+
+						itemstack.stackSize -= j1;
+						entityitem = new EntityItem(world, x + f, y + f1, z + f2,
+								new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
+						float f3 = 0.05F;
+						entityitem.motionX = (float) mRandom.nextGaussian() * f3;
+						entityitem.motionY = (float) mRandom.nextGaussian() * f3 + 0.2F;
+						entityitem.motionZ = (float) mRandom.nextGaussian() * f3;
+
+						if (itemstack.hasTagCompound()) {
+							entityitem.getEntityItem()
+									.setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy());
+						}
+					}
+				}
+			}
+
+			world.func_147453_f(x, y, z, block);
+		}
+
 	}
 	
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index d32ff4e160..ae799baa2b 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -13,6 +13,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
@@ -29,6 +30,8 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
+import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration;
 import net.minecraft.block.Block;
 import net.minecraft.init.Items;
@@ -1113,5 +1116,67 @@ public class ItemUtils {
 		}
 		return aDisplay;
 	}
+	
+	public static boolean isItemGregtechTool(ItemStack aStack) {
+		if (aStack == null) {
+			return false;
+		}
+		final Item mItem = aStack.getItem();
+		final Item aSkookum = ItemUtils.getItemFromFQRN("miscutils:gt.plusplus.metatool.01");
+		final Class aSkookClass = aSkookum.getClass();
+		if (aSkookClass.isInstance(mItem) || mItem instanceof GT_MetaGenerated_Tool_01 || mItem instanceof MetaGeneratedGregtechTools || mItem instanceof Gregtech_MetaTool || mItem == aSkookum) {
+			return true;
+		}
+		return false;
+	}
+	
+	public static boolean isToolWrench(ItemStack aWrench) {
+		if (isItemGregtechTool(aWrench) && (aWrench.getItemDamage() == 16 || aWrench.getItemDamage() == 120 || aWrench.getItemDamage() == 122 || aWrench.getItemDamage() == 124 || aWrench.getItemDamage() == 7734)) {
+			return true;
+		}
+		return false;
+	}
+	
+	public static boolean isToolMallet(ItemStack aMallet) {
+		if (isItemGregtechTool(aMallet) && (aMallet.getItemDamage() == 14)) {
+			return true;
+		}
+		return false;
+	}
+	
+	public static boolean isToolScrewdriver(ItemStack aScrewdriver) {
+		if (isItemGregtechTool(aScrewdriver) && (aScrewdriver.getItemDamage() == 22 || aScrewdriver.getItemDamage() == 150)) {
+			return true;
+		}
+		return false;
+	}
+	
+	public static boolean isToolCrowbar(ItemStack aCrowbar) {
+		if (isItemGregtechTool(aCrowbar) && (aCrowbar.getItemDamage() == 20)) {
+			return true;
+		}
+		return false;
+	}
+	
+	public static boolean isToolWirecutters(ItemStack aWirecutters) {
+		if (isItemGregtechTool(aWirecutters) && (aWirecutters.getItemDamage() == 26)) {
+			return true;
+		}
+		return false;
+	}
+	
+	public static boolean isToolHammer(ItemStack aHammer) {
+		if (isItemGregtechTool(aHammer) && (aHammer.getItemDamage() == 12 || aHammer.getItemDamage() == 7734)) {
+			return true;
+		}
+		return false;
+	}
+	
+	public static boolean isToolSolderingIron(ItemStack aSoldering) {
+		if (isItemGregtechTool(aSoldering) && (aSoldering.getItemDamage() == 160)) {
+			return true;
+		}
+		return false;
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ProxyFinder.java b/src/Java/gtPlusPlus/core/util/reflect/ProxyFinder.java
index d22fafb37b..aaa9b2fae7 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ProxyFinder.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ProxyFinder.java
@@ -20,7 +20,7 @@ public class ProxyFinder {
 					}
 
 				} catch (final NoClassDefFoundError err) {
-					//its server side
+					//its client side
 					return null;
 				}
 				break;