Merge pull request #1 from alkcorp/DevTop

Dev top

22 files changed, 912 insertions, 498 deletions

diff --git a/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
new file mode 100644
index 0000000000..098b670509
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
@@ -0,0 +1,309 @@
+package gtPlusPlus.core.block.base;
+
+import java.util.List;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.CubicObject;
+import gtPlusPlus.api.objects.minecraft.SafeTexture;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.InventoryUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+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.EnumCreatureType;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public abstract class BasicTileBlockWithTooltip extends BlockContainer implements ITileTooltip {
+
+	/**
+	 * Each mapped object holds the data for the six sides.
+	 */
+	@SideOnly(Side.CLIENT)
+	private AutoMap<CubicObject<SafeTexture>> mSidedTextureArray = new AutoMap<CubicObject<SafeTexture>>();
+
+	/**
+	 * Holds the data for the six sides, each side holds an array of data for each respective meta.
+	 */
+	@SideOnly(Side.CLIENT)
+	private AutoMap<CubicObject<String>> mSidedTexturePathArray = new AutoMap<CubicObject<String>>();
+
+	/**
+	 * Does this block have any meta at all?
+	 * @return
+	 */
+	public final boolean hasMeta() {
+		return getMetaCount() > 0;
+	}
+
+	/**
+	 * The amount of meta this block has.
+	 * @return
+	 */
+	public abstract int getMetaCount();
+
+	/**
+	 * Does this {@link Block} require special {@link ItemBlock} handling?
+	 * @return The {@link Class} that will be used for this {@link Block}.
+	 */
+	public Class<? extends ItemBlock> getItemBlockClass() {
+		return ItemBlock.class;
+	}
+
+	/**
+	 * A lazy way to declare the unlocal name for the block, makes boilerplating easy.
+	 * @return The internal name for this block.
+	 */
+	public abstract String getUnlocalBlockName();
+
+	/**
+	 * Does this Block have {@link ITileTooltip} support?
+	 * @return {@link boolean} that represents if this block supports {@link ITileTooltip} or not.
+	 */
+	public final boolean hasTooltip() {
+		return getTooltipID() >= -1;
+	}
+
+	/**
+	 * Lazy Boilerplating.
+	 * @return Block Hardness.
+	 */
+	protected abstract float initBlockHardness();
+
+	/**
+	 * Lazy Boilerplating.
+	 * @return Block Resistance.
+	 */
+	protected abstract float initBlockResistance();	
+
+	/**
+	 * Lazy Boilerplating.
+	 * @return The {@link CreativeTab} this Block is shown on.
+	 */
+	protected abstract CreativeTabs initCreativeTab();
+
+	/**
+	 * The ID used by the {@link ITileTooltip} handler. Return -1 if you are not providing a custom {@link ItemBlock} in {@link #getItemBlockClass}().
+	 * @return 
+	 */
+	@Override
+	public abstract int getTooltipID();
+
+	public BasicTileBlockWithTooltip(Material aBlockMat){
+		super(aBlockMat);
+		//Use Abstract method values
+		this.setHardness(initBlockHardness());
+		this.setResistance(initBlockResistance());
+		this.setBlockName(getUnlocalBlockName());
+		this.setCreativeTab(initCreativeTab());
+		// Register the block last.
+		GameRegistry.registerBlock(this, getItemBlockClass(), getUnlocalBlockName());		
+		Logger.INFO("Registered "+getTileEntityName()+".");
+		if (Utils.isClient()) {
+			// Handle Textures
+			handleTextures();	
+		}
+	}
+
+	/**
+	 * The name of the Tile Entity.
+	 * @return
+	 */
+	protected abstract String getTileEntityName();
+
+	/**
+	 * The String used for texture pathing.
+	 * @return Sanitized {@link String}, containing no spaces or illegal characters.
+	 */
+	private final String getTileEntityNameForTexturePathing() {
+		return Utils.sanitizeString(getTileEntityName().replace(" ", ""));
+	}
+
+	/**
+	 * An array of CubicObjects, one for each meta, else just a single cell array.
+	 * Expected to be null regularly, as the default texture handling should suffice.
+	 * Handy if re-using textures or using a non-standard structure for them. FULL texture path must be used,
+	 * inclusive of the MODID and a colon.
+	 * @return
+	 */
+	public CubicObject<String>[] getCustomTextureDirectoryObject(){
+		return null;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public final IIcon getIcon(final int aSide, final int aMeta) {
+		return mSidedTextureArray.get(aMeta).get(aSide).getIcon();	
+	}
+
+	@Override
+	public IIcon getIcon(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) {
+		return super.getIcon(aWorld, aX, aY, aZ, aSide);
+	}
+
+	@SideOnly(Side.CLIENT)
+	private final void handleTextures() {
+
+		Logger.INFO("[TeTexture] Building Texture Maps for "+getTileEntityName()+".");
+		//Store them in forge order
+		//DOWN, UP, NORTH, SOUTH, WEST, EAST	
+
+		// Default Path Name, this will make us look inside 'miscutils\textures\blocks'
+		final String aPrefixTexPath = CORE.MODID + ":";
+		// Default Path Name, this will make us look in the sub-directory for this Tile Entity.		
+		final String aTexPathMid =  "TileEntities"+CORE.SEPERATOR+getTileEntityNameForTexturePathing()+CORE.SEPERATOR;
+		// Construct a full path
+		String aTexPathBuilt = aPrefixTexPath + aTexPathMid;
+		// File Name Suffixes, without meta tags
+		String aStringBot;
+		String aStringTop;
+		String aStringBack;
+		String aStringFront;
+		String aStringLeft;
+		String aStringRight;
+		// Do we provide a matrix of custom data to be used for texture processing instead?
+		if (getCustomTextureDirectoryObject() != null) {
+			// Get custom provided texture data.
+			CubicObject<String>[] aDataMap = getCustomTextureDirectoryObject();	
+			Logger.INFO("[TeTexture] Found custom texture data, using this instead. Size: "+aDataMap.length);	
+			// Map each meta string data to the main map.
+			for (int i=0;i<aDataMap.length;i++) {
+				mSidedTexturePathArray.put(aDataMap[i]);
+				Logger.INFO("Mapped value for meta "+i+".");
+			}			
+		}
+		else {	
+			Logger.INFO("[TeTexture] Processing "+(1+getMetaCount())+" sets.");		
+			// Iterate once for each meta
+			for (int i=0;i<(1+getMetaCount());i++) {				
+
+				// File Name Suffixes, without meta tags
+				aStringBot = "Bottom";
+				aStringTop = "Top";
+				aStringBack = "Back";
+				aStringFront = "Front";
+				aStringLeft = "Left";
+				aStringRight = "Right";
+
+				// Add tails if we have meta
+				if (hasMeta()) {
+					aStringBot = aStringBot + "_"+i;
+					aStringTop = aStringTop + "_"+i;
+					aStringBack = aStringBack + "_"+i;
+					aStringFront = aStringFront + "_"+i;
+					aStringLeft = aStringLeft + "_"+i;
+					aStringRight = aStringRight + "_"+i;
+				}
+				// Append the full path
+				aStringBot = aTexPathBuilt + aStringBot;
+				aStringTop = aTexPathBuilt + aStringTop;
+				aStringBack = aTexPathBuilt + aStringBack;
+				aStringFront = aTexPathBuilt + aStringFront;
+				aStringLeft = aTexPathBuilt + aStringLeft;
+				aStringRight = aTexPathBuilt + aStringRight;
+				// Convenience Blob
+				CubicObject<String> aMetaBlob = new CubicObject<String>(aStringBot, aStringTop, aStringBack, aStringFront, aStringLeft, aStringRight);
+				mSidedTexturePathArray.put(aMetaBlob);
+				Logger.INFO("[TeTexture] Added Texture Path data to map for meta "+i);	
+			}
+		}
+		Logger.INFO("[TeTexture] Map size for pathing: "+mSidedTexturePathArray.size());
+
+		// Iteration Index
+		int aIndex = 0;
+
+		// Iterate each CubicObject, holding the six texture paths for each meta.
+		for (CubicObject<String> aMetaBlob : mSidedTexturePathArray) {			
+			// Make a Safe Texture for each side
+			SafeTexture aBottom = SafeTexture.register(aMetaBlob.DOWN);
+			SafeTexture aTop = SafeTexture.register(aMetaBlob.UP);						
+			SafeTexture aBack = SafeTexture.register(aMetaBlob.NORTH);
+			SafeTexture aFont = SafeTexture.register(aMetaBlob.SOUTH);						
+			SafeTexture aWest = SafeTexture.register(aMetaBlob.WEST);
+			SafeTexture aEast = SafeTexture.register(aMetaBlob.EAST);
+			// Store them in an Array
+			SafeTexture[] aInjectBlob = new SafeTexture[] {
+					aBottom,
+					aTop,
+					aBack,
+					aFont,
+					aWest,
+					aEast
+			};
+			// Convenience Blob
+			CubicObject<SafeTexture> aMetaBlob2 = new CubicObject<SafeTexture>(aInjectBlob);
+			// Store this Blob into
+			mSidedTextureArray.put(aMetaBlob2);
+			Logger.INFO("[TeTexture] Added SafeTexture data to map for meta "+(aIndex++));				
+		}
+		Logger.INFO("[TeTexture] Map size for registration: "+mSidedTextureArray.size());
+
+
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public final void registerBlockIcons(final IIconRegister aRegisterer){
+		this.blockIcon = aRegisterer.registerIcon(CORE.MODID + ":" + "net");
+	}
+
+	@Override
+	public abstract TileEntity createNewTileEntity(final World world, final int p_149915_2_);
+
+	/**
+	 * Called when {@link #breakBlock}() is called, but before {@link InventoryUtils#dropInventoryItems} and the super call.
+	 */
+	public void onBlockBreak() {
+
+	}
+
+	@Override
+	public final void breakBlock(final World world, final int x, final int y, final int z, final Block block, final int number) {
+		onBlockBreak();
+		InventoryUtils.dropInventoryItems(world, x, y, z, block);
+		super.breakBlock(world, x, y, z, block, number);
+	}
+
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	@Override
+	public final void getSubBlocks(Item aItem, CreativeTabs p_149666_2_, List aList) {	
+		if (hasMeta()) {
+			for (int i=0;i<getMetaCount();i++) {
+				aList.add(ItemUtils.simpleMetaStack(aItem, i, 1));
+			}
+		}
+		else {
+			aList.add(ItemUtils.getSimpleStack(aItem));			
+		}				
+	}
+
+	@Override
+	public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+		return false;
+	}
+
+
+
+	/**
+	 * Get the block's damage value (for use with pick block).
+	 */
+	@Override
+	public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
+		int l = aWorld.getBlockMetadata(aX, aY, aZ);
+		return l;
+	}
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
index 6ae1a52aba..7d8b3eb708 100644
--- a/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
+++ b/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
@@ -1,42 +1,27 @@
 package gtPlusPlus.core.block.machine;
 
-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 net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.objects.minecraft.CubicObject;
+import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
 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.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 gtPlusPlus.GTplusplus;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
-import gtPlusPlus.core.util.minecraft.InventoryUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-
-public class CircuitProgrammer extends BlockContainer implements ITileTooltip
-{
-	@SideOnly(Side.CLIENT)
-	private IIcon textureTop;
-	@SideOnly(Side.CLIENT)
-	private IIcon textureBottom;
-	@SideOnly(Side.CLIENT)
-	private IIcon textureFront;
+public class CircuitProgrammer extends BasicTileBlockWithTooltip {
 
 	/**
 	 * Determines which tooltip is displayed within the itemblock.
@@ -51,33 +36,7 @@ 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");
 		LanguageRegistry.addName(this, "Circuit Programmer");
-
-	}
-
-	/**
-	 * Gets the block's texture. Args: side, meta
-	 */
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(final int p_149691_1_, final int p_149691_2_)
-	{
-		return p_149691_1_ == 1 ? this.textureTop : (p_149691_1_ == 0 ? this.textureBottom : (this.textureFront));
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(final IIconRegister p_149651_1_)
-	{
-		this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B");
-		this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B");
-		this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G");
-		this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I");
 	}
 
 	/**
@@ -142,12 +101,6 @@ public class CircuitProgrammer extends BlockContainer implements ITileTooltip
 	}
 
 	@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()) {
 			((TileEntityCircuitProgrammer) world.getTileEntity(x,y,z)).setCustomName(stack.getDisplayName());
@@ -159,4 +112,48 @@ public class CircuitProgrammer extends BlockContainer implements ITileTooltip
 		return false;
 	}
 
+	@Override
+	public int getMetaCount() {
+		return 0;
+	}
+
+	@Override
+	public String getUnlocalBlockName() {
+		return "blockCircuitProgrammer";
+	}
+
+	@Override
+	protected float initBlockHardness() {
+		return 5f;
+	}
+
+	@Override
+	protected float initBlockResistance() {
+		return 1f;
+	}
+
+	@Override
+	protected CreativeTabs initCreativeTab() {
+		return AddToCreativeTab.tabMachines;
+	}
+
+	@Override
+	protected String getTileEntityName() {
+		return "Circuit Programmer";
+	}
+
+	@Override
+	public CubicObject<String>[] getCustomTextureDirectoryObject() {
+		String[] aTexData = new String[] {
+				CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G",
+				CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B",
+				CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
+				CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
+				CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
+				CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I"
+		};
+		CubicObject<String>[] aTextureData = new CubicObject[] {new CubicObject<String>(aTexData)};		
+		return aTextureData;
+	}
+
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java b/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
index cd480dcffe..dc87b885b9 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
@@ -1,85 +1,27 @@
 package gtPlusPlus.core.block.machine;
 
-import java.util.List;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.CubicObject;
+import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockRoundRobinator;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
-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.item.Item;
+import net.minecraft.item.ItemBlock;
 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;
 
-public class Machine_RoundRobinator extends BlockContainer implements ITileTooltip
-{
-	@SideOnly(Side.CLIENT)
-	private IIcon[] textureTop = new IIcon[5];
-	@SideOnly(Side.CLIENT)
-	private IIcon[] textureFront = new IIcon[5];
+public class Machine_RoundRobinator extends BasicTileBlockWithTooltip {
+	
 
-	/**
-	 * Determines which tooltip is displayed within the itemblock.
-	 */
-	private final int mTooltipID = 7;
-
-	@Override
-	public int getTooltipID() {
-		return this.mTooltipID;
-	}
-
-	@SuppressWarnings("deprecation")
 	public Machine_RoundRobinator(){
 		super(Material.iron);
-		this.setHardness(1f);
-		this.setResistance(1f);
-		this.setBlockName("blockRoundRobinator");
-		this.setCreativeTab(AddToCreativeTab.tabMachines);
-		GameRegistry.registerBlock(this, ItemBlockRoundRobinator.class, "blockRoundRobinator");
-		//LanguageRegistry.addName(this, "Round-Robinator");
-
-	}
-
-	/**
-	 * Gets the block's texture. Args: side, meta
-	 */
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(final int aSide, final int aMeta) {
-		if (aSide < 2) {
-			return this.textureTop[aMeta];
-		}
-		else {
-			return this.textureFront[aMeta];
-		}
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(final IIconRegister p_149651_1_){
-		this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "RoundRobinator_Side");
-		for (int i=0;i<5;i++) {
-			this.textureTop[i] = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/RoundRobinator/" + "RoundRobinator_Top_"+i);
-			this.textureFront[i] = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/RoundRobinator/" + "RoundRobinator_Side_"+i);			
-		}		
 	}
 
 	/**
@@ -97,13 +39,11 @@ public class Machine_RoundRobinator extends BlockContainer implements ITileToolt
 			// Check For Screwdriver
 			try {
 				final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName());
-				final Item mHandItem = mHandStack.getItem();
-				if (((mHandItem instanceof GT_MetaGenerated_Tool_01)
-						&& ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) {
+				if (ItemUtils.isToolScrewdriver(mHandStack)) {
 					final TileEntityRoundRobinator tile = (TileEntityRoundRobinator) world.getTileEntity(x, y, z);
 					if (tile != null) {
 						mDidScrewDriver = tile.onScrewdriverRightClick((byte) side, player, x, y, z);
-					}
+					}									
 				}
 			}
 			catch (final Throwable t) {}
@@ -122,52 +62,70 @@ public class Machine_RoundRobinator extends BlockContainer implements ITileToolt
 	}
 
 	@Override
-	public int getRenderBlockPass() {
-		return 0;
+	public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
+		return new TileEntityRoundRobinator();
 	}
 
 	@Override
-	public boolean isOpaqueCube() {
-		return false;
+	public int getMetaCount() {
+		return 5;
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
-		return new TileEntityRoundRobinator();
+	public String getUnlocalBlockName() {
+		return "blockRoundRobinator";
 	}
 
 	@Override
-	public void onBlockAdded(final World world, final int x, final int y, final int z) {
-		super.onBlockAdded(world, x, y, z);
+	protected float initBlockHardness() {
+		return 1;
 	}
 
 	@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);
+	protected float initBlockResistance() {
+		return 1;
 	}
 
 	@Override
-	public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity, final ItemStack stack) {
-		super.onBlockPlacedBy(world, x, y, z, entity, stack);
+	protected CreativeTabs initCreativeTab() {
+		return AddToCreativeTab.tabMachines;
 	}
 
 	@Override
-	public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
-		return false;
+	public int getTooltipID() {
+		return -1;
 	}
 
 	@Override
-	public void getSubBlocks(Item aItem, CreativeTabs p_149666_2_, List aList) {		
-		//super.getSubBlocks(aItem, p_149666_2_, aList);
-		for (int i=0;i<5;i++) {
-			aList.add(ItemUtils.simpleMetaStack(aItem, i, 1));
-		}		
+	protected String getTileEntityName() {
+		return "Round Robinator";
+	}
+
+	@Override
+	public Class<? extends ItemBlock> getItemBlockClass() {
+		return ItemBlockRoundRobinator.class;
 	}
 
 	@Override
-	public IIcon getIcon(IBlockAccess aBlockAccess, int x, int y, int z, int aSide) {		
-		return super.getIcon(aBlockAccess, x, y, z, aSide);
+	public CubicObject<String>[] getCustomTextureDirectoryObject() {
+		AutoMap<String[]> aTemp = new AutoMap<String[]>();
+		for (int i=0;i<5;i++) {
+			String[] aTexData = new String[] {
+					CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_"+i,
+					CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_"+i,
+					CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_"+i,
+					CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_"+i,
+					CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_"+i,
+					CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_"+i,
+			};
+			aTemp.put(aTexData);			
+		}
+		AutoMap<CubicObject<String>> aTemp2 = new AutoMap<CubicObject<String>>();
+		for (String[] y : aTemp) {
+			aTemp2.put(new CubicObject<String>(y));			
+		}
+		CubicObject<String>[] aTextureData = new CubicObject[] {aTemp2.get(0), aTemp2.get(1), aTemp2.get(2), aTemp2.get(3), aTemp2.get(4)};		
+		return aTextureData;
 	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/common/BasePlayer.java b/src/Java/gtPlusPlus/core/common/BasePlayer.java
index d60925102a..4686f34207 100644
--- a/src/Java/gtPlusPlus/core/common/BasePlayer.java
+++ b/src/Java/gtPlusPlus/core/common/BasePlayer.java
@@ -1,19 +1,14 @@
 package gtPlusPlus.core.common;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.PositionedSoundRecord;
-import net.minecraft.client.entity.EntityClientPlayerMP;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.settings.GameSettings;
-import net.minecraft.network.play.client.C0BPacketEntityAction;
-import net.minecraft.potion.Potion;
-import net.minecraft.util.MovementInputFromOptions;
-import net.minecraft.util.ResourceLocation;
-
 import api.player.client.ClientPlayerAPI;
 import api.player.client.ClientPlayerBase;
 import gtPlusPlus.core.handler.events.CustomMovementHandler;
 import gtPlusPlus.core.handler.events.SneakManager;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.potion.Potion;
+import net.minecraft.util.MovementInputFromOptions;
 
 public class BasePlayer extends ClientPlayerBase
 {
@@ -30,8 +25,17 @@ public class BasePlayer extends ClientPlayerBase
 	 * 		EntityPlayerSP.onLivingUpdate() - Adapted to PlayerAPI
 	 */
 	@Override
-	public void onLivingUpdate()
-	{
+	public void onLivingUpdate() {
+		
+		super.onLivingUpdate();		
+		EntityPlayer aPlayer = this.player;
+		if (aPlayer != null) {
+			SneakManager aSneak = SneakManager.get(aPlayer);
+			if (!aSneak.isWearingRing()) {
+				return;
+			}
+		}		
+		
 		if(this.player.sprintingTicksLeft > 0)
 		{
 			--this.player.sprintingTicksLeft;
@@ -57,54 +61,9 @@ public class BasePlayer extends ClientPlayerBase
 		}
 		else
 		{
-			this.player.prevTimeInPortal = this.player.timeInPortal;
-			if(this.playerAPI.getInPortalField())
-			{
-				if(this.mc.currentScreen != null)
-				{
-					this.mc.displayGuiScreen((GuiScreen)null);
-				}
-
-				if(this.player.timeInPortal == 0.0F)
-				{
-					this.mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("portal.trigger"), (this.player.getRNG().nextFloat() * 0.4F) + 0.8F));
-				}
-
-				this.player.timeInPortal += 0.0125F;
-
-				if(this.player.timeInPortal >= 1.0F)
-				{
-					this.player.timeInPortal = 1.0F;
-				}
-
-				this.playerAPI.setInPortalField(false);
-			}
-			else if(this.player.isPotionActive(Potion.confusion) && (this.player.getActivePotionEffect(Potion.confusion).getDuration() > 60))
-			{
-				this.player.timeInPortal += 0.006666667F;
-				if(this.player.timeInPortal > 1.0F)
-				{
-					this.player.timeInPortal = 1.0F;
-				}
-			}
-			else
-			{
-				if(this.player.timeInPortal > 0.0F)
-				{
-					this.player.timeInPortal -= 0.05F;
-				}
-
-				if(this.player.timeInPortal < 0.0F)
-				{
-					this.player.timeInPortal = 0.0F;
-				}
-			}
 
 
-			if(this.player.timeUntilPortal > 0)
-			{
-				--this.player.timeUntilPortal;
-			}
+			
 
 			final boolean isJumping = this.player.movementInput.jump;
 
@@ -112,23 +71,6 @@ public class BasePlayer extends ClientPlayerBase
 			final boolean isMovingForward = this.player.movementInput.moveForward >= minSpeed;
 			this.customMovementInput.update(this.mc, (MovementInputFromOptions)this.player.movementInput, this.player);
 
-			if(this.player.isUsingItem() && !this.player.isRiding())
-			{
-				this.player.movementInput.moveStrafe *= 0.2F;
-				this.player.movementInput.moveForward *= 0.2F;
-				this.playerAPI.setSprintToggleTimerField(0);
-			}
-
-			if(this.player.movementInput.sneak && (this.player.ySize < 0.2F))
-			{
-				this.player.ySize = 0.2F;
-			}
-
-			this.playerAPI.localPushOutOfBlocks(this.player.posX - (this.player.width * 0.35D), this.player.boundingBox.minY + 0.5D, this.player.posZ + (this.player.width * 0.35D));
-			this.playerAPI.localPushOutOfBlocks(this.player.posX - (this.player.width * 0.35D), this.player.boundingBox.minY + 0.5D, this.player.posZ - (this.player.width * 0.35D));
-			this.playerAPI.localPushOutOfBlocks(this.player.posX + (this.player.width * 0.35D), this.player.boundingBox.minY + 0.5D, this.player.posZ - (this.player.width * 0.35D));
-			this.playerAPI.localPushOutOfBlocks(this.player.posX + (this.player.width * 0.35D), this.player.boundingBox.minY + 0.5D, this.player.posZ + (this.player.width * 0.35D));
-			final boolean enoughHunger = (this.player.getFoodStats().getFoodLevel() > 6.0F) || this.player.capabilities.isFlying;
 
 			/*
 			 * 		Begin ToggleSneak Changes - ToggleSprint
@@ -151,7 +93,7 @@ public class BasePlayer extends ClientPlayerBase
 			if(isSprintDisabled)
 			{
 				//Utils.LOG_INFO("Sprint pressed");
-				if(aSneak.optionDoubleTap && this.player.onGround && !isMovingForward && (this.player.movementInput.moveForward >= minSpeed) && !this.player.isSprinting() && enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness))
+				if(aSneak.optionDoubleTap && this.player.onGround && !isMovingForward && (this.player.movementInput.moveForward >= minSpeed) && !this.player.isSprinting() && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness))
 				{
 					if((this.playerAPI.getSprintToggleTimerField() <= 0) && !this.settings.keyBindSprint.getIsKeyPressed())
 					{
@@ -170,7 +112,7 @@ public class BasePlayer extends ClientPlayerBase
 					}
 				}
 
-				if(!this.player.isSprinting() && (this.player.movementInput.moveForward >= minSpeed) && enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness) && this.settings.keyBindSprint.getIsKeyPressed())
+				if(!this.player.isSprinting() && (this.player.movementInput.moveForward >= minSpeed) && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness) && this.settings.keyBindSprint.getIsKeyPressed())
 				{
 					if (aSneak.Sprinting()){
 						this.player.setSprinting(true);
@@ -192,7 +134,7 @@ public class BasePlayer extends ClientPlayerBase
 				// 5/6/14 - onGround check removed to match vanilla's 'start sprint while jumping' behavior.
 				//if(this.player.onGround && enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness) && !this.customMovementInput.sprintHeldAndReleased)
 
-				if(enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness) && !this.customMovementInput.sprintHeldAndReleased)
+				if(!this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness) && !this.customMovementInput.sprintHeldAndReleased)
 				{
 					if((canDoubleTap && !this.player.isSprinting()) || !canDoubleTap)
 					{
@@ -204,7 +146,7 @@ public class BasePlayer extends ClientPlayerBase
 					}
 				}
 
-				if(canDoubleTap && !state && this.player.onGround && !isMovingForward && (this.player.movementInput.moveForward >= minSpeed) && !this.player.isSprinting() && enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness))
+				if(canDoubleTap && !state && this.player.onGround && !isMovingForward && (this.player.movementInput.moveForward >= minSpeed) && !this.player.isSprinting() && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness))
 				{
 					if(this.playerAPI.getSprintToggleTimerField() == 0)
 					{
@@ -223,7 +165,7 @@ public class BasePlayer extends ClientPlayerBase
 
 			// If sprinting, break the sprint in appropriate circumstances:
 			// Player stops moving forward, runs into something, or gets too hungry
-			if(this.player.isSprinting() && ((this.player.movementInput.moveForward < minSpeed) || this.player.isCollidedHorizontally || !enoughHunger))
+			if(this.player.isSprinting() && ((this.player.movementInput.moveForward < minSpeed) || this.player.isCollidedHorizontally))
 			{
 				this.player.setSprinting(false);
 
@@ -265,87 +207,6 @@ public class BasePlayer extends ClientPlayerBase
 			//				this.handledDebugPress = false;
 			//			}
 
-			//
-			//  Fly Speed Boosting - Added 5/7/2014
-			//
-			if(this.player.capabilities.getFlySpeed() != 0.05F)
-			{
-				this.player.capabilities.setFlySpeed(0.05F);
-			}
-
-
-			if(this.player.capabilities.allowFlying && !isJumping && this.player.movementInput.jump)
-			{
-				if(this.playerAPI.getFlyToggleTimerField() == 0)
-				{
-					this.playerAPI.setFlyToggleTimerField(7);
-				}
-				else
-				{
-					this.player.capabilities.isFlying = !this.player.capabilities.isFlying;
-					this.player.sendPlayerAbilities();
-					this.playerAPI.setFlyToggleTimerField(0);
-				}
-			}
-
-			if(this.player.capabilities.isFlying)
-			{
-				if(this.player.movementInput.sneak)
-				{
-					this.player.motionY -= 0.15D;
-				}
-				if(this.player.movementInput.jump)
-				{
-					this.player.motionY += 0.15D;
-				}
-			}
-
-			if(this.player.isRidingHorse())
-			{
-				if(this.playerAPI.getHorseJumpPowerCounterField() < 0)
-				{
-					this.playerAPI.setHorseJumpPowerCounterField(this.playerAPI.getHorseJumpPowerCounterField() + 1);
-					if(this.playerAPI.getHorseJumpPowerCounterField() == 0)
-					{
-						this.playerAPI.setHorseJumpPowerField(0.0F);
-					}
-				}
-
-				if(isJumping && !this.player.movementInput.jump)
-				{
-					this.playerAPI.setHorseJumpPowerCounterField(this.playerAPI.getHorseJumpPowerCounterField() - 10);
-					this.playerAPI.setHorseJumpPowerCounterField(-10);
-					((EntityClientPlayerMP)this.player).sendQueue.addToSendQueue(new C0BPacketEntityAction(this.player, 6, (int)(this.player.getHorseJumpPower() * 100.0F)));
-				}
-				else if(!isJumping && this.player.movementInput.jump)
-				{
-					this.playerAPI.setHorseJumpPowerCounterField(0);
-					this.playerAPI.setHorseJumpPowerField(0.0F);
-				}
-				else if(isJumping)
-				{
-					this.playerAPI.setHorseJumpPowerCounterField(this.playerAPI.getHorseJumpPowerCounterField() + 1);
-					if(this.playerAPI.getHorseJumpPowerCounterField() < 10)
-					{
-						this.playerAPI.setHorseJumpPowerField(this.playerAPI.getHorseJumpPowerCounterField() * 0.1F);
-					}
-					else
-					{
-						this.playerAPI.setHorseJumpPowerField(0.8F + ((2.0F / (this.playerAPI.getHorseJumpPowerCounterField() - 9)) * 0.1F));
-					}
-				}
-			}
-			else
-			{
-				this.playerAPI.setHorseJumpPowerField(0.0F);
-			}
-
-			this.playerAPI.superOnLivingUpdate();
-			if(this.player.onGround && this.player.capabilities.isFlying)
-			{
-				this.player.capabilities.isFlying = false;
-				this.player.sendPlayerAbilities();
-			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 0b1078366a..ca62a524c1 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -136,6 +136,7 @@ public class COMPAT_HANDLER {
 			GregtechLargeTurbinesAndHeatExchanger.run();
 			GregtechPowerBreakers.run();
 			GregtechFluidReactor.run();
+			GregtechAlgaeContent.run();
 
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
diff --git a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
index b10e67aeaf..8853acd4b7 100644
--- a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
+++ b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.core.handler;
 
+import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import net.minecraft.client.Minecraft;
 import net.minecraft.stats.AchievementList;
 import net.minecraftforge.event.entity.player.AchievementEvent;
 
@@ -12,12 +12,15 @@ public class StopAnnoyingFuckingAchievements {
 	 * Stops me getting fireworks every fucking time I open my inventory upon first loading a dev client.
 	 * @param event
 	 */
-	@SubscribeEvent
+	@SubscribeEvent(priority=EventPriority.HIGHEST)
 	public void FUCK_OFF(AchievementEvent event)	{
 		if (event.achievement.equals(AchievementList.openInventory)) {
-			if (MathUtils.randInt(0, 10) >= 9)
-				PlayerUtils.messagePlayer(event.entityPlayer, "Bang! Nah, Just joking, there's no fireworks. :)");
 			event.setCanceled(true);
+			if (Minecraft.getMinecraft() != null) {
+				if (Minecraft.getMinecraft().gameSettings != null) {
+					Minecraft.getMinecraft().gameSettings.showInventoryAchievementHint = false;
+				}
+			}
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java b/src/Java/gtPlusPlus/core/handler/events/SneakManager.java
index 2b067be477..3e51c6488a 100644
--- a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java
+++ b/src/Java/gtPlusPlus/core/handler/events/SneakManager.java
@@ -37,10 +37,11 @@ public class SneakManager {
 	public boolean		canSprint		= true;
 	public boolean		isSneaking		= true;
 	public boolean		optionDoubleTap			= true;
-	public boolean		wasSprintDisabled		= false;
+	public boolean		wasSprintDisabled		= false;	
+	public boolean		mIsWearingRing			= false;
 
-	private static State Sprinting = State.ON;
-	private static State Crouching = State.OFF;
+	private State Sprinting = State.ON;
+	private State Crouching = State.OFF;
 	
 	public SneakManager(EntityPlayer aPlayer) {
 		owner = aPlayer;
@@ -78,22 +79,38 @@ public class SneakManager {
 		return State.ON;
 	}
 
-	public State setCrouchingStateON(){
+	private State setCrouchingStateON(){
 		return Crouching = State.ON;
 	}
 
-	public State setCrouchingStateOFF(){
+	private State setCrouchingStateOFF(){
 		return Crouching = State.OFF;
 	}
 
-	public State setSprintingStateON(){
+	private State setSprintingStateON(){
 		return Sprinting = State.ON;
 	}
 
-	public State setSprintingStateOFF(){
+	private State setSprintingStateOFF(){
 		return Sprinting = State.OFF;
 	}
-
+	
+	public void putRingOn() {
+		mIsWearingRing = true;
+		setSprintingStateOFF();
+		setCrouchingStateON();
+	}
+	
+	public void takeRingOff() {
+		mIsWearingRing = false;
+		setSprintingStateON();
+		setCrouchingStateOFF();
+	}
+	
+	public boolean isWearingRing() {
+		return mIsWearingRing;
+	}	
+	
 	public static enum State {
 		ON(true),
 		OFF(false);
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
index 42890ddfa6..251230932c 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
@@ -26,28 +26,43 @@ public class ItemBlockBasicTile extends ItemBlock {
 			list.add("Can also be placed beside upto 4 other fish traps");
 			list.add("Requires at least two faces touching water");
 			list.add("1/1000 chance to produce triple loot.");
-		} else if (this.mID == 1) { // Modularity
+		} 
+		else if (this.mID == 1) { // Modularity
 			list.add("Used to construct modular armour & bauble upgrades..");
-		} else if (this.mID == 2) { // Trade
+		} 
+		else if (this.mID == 2) { // Trade
 			list.add("Allows for SMP trade-o-mat type trading.");
-		} else if (this.mID == 3) { // Project
+		} 
+		else if (this.mID == 3) { // Project
 			list.add("Scan any crafting recipe in this to mass fabricate them in the Autocrafter..");
-		} else if (this.mID == 4) { // Circuit Table
+		} 
+		else if (this.mID == 4) { // Circuit Table
 			list.add("Easy Circuit Configuration");
 			list.add("Change default setting with a Screwdriver");
 			list.add("Default is used to select slot for auto-insertion");
-		} else if (this.mID == 5) { // Decayables Chest
+		} 
+		else if (this.mID == 5) { // Decayables Chest
 			list.add("Chest which holds radioactive materials");
 			list.add("Items which decay will tick while inside");
 			list.add("Place with right click");
-		} else if (this.mID == 6) { // Butterfly Killer
+		} 
+		else if (this.mID == 6) { // Butterfly Killer
 			list.add("Kills Forestry Butterflies, Bats and other pests");
 			list.add("Use either Formaldehyde or Hydrogen cyanide");
 			list.add("Be weary of your neighbours");
-		} else if (this.mID == 7) {
-		} else {
-			list.add("Bad Tooltip ID - " + mID);
+		} 
+		else if (this.mID == 7) {
 
+		} 
+		else if (this.mID == 8){
+			
+		}
+		else if (this.mID == 9){
+			
+		}
+
+		else {
+			list.add("Bad Tooltip ID - " + mID);
 		}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java
deleted file mode 100644
index 9badd384d8..0000000000
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package gtPlusPlus.core.item.base.itemblock;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-
-import gtPlusPlus.api.interfaces.ITileTooltip;
-
-public class ItemBlockBasicTooltip extends ItemBlock{
-
-	protected final int mID;
-	
-	public ItemBlockBasicTooltip(final Block block) {
-		super(block);
-		this.mID = ((ITileTooltip) block).getTooltipID();
-	}	
-	
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		if (this.mID == 0){ //blockDarkWorldPortalFrame
-			list.add("Assembled in the same shape as the Nether Portal.");			
-		}
-		else if (this.mID == 1){ //Modularity
-			list.add("Used to construct modular armour & bauble upgrades..");			
-		}
-	}
-	
-
-}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
index f586695eb7..2d0fd00dd9 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
@@ -16,8 +16,6 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
 	public ItemBlockRoundRobinator(final Block aBlock){
 		super(aBlock, aBlock);
 		this.mBlock = aBlock;
-		this.setMaxDamage(4);
-		this.setHasSubtypes(true);
 	}
 	
 
@@ -40,7 +38,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
 		else if (stack.getItemDamage() == 4) {
 			list.add("1 Item per enabled side every tick");			
 		}		
-		list.add("Top and bottom do not pull, so you must push item in");
+		list.add("Top and bottom do not pull, so you must push items in");
 		list.add("Sides can also be disabled with a screwdriver");	
 		list.add("Shift+RMB with empty hand to view inventory contents");	
 		super.addInformation(stack, aPlayer, list, bool);		
@@ -62,7 +60,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
 	@Override
 	public int getMetadata(final int p_77647_1_)
 	{
-		return super.getMetadata(p_77647_1_);
+		return p_77647_1_;
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
index 1c28f99ff8..3f8e31d8d2 100644
--- a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
+++ b/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
@@ -26,7 +26,9 @@ public class ItemDummyResearch extends ItemGenericToken {
 		RESEARCH_4_BASIC_PHYSICS("Basic Physics", "Fundamental laws of motion"),
 		RESEARCH_5_ADV_PHYSICS("Advanced Physics", "Advanced knowledge!"),
 		RESEARCH_6_BASIC_METALLURGY("Basic Metallurgy", "Information about material smelting"),
-		RESEARCH_7_ADV_METALLURGY("Advanced Metallurgy", "Advanced Material Sciences!");	
+		RESEARCH_7_ADV_METALLURGY("Advanced Metallurgy", "Advanced Material Sciences!"),
+		RESEARCH_8_TURBINE_AUTOMATION("Turbine Automation", "You really don't want to share this with anyone!"), 
+		RESEARCH_9_CLOAKING("Cloaking Technologies", "Sneaking around like a mouse");	
 		
 		
 		
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java b/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
index c151a16f09..fa008bf1a3 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
@@ -2,10 +2,15 @@ package gtPlusPlus.core.item.general;
 
 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 net.minecraft.client.Minecraft;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.events.CustomMovementHandler;
+import gtPlusPlus.core.handler.events.SneakManager;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,14 +19,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
-import baubles.api.BaubleType;
-import baubles.api.IBauble;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.handler.events.CustomMovementHandler;
-import gtPlusPlus.core.handler.events.SneakManager;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-
 @Optional.InterfaceList(value = {@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles")})
 public class ItemSlowBuildingRing extends Item implements IBauble{
 
@@ -84,7 +81,17 @@ public class ItemSlowBuildingRing extends Item implements IBauble{
 
 	@Override //TODO
 	public void onEquipped(final ItemStack arg0, final EntityLivingBase arg1) {
-		doEffect(arg1);
+		try {
+			EntityPlayer aPlayer;
+			if (arg1 instanceof EntityPlayer) {
+				aPlayer = (EntityPlayer) arg1;
+				SneakManager s = SneakManager.get(aPlayer);				
+				s.putRingOn();
+			}
+		}
+		catch (Throwable t) {
+			t.printStackTrace();
+		}
 	}
 
 	@Override //TODO
@@ -94,8 +101,7 @@ public class ItemSlowBuildingRing extends Item implements IBauble{
 			if (arg1 instanceof EntityPlayer) {
 				aPlayer = (EntityPlayer) arg1;
 				SneakManager s = SneakManager.get(aPlayer);				
-				s.setSprintingStateON();
-				s.setCrouchingStateOFF();
+				s.takeRingOff();
 			}
 		}
 		catch (Throwable t) {
@@ -122,9 +128,7 @@ public class ItemSlowBuildingRing extends Item implements IBauble{
 					}						
 					if (aPlayer.isSprinting()) {
 						aPlayer.setSprinting(false);						
-					}
-					s.setSprintingStateOFF();
-					s.setCrouchingStateON();				
+					}				
 				}				
 			}
 		}
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 04f1861cfe..3330ad8c3f 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -5,10 +5,13 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import com.mojang.authlib.GameProfile;
 
+import cpw.mods.fml.common.FMLCommonHandler;
 import gregtech.api.GregTech_API;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.core.util.sys.GeoUtils;
 import gtPlusPlus.core.util.sys.NetworkUtils;
 import gtPlusPlus.preloader.CORE_Preloader;
@@ -52,7 +55,7 @@ public class CORE {
 
 	public static final String name = "GT++";
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.7.03.01";
+	public static final String VERSION = "1.7.03.45";
 	public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
 	public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
 	public static boolean isModUpToDate = Utils.isModUpToDate();
@@ -76,7 +79,7 @@ public class CORE {
 	public static int turbineCutoffBase = 75000;
 
 	//GT++ Fake Player Profile
-	public static GameProfile gameProfile = new GameProfile(UUID.nameUUIDFromBytes("gtplusplus.core".getBytes()), "[GT++]");
+	public static final GameProfile gameProfile = new GameProfile(UUID.nameUUIDFromBytes("gtplusplus.core".getBytes()), "[GT++]");
 	public static final WeakHashMap<World, EntityPlayerMP> fakePlayerCache = new WeakHashMap<World, EntityPlayerMP>();
 	//Tooltips;
 	public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus "+EnumChatFormatting.GRAY+"- "+EnumChatFormatting.RED+"[GT++]";
@@ -88,6 +91,7 @@ public class CORE {
 	//Because I want to be lazy. Beyond Reality Classic Var.
 	public static boolean BRC = false;
 
+	public static final String SEPERATOR = "/";
 
 
 	/**
@@ -286,7 +290,20 @@ public class CORE {
 	}
 
 	public static final void crash() {
-		System.exit(0);		
+		Logger.ERROR("==========================================================");
+		Logger.ERROR("[GT++ CRASH]");
+		Logger.ERROR("==========================================================");
+		Logger.ERROR("Oooops...");
+		Logger.ERROR("This should only happy in a development environment or when something really bad happens.");
+		Logger.ERROR("==========================================================");
+		Logger.ERROR("Called from: "+ReflectionUtils.getMethodName(0));
+		Logger.ERROR(ReflectionUtils.getMethodName(1));
+		Logger.ERROR(ReflectionUtils.getMethodName(2));
+		Logger.ERROR(ReflectionUtils.getMethodName(3));
+		Logger.ERROR(ReflectionUtils.getMethodName(4));
+		Logger.ERROR(ReflectionUtils.getMethodName(5));
+		Logger.ERROR(ReflectionUtils.getMethodName(6));		
+		FMLCommonHandler.instance().exitJava(0, true);
 	}
 	
 	public static final void gc() {
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 3f631e0bca..cac54cec4e 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -276,6 +276,35 @@ public class RECIPES_GREGTECH {
 				20 * 60 * 1 * (GTNH ? 2 : 1),
 				(int) GT_Values.V[5]);
 
+		// Turbine Automation Port
+		CORE.RA.addAssemblylineRecipe(
+				ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1), 
+				20 * 60 * 60 * 24,
+				new ItemStack[] {
+						CI.getTieredMachineHull(8, 4),
+						CI.getConveyor(8, GTNH ? 24 : 12),
+						CI.getElectricMotor(7, GTNH ? 32 : 16),
+						CI.getElectricPiston(7, GTNH ? 16 : 4),
+						CI.getEnergyCore(6, GTNH ? 8 : 2),
+						CI.getPlate(8, GTNH ? 24 : 12),
+						CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 48 : 24),
+						CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 32 : 16),
+						CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 12 : 6),
+						CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 20 : 10),
+						CI.getTieredComponent(OrePrefixes.rotor, 6, GTNH ? 16 : 8),
+				}, 
+				new FluidStack[] {
+						CI.getTieredFluid(8, 144 * 32),
+						CI.getAlternativeTieredFluid(7, 144 * 16),
+						CI.getTertiaryTieredFluid(7, 144 * 16),
+						ALLOY.BABBIT_ALLOY.getFluid(128 * 144),
+						ALLOY.ZERON_100.getFluid(144 * 64)
+
+				},
+				GregtechItemList.Hatch_Input_TurbineHousing.get(4), 
+				20 * 60 * 60 * (GTNH ? 2 : 1),
+				(int) GT_Values.V[8]);
+
 
 		/*
 		 * Contianment casings
@@ -360,88 +389,116 @@ public class RECIPES_GREGTECH {
 		}
 
 
-		//Nano Healer
-		CORE.RA.addAssemblylineRecipe(
-				ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1), 
-				20 * 60 * 10,
-				new ItemStack[] {
-						ItemUtils.getSimpleStack(aGemCasings[2], GTNH ? 4 : 2),
-						CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
-						CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 4),
-						CI.getTieredComponent(OrePrefixes.cableGt02, 7, GTNH ? 16 : 8),
-						CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 6 : 3),
-						CI.getTieredComponent(OrePrefixes.screw, 7, GTNH ? 16 : 8),
-						CI.getTieredComponent(OrePrefixes.bolt, 5, GTNH ? 24 : 12),
-						CI.getTieredComponent(OrePrefixes.frameGt, 4, GTNH ? 12 : 6),
-						aCoilWire[3]
-				}, 
-				new FluidStack[] {
-						CI.getTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
-						CI.getTertiaryTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
-						CI.getAlternativeTieredFluid(6, 144 * 18 * (GTNH ? 16 : 8)),
-						CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
-
-				},
-				ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1), 
-				20 * 60 * 30 * (GTNH ? 2 : 1),
-				(int) GT_Values.V[7]);
-
-
-
-		//Charge Pack LuV-UV
-
-		ItemStack[] aChargeResearch = new ItemStack[] {
-				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1),
-				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_1, 1),
-				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_2, 1),
-				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1),
-		};
-
-		ItemStack[] aChargeOutputs = new ItemStack[] {
-				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_1, 1),
-				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_2, 1),
-				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1),
-				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_4, 1),			
-		};
+		if (LoadedMods.Baubles) {
+			//Nano Healer
+			CORE.RA.addAssemblylineRecipe(
+					ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1), 
+					20 * 60 * 10,
+					new ItemStack[] {
+							ItemUtils.getSimpleStack(aGemCasings[2], GTNH ? 4 : 2),
+							CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 4),
+							CI.getTieredComponent(OrePrefixes.cableGt02, 7, GTNH ? 16 : 8),
+							CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 6 : 3),
+							CI.getTieredComponent(OrePrefixes.screw, 7, GTNH ? 16 : 8),
+							CI.getTieredComponent(OrePrefixes.bolt, 5, GTNH ? 24 : 12),
+							CI.getTieredComponent(OrePrefixes.frameGt, 4, GTNH ? 12 : 6),
+							aCoilWire[3]
+					}, 
+					new FluidStack[] {
+							CI.getTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
+							CI.getTertiaryTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
+							CI.getAlternativeTieredFluid(6, 144 * 18 * (GTNH ? 16 : 8)),
+							CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
 
-		ItemStack[] aBufferCoreInputs = new ItemStack[] {
-				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", GTNH ? 8 : 4),
-				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", GTNH ? 8 : 4),
-				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", GTNH ? 8 : 4),
-				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", GTNH ? 8 : 4),
-		};
+					},
+					ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1), 
+					20 * 60 * 30 * (GTNH ? 2 : 1),
+					(int) GT_Values.V[7]);
+
+
+
+			//Charge Pack LuV-UV
+
+			ItemStack[] aChargeResearch = new ItemStack[] {
+					ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1),
+					ItemUtils.getSimpleStack(ModItems.itemChargePack_High_1, 1),
+					ItemUtils.getSimpleStack(ModItems.itemChargePack_High_2, 1),
+					ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1),
+			};
+
+			ItemStack[] aChargeOutputs = new ItemStack[] {
+					ItemUtils.getSimpleStack(ModItems.itemChargePack_High_1, 1),
+					ItemUtils.getSimpleStack(ModItems.itemChargePack_High_2, 1),
+					ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1),
+					ItemUtils.getSimpleStack(ModItems.itemChargePack_High_4, 1),			
+			};
+
+			ItemStack[] aBufferCoreInputs = new ItemStack[] {
+					ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", GTNH ? 8 : 4),
+					ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", GTNH ? 8 : 4),
+					ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", GTNH ? 8 : 4),
+					ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", GTNH ? 8 : 4),
+			};
+
+			int aCurrSlot = 0;
+			for (int h = 6; h < 10; h++) {
+				CORE.RA.addAssemblylineRecipe(
+						aChargeResearch[aCurrSlot], 
+						20 * 60 * 10 * (aCurrSlot + 1),
+						new ItemStack[] {
+								ItemUtils.getSimpleStack(
+										aGemBatteries[aCurrSlot], GTNH ? 4 : 2),
+								aBufferCoreInputs[aCurrSlot],
+								aCoilWire[aCurrSlot],
+								CI.getTieredComponent(OrePrefixes.plate, h, GTNH ? 16 : 8),
+								CI.getTieredComponent(OrePrefixes.plate, h-1, GTNH ? 32 : 16),
+								CI.getTieredComponent(OrePrefixes.circuit, h, GTNH ? 16 : 4),
+								CI.getTieredComponent(OrePrefixes.circuit, h-1, GTNH ? 32 : 8),
+								CI.getTieredComponent(OrePrefixes.cableGt12, h-1, GTNH ? 32 : 16),
+								CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8),
+								CI.getTieredComponent(OrePrefixes.bolt, h-2, GTNH ? 32 : 16),
+								CI.getElectricMotor(h, GTNH ? 8 : 4),
+								CI.getFieldGenerator(h-1, 2),
+								CI.getRobotArm(h-2, GTNH ? 4 : 2),
+						}, 
+						new FluidStack[] {
+								CI.getTieredFluid(h, 144 * 18 * (GTNH ? 8 : 4)),
+								CI.getTertiaryTieredFluid(h-1, 144 * 18 * (GTNH ? 8 : 4)),
+								CI.getAlternativeTieredFluid(h-1, 144 * 18 * (GTNH ? 8 : 4)),
+								CI.getAlternativeTieredFluid(h-2, 144 * 18 * (GTNH ? 8 : 4)),							
+						},
+						aChargeOutputs[aCurrSlot], 
+						20 * 60 * 30 * (GTNH ? 2 : 1) * (aCurrSlot+1),
+						(int) GT_Values.V[h]);
+				aCurrSlot++;
+			}
 
-		int aCurrSlot = 0;
-		for (int h = 6; h < 10; h++) {
+			//Cloaking device
 			CORE.RA.addAssemblylineRecipe(
-					aChargeResearch[aCurrSlot], 
-					20 * 60 * 10 * (aCurrSlot + 1),
+					ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1), 
+					20 * 60 * 10,
 					new ItemStack[] {
-							ItemUtils.getSimpleStack(
-									aGemBatteries[aCurrSlot], GTNH ? 4 : 2),
-							aBufferCoreInputs[aCurrSlot],
-							aCoilWire[aCurrSlot],
-							CI.getTieredComponent(OrePrefixes.plate, h, GTNH ? 16 : 8),
-							CI.getTieredComponent(OrePrefixes.plate, h-1, GTNH ? 32 : 16),
-							CI.getTieredComponent(OrePrefixes.circuit, h, GTNH ? 16 : 4),
-							CI.getTieredComponent(OrePrefixes.circuit, h-1, GTNH ? 32 : 8),
-							CI.getTieredComponent(OrePrefixes.cableGt12, h-1, GTNH ? 32 : 16),
-							CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8),
-							CI.getTieredComponent(OrePrefixes.bolt, h-2, GTNH ? 32 : 16),
-							CI.getElectricMotor(h, GTNH ? 8 : 4),
-							CI.getFieldGenerator(h-1, 2),
-							CI.getRobotArm(h-2, GTNH ? 4 : 2),
+							ItemUtils.getSimpleStack(aGemCasings[3], GTNH ? 4 : 2),
+							CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 4),
+							CI.getTieredComponent(OrePrefixes.cableGt04, 8, GTNH ? 16 : 8),
+							CI.getTieredComponent(OrePrefixes.gearGt, 7, GTNH ? 6 : 3),
+							CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 16 : 8),
+							CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 24 : 12),
+							CI.getTieredComponent(OrePrefixes.frameGt, 5, GTNH ? 12 : 6),
+							aCoilWire[3]
 					}, 
 					new FluidStack[] {
-							CI.getTieredFluid(h, 144 * 18 * (GTNH ? 8 : 4)),
-							CI.getTertiaryTieredFluid(h-1, 144 * 18 * (GTNH ? 8 : 4)),
-							CI.getAlternativeTieredFluid(h-1, 144 * 18 * (GTNH ? 8 : 4)),
-							CI.getAlternativeTieredFluid(h-2, 144 * 18 * (GTNH ? 8 : 4)),							
+							CI.getTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)),
+							CI.getTertiaryTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)),
+							CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
+							CI.getAlternativeTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)),
+
 					},
-					aChargeOutputs[aCurrSlot], 
-					20 * 60 * 30 * (GTNH ? 2 : 1) * (aCurrSlot+1),
-					(int) GT_Values.V[h]);
-			aCurrSlot++;
+					ItemUtils.getItemStackFromFQRN("miscutils:personalCloakingDevice", 1), 
+					20 * 60 * 30 * (GTNH ? 2 : 1),
+					(int) GT_Values.V[8]);
 		}
 
 
@@ -1491,6 +1548,53 @@ public class RECIPES_GREGTECH {
 				GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 4L), GregtechItemList.Fluid_Cell_144L.get(1L, new Object[0]), 75, 32);
 			}
 		}
+		
+
+		if (LoadedMods.Baubles) {
+			
+
+
+			// Turbine Housing Research Page
+			CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+					ItemUtils.getGregtechCircuit(17),
+					ItemUtils.getItemStackOfAmountFromOreDict("plateRefinedTrinium", GTNH ? 64 : 32),
+					CI.getSensor(6, GTNH ? 6 : 3),
+					CI.getBolt(7, GTNH ? 64 : 32),
+					ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32),
+					ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), GTNH ? 12 : 6)			
+			},
+					CI.getAlternativeTieredFluid(7, 144 * 32),
+					ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1),
+					20 * 60 * 5,
+					(int) GT_Values.V[6]);
+
+			// Cloaking Device Research Page
+			CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+					ItemUtils.getGregtechCircuit(17),
+					ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 4),
+					CI.getFieldGenerator(6, GTNH ? 16 : 8),
+					ItemUtils.getItemStackOfAmountFromOreDict("wireFinePalladium", GTNH ? 32 : 16),
+					ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), GTNH ? 12 : 6)			
+			},
+					CI.getAlternativeTieredFluid(7, 144 * 32),
+					ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1),
+					20 * 60 * 10,
+					(int) GT_Values.V[7]);
+			
+			
+			// Supreme Pizza Gloves
+			CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+					ItemUtils.getGregtechCircuit(19),
+					ItemUtils.getSimpleStack(ModItems.itemRope, GTNH ? 32 : 16),
+					ItemUtils.getItemStackOfAmountFromOreDict("gearGtSmallWroughtIron", GTNH ? 8 : 4),
+					ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", GTNH ? 32 : 16),
+					ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), GTNH ? 2 : 1)			
+			},
+					FluidUtils.getFluidStack("molten.rubber", 2000),
+					ItemUtils.getSimpleStack(ModItems.itemPersonalFireProofDevice),
+					20 * 60 * 5,
+					30);
+		}
 
 
 
@@ -1641,7 +1745,7 @@ public class RECIPES_GREGTECH {
 	}
 
 	private static void centrifugeRecipes() {
-		
+
 		//Try use all woods found, fix/add methane extraction.
 		ArrayList<ItemStack> aLogData = OreDictionary.getOres("logWood");
 		ArrayList<ItemStack> aRubberLogs = OreDictionary.getOres("logRubber");
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index bc1c7fc398..f5bd390aee 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1063,7 +1063,20 @@ public class RECIPES_Machines {
 						RECIPE_ThermalBoilerCasing);
 
 				//Lava Filter Recipe
-				GT_Values.RA.addAssemblerRecipe(ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemPartCarbonMesh", "RawCarbonMesh", 0, 16), CI.getNumberedCircuit(18), ItemUtils.getSimpleStack(ModItems.itemLavaFilter), 80*20, 16);
+				CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+						CI.getNumberedCircuit(18),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", GTNH ? 64 : 32),
+						ItemUtils.getItemStackOfAmountFromOreDict("wireFineSteel", GTNH ? 64 : 32),
+						ItemUtils.getItemStackOfAmountFromOreDict("ringTumbaga", GTNH ? 32 : 16),
+						ItemUtils.getItemStackOfAmountFromOreDict("foilCopper", GTNH ? 8 : 4),
+						ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemPartCarbonMesh", "RawCarbonMesh", 0, 64),
+
+				},
+						CI.getTieredFluid(3, 144), 
+						ItemUtils.getSimpleStack(ModItems.itemLavaFilter, GTNH ? 8 : 16), 
+						1600,
+						240
+						);
 			}
 
 			if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor){
@@ -2201,10 +2214,10 @@ public class RECIPES_Machines {
 				ItemList.Hatch_Input_Bus_ZPM.get(1),
 				ItemList.Hatch_Input_Bus_UV.get(1),
 				ItemList.Hatch_Input_Bus_MAX.get(1),
-				GregtechItemList.Hatch_SuperBus_Input_ULV.get(1),
 				GregtechItemList.Hatch_SuperBus_Input_LV.get(1),
 				GregtechItemList.Hatch_SuperBus_Input_MV.get(1),
 				GregtechItemList.Hatch_SuperBus_Input_HV.get(1),
+				GregtechItemList.Hatch_SuperBus_Input_EV.get(1),
 		};
 
 		ItemStack[] mOutputHatch = new ItemStack[] {
@@ -2214,20 +2227,66 @@ public class RECIPES_Machines {
 				ItemList.Hatch_Output_Bus_ZPM.get(1),
 				ItemList.Hatch_Output_Bus_UV.get(1),
 				ItemList.Hatch_Output_Bus_MAX.get(1),
-				GregtechItemList.Hatch_SuperBus_Output_ULV.get(1),
 				GregtechItemList.Hatch_SuperBus_Output_LV.get(1),
 				GregtechItemList.Hatch_SuperBus_Output_MV.get(1),
 				GregtechItemList.Hatch_SuperBus_Output_HV.get(1),
+				GregtechItemList.Hatch_SuperBus_Output_EV.get(1),
 		};
 
+		// Special Case recipes for ULV buses
+		{
+
+			int i = 0;
+			ItemStack[] aInputs1 = new ItemStack[] {
+					CI.getNumberedCircuit(17),
+					mInputHatch[i],
+					CI.getElectricMotor(i, GTNH ? 8 : 2),
+					CI.getConveyor(i, GTNH ? 10 : 5),
+					CI.getBolt(i, GTNH ? 32 : 16),
+					CI.getTieredComponent(OrePrefixes.circuit, i, GTNH ? 4 : 2)                   
+			};
+			Logger.INFO("[FIND] "+ItemUtils.getArrayStackNames(aInputs1));
+			ItemStack[] aOutputs1 = new ItemStack[] {
+					CI.getNumberedCircuit(18),
+					mOutputHatch[i],
+					CI.getElectricPiston(i, GTNH ? 8 : 2),
+					CI.getConveyor(i, GTNH ? 10 : 5),
+					CI.getGear(i, GTNH ? 6 : 3),
+					CI.getTieredComponent(OrePrefixes.circuit, i, GTNH ? 4 : 2)                   
+			};
+			Logger.INFO("[FIND] "+ItemUtils.getArrayStackNames(aOutputs1));
+
+			FluidStack a1 = CI.getAlternativeTieredFluid(i, 144 * 8);
+			FluidStack a2 = CI.getTertiaryTieredFluid(i, 144 * 8);
+
+
+			Logger.INFO("[FIND] Input Bus Fluid: "+ItemUtils.getFluidName(a1));
+			Logger.INFO("[FIND] Output Bus Fluid: "+ItemUtils.getFluidName(a2));
+
+
+			CORE.RA.addSixSlotAssemblingRecipe(aInputs1,
+					a1,
+					mSuperBusesInput[i].get(1),
+					20 * 30 * 2 * i,
+					(int) GT_Values.V[i]);
+
+			CORE.RA.addSixSlotAssemblingRecipe(aOutputs1,
+					a2,
+					mSuperBusesOutput[i].get(1),
+					20 * 30 * 2 * i,
+					(int) GT_Values.V[i]);
+
+
+		}
+
 		//Input Buses
-		for (int i = 0; i < 10; i++) {
+		for (int i = 1; i < 10; i++) {
 			CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
-					CI.getNumberedCircuit(16),
+					CI.getNumberedCircuit(17),
 					mInputHatch[i],
 					CI.getElectricMotor(i, GTNH ? 8 : 2),
 					CI.getConveyor(i, GTNH ? 10 : 5),
-					CI.getGear(i, GTNH ? 6 : 3),
+					CI.getBolt(i, GTNH ? 32 : 16),
 					CI.getTieredComponent(OrePrefixes.circuit, i, GTNH ? 4 : 2)                   
 			},
 					CI.getAlternativeTieredFluid(i, 144 * 8),
@@ -2235,7 +2294,7 @@ public class RECIPES_Machines {
 					(int) GT_Values.V[i]);
 		}
 		//Output Buses
-		for (int i = 0; i < 10; i++) {
+		for (int i = 1; i < 10; i++) {
 			CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
 					CI.getNumberedCircuit(18),
 					mOutputHatch[i],
@@ -2259,7 +2318,7 @@ public class RECIPES_Machines {
 				CI.craftingToolWrench, CI.machineCasing_ULV, CI.craftingToolScrewdriver, 
 				ItemUtils.getSimpleStack(Blocks.hopper), "circuitPrimitive", ItemUtils.getSimpleStack(Blocks.hopper),
 				ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 0, 1));		
-		
+
 		ItemStack[] aRobinators = new ItemStack[] {
 				ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 0, 1),
 				ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 1, 1),
@@ -2272,6 +2331,17 @@ public class RECIPES_Machines {
 
 		for (int i = 0; i < 5; i++) {			
 			if (i == 0) {
+				CORE.RA.addSixSlotAssemblingRecipe(				
+						new ItemStack[] {
+								CI.getNumberedCircuit(17),
+								CI.getTieredMachineCasing(0),
+								ItemUtils.getSimpleStack(Blocks.hopper, 4),
+								CI.getTieredComponent(OrePrefixes.circuit, 0, 2)
+						},					
+						GT_Values.NF, //Input Fluid					
+						aRobinators[i],					
+						45 * 10 * 1, 
+						8);
 				continue;
 			}			
 			int aTier = i+1;
@@ -2283,10 +2353,10 @@ public class RECIPES_Machines {
 					CI.getTieredComponent(OrePrefixes.plate, aTier, 4 * aCostMultiplier),
 					CI.getTieredComponent(OrePrefixes.circuit, i, 2 * aCostMultiplier),
 			};		
-			
+
 			CORE.RA.addSixSlotAssemblingRecipe(				
 					aInputs,					
-					CI.getAlternativeTieredFluid(aTier, (144 * 2 * i)), //Input Fluid					
+					GT_Values.NF, //Input Fluid					
 					aRobinators[i],					
 					45 * 10 * 1 * (i+1), 
 					MaterialUtils.getVoltageForTier(i));	
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
index 73c7279bb8..902806e026 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
@@ -86,15 +86,15 @@ public class RECIPES_SeleniumProcessing {
     
     public static void processCopperRecipes() {
         
-        //Copper
+        //Copper 
         CORE.RA.addDehydratorRecipe(
                 new ItemStack[]{
-                    ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1), // Item Input
+                    ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1), // Item Input
                 },
                 FluidUtils.getHotWater(1000), // Fluid
                 MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(20), // Fluid
                 new ItemStack[] {
-                        ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1),
+                        ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1),
                         MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
                         MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
                         MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
@@ -121,12 +121,12 @@ public class RECIPES_SeleniumProcessing {
         //Tetra
         CORE.RA.addDehydratorRecipe(
                 new ItemStack[]{
-                    ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1), // Item Input
+                    ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1), // Item Input
                 },
                 FluidUtils.getHotWater(1000), // Fluid
                 MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid
                 new ItemStack[] {
-                        ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1),
+                        ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1),
                         MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
                         MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
                         MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
@@ -153,12 +153,12 @@ public class RECIPES_SeleniumProcessing {
         //Chalco
         CORE.RA.addDehydratorRecipe(
                 new ItemStack[]{
-                    ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1), // Item Input
+                    ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), // Item Input
                 },
                 FluidUtils.getHotWater(1000), // Fluid
                 MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid
                 new ItemStack[] {
-                        ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1),
+                        ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1),
                         MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
                         MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
                         MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
@@ -185,12 +185,12 @@ public class RECIPES_SeleniumProcessing {
         //Malachite
         CORE.RA.addDehydratorRecipe(
                 new ItemStack[]{
-                    ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1), // Item Input
+                    ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1), // Item Input
                 },
                 FluidUtils.getHotWater(1000), // Fluid
                 MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid
                 new ItemStack[] {
-                        ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1),
+                        ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1),
                         MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
                         MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
                         MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
index 10cefdf0c4..2cc6d7b41a 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
@@ -154,16 +154,7 @@ public class RECIPES_Tools {
 				CobbleStone, sandHammer, CobbleStone,
 				CobbleStone, CobbleStone, CobbleStone,
 				RECIPE_Sand);
-
-		if (LoadedMods.Baubles){
-			//Cloaking Device
-			RecipeUtils.recipeBuilder(
-					plateDoubleNiChrome, plateIridiumAlloy, plateDoubleNiChrome,
-					plateIridiumAlloy, batteryUltimate, plateIridiumAlloy,
-					plateDoubleNiChrome, plateIridiumAlloy, plateDoubleNiChrome,
-					personalCloakingDevice);
-
-		}
+		
 		//Sand to Sandstone
 		RecipeUtils.recipeBuilder(
 				Sand, Sand, Sand,
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 63477cda19..968a96135e 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -634,12 +634,22 @@ public class CI {
 	}
 
 	public static FluidStack getTieredFluid(int aTier, int aAmount, int aType) {
-		ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1);
+		// Weird Legacy handling
+		/*ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1);
 		FluidStack a = GT_Utility.getFluidForFilledItem(aCell, true);
 		if (a == null) {
 			a = aMaster[aType][aTier].getFluid(aAmount);
-		}
-		a.amount = aAmount;
+		}*/		
+		
+		// Modern Handling
+		FluidStack a = aMaster[aType][aTier].getFluid(aAmount);			
+		if (a == null) {
+			ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1);
+			if (aCell != null) {
+				a = GT_Utility.getFluidForFilledItem(aCell, true);
+				a.amount = aAmount;
+			}
+		}		
 		return a;
 	}
 	
diff --git a/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
index cca58467ef..3e96220995 100644
--- a/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
+++ b/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
@@ -1,10 +1,15 @@
 package gtPlusPlus.core.util.data;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
-import net.minecraft.item.ItemStack;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
+import net.minecraft.item.ItemStack;
 
 public class ArrayUtils {
 
@@ -75,5 +80,13 @@ public class ArrayUtils {
 		}
 	}
 
+	public static String toString(Object[] aArray, String string) {
+		return org.apache.commons.lang3.ArrayUtils.toString(aArray, string);
+	}
+
+	public static String toString(Object[] aArray) {
+		return org.apache.commons.lang3.ArrayUtils.toString(aArray);
+	}
+
 }
 
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ClientUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ClientUtils.java
new file mode 100644
index 0000000000..806f83d830
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ClientUtils.java
@@ -0,0 +1,18 @@
+package gtPlusPlus.core.util.minecraft;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+
+public class ClientUtils {
+
+	static {
+		if (FMLCommonHandler.instance().getSide() == Side.SERVER) {
+			Logger.ERROR("Something tried to access the ClientUtils class from the Server Side.");
+			Logger.ERROR("Soft crashing to prevent data corruption.");	
+			CORE.crash();
+		}
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 88fdda555c..cb490203df 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -47,6 +47,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
+import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
@@ -1083,6 +1084,14 @@ public class ItemUtils {
 
 
 	}
+	
+	public static String getFluidName(FluidStack aFluid) {
+		return aFluid != null ? aFluid.getFluid().getLocalizedName(aFluid) : "NULL";
+	}
+	
+	public static String getFluidName(Fluid aFluid) {
+		return aFluid != null ? aFluid.getLocalizedName() : "NULL";
+	}
 
 	public static String getItemName(ItemStack aStack) {
 		if (aStack == null) {
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/LangUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/LangUtils.java
new file mode 100644
index 0000000000..1de4209bf9
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/util/minecraft/LangUtils.java
@@ -0,0 +1,51 @@
+package gtPlusPlus.core.util.minecraft;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
+public class LangUtils {
+
+
+	public static boolean rewriteEntryForLanguageRegistry(String aKey, String aNewValue){
+		return rewriteEntryForLanguageRegistry("en_US", aKey, aNewValue);
+	}
+	
+	@SuppressWarnings("unchecked")
+	public static boolean rewriteEntryForLanguageRegistry(String aLang, String aKey, String aNewValue){
+		LanguageRegistry aInstance = LanguageRegistry.instance();
+		Field aModLanguageData = ReflectionUtils.getField(LanguageRegistry.class, "modLanguageData");
+		if (aModLanguageData != null){
+			Map<String,Properties> aProps = new HashMap<String, Properties>();
+			Object aInstanceProps;
+			try {
+				aInstanceProps = aModLanguageData.get(aInstance);
+				if (aInstanceProps != null){
+					aProps = (Map<String, Properties>) aInstanceProps;
+					Properties aLangProps = aProps.get(aLang);
+					if (aLangProps != null){
+						if (aLangProps.containsKey(aKey)) {
+							aLangProps.remove(aKey);
+							aLangProps.put(aKey, aNewValue);
+						}
+						else {
+							aLangProps.put(aKey, aNewValue);
+						}
+						aProps.remove(aLang);
+						aProps.put(aLang, aLangProps);
+						ReflectionUtils.setField(aInstance, aModLanguageData, aProps);
+					}
+				}
+			}
+			catch (IllegalArgumentException | IllegalAccessException e) {
+				
+			}
+		}
+		return false;
+	}
+	
+}