+ Added an assembly recipe for tier 1 Round Robinators.

+ Added localization for Rotor Housing achievement.
+ Added the Algae Farm (WIP).
- Removed Durability bar on Iridium Rotors.
- Reverted 2A hatch fix on Multiblocks.
% Adjusted all Robinator recipes, removing the fluid requirements.
$ Fixed Robinators Crashing on Servers.
$ Implemented new backend for all future non-GT tile entities.

20 files changed, 1093 insertions, 278 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java b/src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java
new file mode 100644
index 0000000000..8c76513d09
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java
@@ -0,0 +1,62 @@
+package gtPlusPlus.api.objects.minecraft;
+
+import gtPlusPlus.api.objects.data.AutoMap;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class CubicObject<T> {
+
+	public final T NORTH;
+	public final T SOUTH;
+
+	public final T WEST;
+	public final T EAST;
+
+	public final T UP;
+	public final T DOWN;	
+	
+	public CubicObject(AutoMap<T> aDataSet) {
+		this(aDataSet.get(0), aDataSet.get(1), aDataSet.get(2), aDataSet.get(3), aDataSet.get(4), aDataSet.get(5));
+	}
+	
+	public CubicObject(T[] aDataSet) {
+		this(aDataSet[0], aDataSet[1], aDataSet[2], aDataSet[3], aDataSet[4], aDataSet[5]);
+	}
+
+	public CubicObject(T aDOWN, T aUP, T aNORTH, T aSOUTH, T aWEST, T aEAST) {
+		DOWN = aDOWN;
+		UP = aUP;
+		NORTH = aNORTH;
+		SOUTH = aSOUTH;
+		WEST = aWEST;
+		EAST = aEAST;
+	}
+
+	public T get(int aSide) {
+		return get(ForgeDirection.getOrientation(aSide));
+	}
+
+	public T get(ForgeDirection aSide) {
+		if (aSide == ForgeDirection.DOWN) {
+			return DOWN;
+		}
+		else if (aSide == ForgeDirection.UP) {
+			return UP;
+		}
+		else if (aSide == ForgeDirection.NORTH) {
+			return NORTH;
+		}
+		else if (aSide == ForgeDirection.SOUTH) {
+			return SOUTH;
+		}
+		else if (aSide == ForgeDirection.WEST) {
+			return WEST;
+		}
+		else if (aSide == ForgeDirection.EAST) {
+			return EAST;
+		}
+		else {
+			return null;
+		}
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java b/src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
new file mode 100644
index 0000000000..7c418b5a77
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
@@ -0,0 +1,64 @@
+package gtPlusPlus.api.objects.minecraft;
+
+import java.util.HashMap;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.GregTech_API;
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.util.IIcon;
+
+/**
+ * A Server Side safe object that can hold {@link IIcon}s.
+ * @author Alkalus
+ *
+ */
+public class SafeTexture implements Runnable {	
+
+	@SideOnly(Side.CLIENT)
+	private static final HashMap<Integer, IIcon> mHashToIconCache = new HashMap<Integer, IIcon>();
+	
+	@SideOnly(Side.CLIENT)
+	private static final HashMap<String, Integer> mPathToHashCash = new HashMap<String, Integer>();
+	
+	private static final HashMap<String, SafeTexture> mTextureObjectCache = new HashMap<String, SafeTexture>();	
+	
+	private final int mHash;
+	
+	private final String mTextureName;
+	
+	private final static String getKey(String aTexPath) {
+		String aNameKey = Utils.sanitizeString(aTexPath);
+		aNameKey = aNameKey.replace('/', ' ');
+		aNameKey = aNameKey.toLowerCase();
+		return aNameKey;
+	}
+	
+	public static SafeTexture register(String aTexturePath) {
+		String aNameKey = getKey(aTexturePath);
+		SafeTexture g = mTextureObjectCache.get(aNameKey);
+		if (g == null) {
+			g = new SafeTexture(aTexturePath);			
+			mTextureObjectCache.put(aNameKey, g);			
+			mPathToHashCash.put(aTexturePath, aTexturePath.hashCode());			
+		}	
+		return g;
+	}
+	
+	private SafeTexture(String aTexturePath) {
+		mTextureName = aTexturePath;
+		mHash = getKey(aTexturePath).hashCode();
+		GregTech_API.sGTBlockIconload.add(this);
+	}
+
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon() {
+		return mHashToIconCache.get(mHash);
+	}
+
+	@Override
+	public void run() {
+		mHashToIconCache.put(getKey(mTextureName).hashCode(), GregTech_API.sBlockIcons.registerIcon(mTextureName));	
+	}
+	
+}
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/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/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/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 ea7f5e4ef7..cac54cec4e 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1584,10 +1584,10 @@ public class RECIPES_GREGTECH {
 			
 			// Supreme Pizza Gloves
 			CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
-					ItemUtils.getGregtechCircuit(17),
-					ItemUtils.getSimpleStack(ModItems.itemRope, 16),
+					ItemUtils.getGregtechCircuit(19),
+					ItemUtils.getSimpleStack(ModItems.itemRope, GTNH ? 32 : 16),
 					ItemUtils.getItemStackOfAmountFromOreDict("gearGtSmallWroughtIron", GTNH ? 8 : 4),
-					ItemUtils.getItemStackOfAmountFromOreDict("wireFineTin", GTNH ? 32 : 16),
+					ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", GTNH ? 32 : 16),
 					ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), GTNH ? 2 : 1)			
 			},
 					FluidUtils.getFluidStack("molten.rubber", 2000),
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index c0a4a998e8..f5bd390aee 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -2331,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;
@@ -2345,7 +2356,7 @@ public class RECIPES_Machines {
 
 			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/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/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 3ea2851a85..3fc6d9d667 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -228,6 +228,9 @@ public enum GregtechItemList implements GregtechItemContainer {
 	//Fish Pond
 	Industrial_FishingPond,
 	Casing_FishPond,  
+	
+	//Algae
+	AlgaeFarm_Controller,
 
 
 	//GT4 autoCrafter
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index e5d7f58dc6..ece8dfaa87 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -474,7 +474,7 @@ GT_MetaTileEntity_MultiBlockBase {
 	public boolean canBufferOutputs(final GT_Recipe aRecipe, int aParallelRecipes) {
 
 		Logger.INFO("Determining if we have space to buffer outputs.");
-		
+
 		// Null recipe or a recipe with lots of outputs? 
 		// E.G. Gendustry custom comb with a billion centrifuge outputs? 
 		// Do it anyway.
@@ -736,7 +736,7 @@ GT_MetaTileEntity_MultiBlockBase {
 								// Check next fluid
 								continue aFluidMatch;
 							}
-							
+
 						}
 						else {
 							continue aFluidMatch;
@@ -744,14 +744,14 @@ GT_MetaTileEntity_MultiBlockBase {
 					}					
 				}
 			}
-			
+
 			for (Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer> aFreeHatchCheck : aOutputHatches) {
 				// Free Hatch
 				if (aFreeHatchCheck.getValue_2() == null || aFreeHatchCheck.getValue_3() == 0 || aFreeHatchCheck.getValue_1().getFluid() == null) {
 					aEmptyFluidHatches++;
 				}
 			}
-			
+
 			// We have Fluid Stacks we did not merge. Do we have space?
 			if (aOutputFluids.size() > 0) {
 				// Not enough space to add fluids.
@@ -760,7 +760,7 @@ GT_MetaTileEntity_MultiBlockBase {
 					return false;
 				}
 			}
-			
+
 			/*
 			 * End Fluid Management
 			 */			
@@ -978,41 +978,22 @@ GT_MetaTileEntity_MultiBlockBase {
 			ItemStack[] aItemInputs, FluidStack[] aFluidInputs,
 			int aMaxParallelRecipes, int aEUPercent,
 			int aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe) {
-		// Based on the Processing Array. A bit overkill, but very flexible.	
-
-		
+		// Based on the Processing Array. A bit overkill, but very flexible.		
 
 		// Reset outputs and progress stats
 		this.mEUt = 0;
 		this.mMaxProgresstime = 0;
 		this.mOutputItems = new ItemStack[]{};
 		this.mOutputFluids = new FluidStack[]{};
-		
-		
-		
-		// Get input Voltage
+
 		long tVoltage = getMaxInputVoltage();
-		
-		// Get total Amps available to this multiblock
-		long tAmpsIn = 0;
-		for (GT_MetaTileEntity_Hatch_Energy aHatch : this.mEnergyHatches) {
-			tAmpsIn += aHatch.maxAmperesIn();
-		}
-		
-		// How much voltage can actually go in
-		long tEffectiveVoltage = tVoltage * tAmpsIn;
-
-		byte tTierInputVoltage = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
-		byte tTier = (byte) Math.max(1, GT_Utility.getTier(tEffectiveVoltage));
+		byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
 		log("Running checkRecipeGeneric(0)");
 
-		log("Amps: "+tAmpsIn);
-		log("Input Voltage: "+tVoltage+", Tier: "+tTierInputVoltage);
-		log("Effective Voltage: "+tEffectiveVoltage+", Effective Tier: "+tTier);	
 
 		GT_Recipe tRecipe = findRecipe(
 				getBaseMetaTileEntity(), mLastRecipe, false,
-				gregtech.api.enums.GT_Values.V[tTierInputVoltage], aFluidInputs, aItemInputs);
+				gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs);
 
 		log("Running checkRecipeGeneric(1)");
 		// Remember last recipe - an optimization for findRecipe()
@@ -1024,8 +1005,7 @@ GT_MetaTileEntity_MultiBlockBase {
 		}
 
 		if (!this.canBufferOutputs(tRecipe, aMaxParallelRecipes)) {
-			log("BAD RETURN - 2"); // TODO
-			Logger.INFO("No Output Space.");
+			log("BAD RETURN - 2");
 			return false;
 		}
 
@@ -1041,12 +1021,12 @@ GT_MetaTileEntity_MultiBlockBase {
 		log("tVoltage: "+tVoltage);
 		log("tRecipeEUt: "+tRecipeEUt);
 		// Count recipes to do in parallel, consuming input items and fluids and considering input voltage limits
-		for (; parallelRecipes < aMaxParallelRecipes && tTotalEUt < (tEffectiveVoltage - tRecipeEUt); parallelRecipes++) {
+		for (; parallelRecipes < aMaxParallelRecipes && tTotalEUt < (tVoltage - tRecipeEUt); parallelRecipes++) {
 			if (!tRecipe.isRecipeInputEqual(true, aFluidInputs, aItemInputs)) {
 				log("Broke at "+parallelRecipes+".");
 				break;
 			}
-			log("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+". Can use "+tEffectiveVoltage);
+			log("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+".");
 			tTotalEUt += tRecipeEUt;
 		}
 
@@ -1058,6 +1038,7 @@ GT_MetaTileEntity_MultiBlockBase {
 		// -- Try not to fail after this point - inputs have already been consumed! --
 
 
+
 		// Convert speed bonus to duration multiplier
 		// e.g. 100% speed bonus = 200% speed = 100%/200% = 50% recipe duration.
 		aSpeedBonusPercent = Math.max(-99, aSpeedBonusPercent);
@@ -1071,10 +1052,10 @@ GT_MetaTileEntity_MultiBlockBase {
 
 		// Overclock
 		if (this.mEUt <= 16) {
-			this.mEUt = (this.mEUt * (1 << tTierInputVoltage - 1) * (1 << tTierInputVoltage - 1));
-			this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTierInputVoltage - 1));
+			this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1));
+			this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1));
 		} else {
-			while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTierInputVoltage - 1)]) {
+			while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) {
 				this.mEUt *= 4;
 				this.mMaxProgresstime /= 2;
 			}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
new file mode 100644
index 0000000000..332c46dc3e
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
@@ -0,0 +1,128 @@
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.algae;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.TAE;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Recipe;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase {
+
+	private int mLevel = 0;
+
+	public GregtechMTE_AlgaePondBase(final int aID, final String aName, final String aNameRegional) {
+		super(aID, aName, aNameRegional);
+	}
+
+	public GregtechMTE_AlgaePondBase(final String aName) {
+		super(aName);
+	}
+
+	@Override
+	public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
+		return new GregtechMTE_AlgaePondBase(this.mName);
+	}
+
+	@Override
+	public String getMachineType() {
+		return "Algae Pond";
+	}
+
+	@Override
+	public String[] getTooltip() {
+		return new String[]{
+				"Grows Algae!",
+				"Controller Block for the Algae Farm",
+				"Size: 3x3x3 (Hollow)",
+				"Controller (front middle)",
+				"1x Input Hatch",
+				"1x Output Hatch",
+				"1x Input Bus",
+				"1x Output Bus"
+		};
+	}
+
+	@Override
+	public String getSound() {
+		return GregTech_API.sSoundList.get(Integer.valueOf(207));
+	}
+
+	@Override
+	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+		if (aSide == aFacing) {
+			return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(1)], new GT_RenderedTexture(aActive ? TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active : TexturesGtBlock.Overlay_Machine_Controller_Advanced)};
+		}
+		return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(1)]};
+	}
+
+	@Override
+	public boolean hasSlotInGUI() {
+		return true;
+	}
+
+	@Override
+	public GT_Recipe.GT_Recipe_Map getRecipeMap() {
+		return null;
+	}
+
+	@Override
+	public boolean isFacingValid(final byte aFacing) {
+		return aFacing > 1;
+	}
+
+	@Override
+	public boolean checkRecipe(final ItemStack aStack) {
+		return checkRecipeGeneric(getMaxParallelRecipes(), getEuDiscountForParallelism(), 0);
+	}
+
+	@Override
+	public int getMaxParallelRecipes() {
+		return this.mLevel * 10;
+	}
+
+	@Override
+	public int getEuDiscountForParallelism() {
+		return 0;
+	}
+
+	@Override
+	public boolean checkMultiblock(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {
+		final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
+		final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
+		this.mLevel = 0;
+		return true;
+	}
+
+	@Override
+	public int getMaxEfficiency(final ItemStack aStack) {
+		return 10000;
+	}
+
+	@Override
+	public int getPollutionPerTick(final ItemStack aStack) {
+		return 0;
+	}
+
+	@Override
+	public int getAmountOfOutputs() {
+		return 1;
+	}
+
+	@Override
+	public boolean explodesOnComponentBreak(final ItemStack aStack) {
+		return false;
+	}
+
+	@Override
+	public String getCustomGUIResourceName() {
+		return null;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java
new file mode 100644
index 0000000000..57a726f7e8
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java
@@ -0,0 +1,24 @@
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.algae.GregtechMTE_AlgaePondBase;
+
+public class GregtechAlgaeContent {
+
+	public static void run() {
+		if (LoadedMods.Gregtech) {
+			Logger.INFO("Gregtech5u Content | Registering Algae Content.");
+			run1();
+		}
+	}
+
+	private static void run1() {
+		// Industrial Centrifuge Multiblock
+		GregtechItemList.AlgaeFarm_Controller.set(
+				new GregtechMTE_AlgaePondBase(997,	"algaefarm.controller.tier.single", "Algae Farm").getStackForm(1L));
+
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java b/src/Java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java
new file mode 100644
index 0000000000..e433396a1b
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java
@@ -0,0 +1,274 @@
+package gtPlusPlus.xmod.ic2.item;
+
+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.core.lib.LoadedMods;
+import ic2.api.item.IKineticRotor;
+import ic2.core.IC2;
+import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
+import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+public class CustomKineticRotor extends Item implements IKineticRotor {
+
+	private final int mTier;
+	
+	@SideOnly(Side.CLIENT)
+	private final IIcon[] mTextures = new IIcon[6];
+	
+	private static final String[] mRegistrationNames = new String[] {
+			"itemwoodrotor", "itemironrotor", "itemsteelrotor", "itemwcarbonrotor"
+	};
+	
+	private static final String[] mUnlocalNames = new String[] {
+			"itemEnergeticRotor",
+			"itemTungstenSteelRotor",
+			"itemVibrantRotor",
+			"itemIridiumRotor",
+			"itemMagnaliumRotor",
+			"itemUltimetRotor",			
+	};
+	private static final int[] mMaxDurability = new int[] {
+			512000, 809600, 1600000, 3200000
+	};
+	private static final int[] mRadius = new int[] {
+			9, 11, 13, 15
+	};
+	private static final float[] mEfficiency = new float[] {
+			0.9f, 1.0f, 1.2f, 1.5f
+	};
+	private static final int[] mMinWindStrength = new int[] {
+			12, 14, 16, 18
+	};
+	private static final int[] mMaxWindStrength = new int[] {
+			80, 120, 160, 320
+	};
+	
+	private static final ResourceLocation[] mResourceLocations = new ResourceLocation[] {
+			new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png"),
+			new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png"),
+			new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorVibrantModel.png"),
+			new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png"),
+			new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorMagnaliumModel.png"),
+			new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorUltimetModel.png"),
+	};	
+
+	private final int maxWindStrength;
+	private final int minWindStrength;
+	private final int radius;
+	private final float efficiency;
+	private final ResourceLocation renderTexture;
+	
+	public CustomKineticRotor(int aTier) {
+		mTier = aTier;
+		this.setMaxStackSize(1);
+		// Handle Differences if EIO is not loaded
+		if (!LoadedMods.EnderIO && (aTier == 0 || aTier == 2)) {
+			this.renderTexture = mResourceLocations[(aTier == 0 ? 4 : 5)];	
+			this.setUnlocalizedName(mUnlocalNames[(aTier == 0 ? 4 : 5)]);		
+		}
+		else {
+			this.renderTexture = mResourceLocations[aTier];
+			this.setUnlocalizedName(mUnlocalNames[aTier]);
+		}	
+		this.setMaxDamage(mMaxDurability[aTier]);
+		this.radius = mRadius[aTier];
+		this.efficiency = mEfficiency[aTier];
+		this.minWindStrength = mMinWindStrength[aTier];
+		this.maxWindStrength = mMaxWindStrength[aTier];
+		this.setNoRepair();
+		this.setCreativeTab(IC2.tabIC2);
+		GameRegistry.registerItem(this, mRegistrationNames[aTier]);	
+	}
+	
+	@Override
+	public void setDamage(final ItemStack stack, final int damage) {
+		if (mTier < 3) {
+			super.setDamage(stack, damage);
+		}
+	}
+
+	@Override
+	public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) {
+
+		info.add(StatCollector.translateToLocalFormatted("ic2.itemrotor.wind.info",	new Object[]{this.minWindStrength, this.maxWindStrength}));
+		
+		GearboxType type = null;
+		if (Minecraft.getMinecraft().currentScreen != null && Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator) {
+			type = GearboxType.WATER;
+		} 
+		else if (Minecraft.getMinecraft().currentScreen != null	&& Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator) {
+			type = GearboxType.WIND;
+		}
+		
+		if (type != null) {
+			info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + this.isAcceptedType(itemStack, type)));
+		}
+		
+	}
+
+	@Override
+	public int getDiameter(final ItemStack stack)
+	{
+		return this.radius;
+	}
+
+	@Override
+	public ResourceLocation getRotorRenderTexture(final ItemStack stack)
+	{
+		return this.renderTexture;
+	}
+
+	@Override
+	public float getEfficiency(final ItemStack stack)
+	{
+		return this.efficiency;
+	}
+
+	@Override
+	public int getMinWindStrength(final ItemStack stack)
+	{
+		return this.minWindStrength;
+	}
+
+	@Override
+	public int getMaxWindStrength(final ItemStack stack)
+	{
+		return this.maxWindStrength;
+	}
+
+	@Override
+	public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type){
+		return (type == IKineticRotor.GearboxType.WIND) || (type == IKineticRotor.GearboxType.WATER);
+	}
+
+	public String getUnlocalizedName() {
+		return "ic2." + super.getUnlocalizedName().substring(5);
+	}
+
+	public String getUnlocalizedName(ItemStack itemStack) {
+		return this.getUnlocalizedName();
+	}
+
+	public String getItemStackDisplayName(ItemStack itemStack) {
+		return StatCollector.translateToLocal(this.getUnlocalizedName(itemStack));
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return mTier < 3;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconFromDamage(int meta) {		
+		if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+			if (mTier == 0) {
+				return mTextures[4];				
+			}
+			else {
+				return mTextures[5];				
+			}
+		}
+		else {
+			return mTextures[mTier];
+		}
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconIndex(ItemStack aIndex) {
+		if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+			if (mTier == 0) {
+				return mTextures[4];				
+			}
+			else {
+				return mTextures[5];				
+			}
+		}
+		else {
+			return mTextures[mTier];
+		}
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconFromDamageForRenderPass(int aDmg, int aPass) {
+		if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+			if (mTier == 0) {
+				return mTextures[4];				
+			}
+			else {
+				return mTextures[5];				
+			}
+		}
+		else {
+			return mTextures[mTier];
+		}
+	}
+
+	@Override
+	protected String getIconString() {
+		return super.getIconString();
+	}
+
+	@Override
+	public int getDisplayDamage(ItemStack stack) {
+		return super.getDisplayDamage(stack);
+	}
+
+	@Override
+	public double getDurabilityForDisplay(ItemStack stack) {
+		return super.getDurabilityForDisplay(stack);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
+		if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+			if (mTier == 0) {
+				return mTextures[4];				
+			}
+			else {
+				return mTextures[5];				
+			}
+		}
+		else {
+			return mTextures[mTier];
+		}		
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(ItemStack stack, int pass) {
+		if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+			if (mTier == 0) {
+				return mTextures[4];				
+			}
+			else {
+				return mTextures[5];				
+			}
+		}
+		else {
+			return mTextures[mTier];
+		}
+	}
+
+	@Override
+	public void registerIcons(IIconRegister iconRegister) {		
+		int aIndex = 0;
+		for (String y : mUnlocalNames) {
+			mTextures[aIndex++] = iconRegister.registerIcon(IC2.textureDomain + ":" + "rotors/" + y);		
+		}		
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
index 64aa7f99bf..862ba38748 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
@@ -1,13 +1,9 @@
 package gtPlusPlus.xmod.ic2.item;
 
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.CoreItem;
 import gtPlusPlus.core.lib.LoadedMods;
-import ic2.core.IC2;
-import ic2.core.init.InternalName;
+import net.minecraft.item.ItemStack;
 
 public class IC2_Items {
 
@@ -29,45 +25,33 @@ public class IC2_Items {
 	public static ItemStack blockRTG;
 	public static ItemStack blockKineticGenerator;
 
-	public static void register(){
+	private static final String[] mData1 = new String[] {"itemEnergeticRotorBlade", "itemMagnaliumRotorBlade"};
+	private static final String[] mData2 = new String[] {"itemEnergeticShaft", "itemMagnaliumShaft"};
+	private static final String[] mData3 = new String[] {"itemVibrantRotorBlade", "itemUltimetRotorBlade"};
+	private static final String[] mData4 = new String[] {"itemVibrantShaft", "itemUltimetShaft"};
+	
 
-		if(LoadedMods.EnderIO){
-			//Tier 1
-			rotor_Blade_Material_1 = new ItemStack (new CoreItem("itemEnergeticRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			shaft_Material_1 = new ItemStack (new CoreItem("itemEnergeticShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			rotor_Material_1 = new ItemStack (new RotorBase(InternalName.itemwoodrotor, 9, 512000, 0.9F, 12, 80, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemEnergeticRotor"));
-			//Tier 2
-			rotor_Blade_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			shaft_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			rotor_Material_2 = new ItemStack (new RotorBase(InternalName.itemironrotor, 11, 809600, 1.0F, 14, 120, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemTungstenSteelRotor"));
-			//Tier 3
-			rotor_Blade_Material_3 = new ItemStack (new CoreItem("itemVibrantRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			shaft_Material_3 = new ItemStack (new CoreItem("itemVibrantShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			rotor_Material_3 = new ItemStack (new RotorBase(InternalName.itemsteelrotor, 13, 1600000, 1.2F, 16, 160, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorVibrantModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemVibrantRotor"));
-			//Tier 4
-			rotor_Blade_Material_4 = new ItemStack (new CoreItem("itemIridiumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			shaft_Material_4 = new ItemStack (new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			rotor_Material_4 = new ItemStack (new RotorIridium(InternalName.itemwcarbonrotor, 15, 3200000, 1.5F, 18, 320, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemIridiumRotor"));
+	public static void register(){
 
-		}
-		else {
-			//Tier 1 - Magnalium
-			rotor_Blade_Material_1 = new ItemStack (new CoreItem("itemMagnaliumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			shaft_Material_1 = new ItemStack (new CoreItem("itemMagnaliumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			rotor_Material_1 = new ItemStack (new RotorBase(InternalName.itemwoodrotor, 9, 512000, 0.9F, 12, 80, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorMagnaliumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemMagnaliumRotor"));
-			//Tier 2
-			rotor_Blade_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			shaft_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			rotor_Material_2 = new ItemStack (new RotorBase(InternalName.itemironrotor, 11, 809600, 1.0F, 14, 120, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemTungstenSteelRotor"));
-			//Tier 3 - Ultimet
-			rotor_Blade_Material_3 = new ItemStack (new CoreItem("itemUltimetRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			shaft_Material_3 = new ItemStack (new CoreItem("itemUltimetShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			rotor_Material_3 = new ItemStack (new RotorBase(InternalName.itemsteelrotor, 13, 1600000, 1.2F, 16, 160, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorUltimetModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemUltimetRotor"));
-			//Tier 4
-			rotor_Blade_Material_4 = new ItemStack (new CoreItem("itemIridiumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			shaft_Material_4 = new ItemStack (new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			rotor_Material_4 = new ItemStack (new RotorIridium(InternalName.itemwcarbonrotor, 15, 3200000, 1.5F, 18, 320, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemIridiumRotor"));
-		}
+		int aIndexEIO = (LoadedMods.EnderIO ? 0 : 1);		
+		
+		// Rotor Blades
+		rotor_Blade_Material_1 = new ItemStack (new CoreItem(mData1[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		rotor_Blade_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		rotor_Blade_Material_3 = new ItemStack (new CoreItem(mData3[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		rotor_Blade_Material_4 = new ItemStack (new CoreItem("itemIridiumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		
+		// Rotor Shafts
+		shaft_Material_1 = new ItemStack (new CoreItem(mData2[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		shaft_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		shaft_Material_3 = new ItemStack (new CoreItem(mData4[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		shaft_Material_4 = new ItemStack (new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+				
+		// Rotors
+		rotor_Material_1 = new ItemStack (new CustomKineticRotor(0));
+		rotor_Material_2 = new ItemStack (new CustomKineticRotor(1));
+		rotor_Material_3 = new ItemStack (new CustomKineticRotor(2));
+		rotor_Material_4 = new ItemStack (new CustomKineticRotor(3));
 
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java b/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
index aca1c6a310..b9dffbd371 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
@@ -118,5 +118,10 @@ public class RotorIridium extends RotorBase{
 		this.setCustomDamage(stack, this.getCustomDamage(stack) + damage);
 		return true;
 	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
 }