+ Added Round-Robinator recipes.

% Adjusted Zirconium Carbide tier, and changed the materials used for LV tiered recipes.
% Finished work on the Round-Robinator logic.
$ Removed PSS log spam.
$ Many minor bug fixes.

34 files changed, 1113 insertions, 287 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
index 3583a04a74..9e7f702200 100644
--- a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
+++ b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
@@ -212,11 +212,12 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
 
 	@Override
 	public boolean retainAll(Collection<?> c) {
-		AutoMap<?> aTempAllocation = new AutoMap();
+		AutoMap<?> aTempAllocation = new AutoMap<Object>();
 		boolean aTrue = false;
 		aTempAllocation = this;
-		aTempAllocation.removeAll(c);		
-		aTrue = this.removeAll(aTempAllocation);
+		aTempAllocation.removeAll(c);	
+		aTempAllocation.clear();
+		aTrue = aTempAllocation.isEmpty();
 		aTempAllocation.clear();
 		return aTrue;
 	}
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
index 7c11e7232b..ab359c3853 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
@@ -19,7 +19,7 @@ public class BlockPos implements Serializable{
 	public final int yPos;
 	public final int zPos;
 	public final int dim;
-	public final World world;
+	public final transient World world;
 	
 	public static BlockPos generateBlockPos(String sUUID) {
 		String[] s2 = sUUID.split("@");
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java
index d0c1f3f040..d5db8081dc 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java
@@ -12,7 +12,7 @@ import net.minecraftforge.common.DimensionManager;
 public class FakeBlockPos extends BlockPos {
 
 	private static final long serialVersionUID = -6442245826092414593L;
-	private Block aBlockAtPos;
+	private transient Block aBlockAtPos;
 	private int aBlockMetaAtPos = 0;
 	
 	public static FakeBlockPos generateBlockPos(String sUUID) {
diff --git a/src/Java/gtPlusPlus/api/objects/random/XSTR.java b/src/Java/gtPlusPlus/api/objects/random/XSTR.java
index 6357e9895c..6ce1cbeb6c 100644
--- a/src/Java/gtPlusPlus/api/objects/random/XSTR.java
+++ b/src/Java/gtPlusPlus/api/objects/random/XSTR.java
@@ -115,6 +115,13 @@ public class XSTR extends Random implements Cloneable {
 	 */
 	@Override
 	public XSTR clone() {
+		try {
+			super.clone();
+		}
+		catch (CloneNotSupportedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 		return new XSTR(this.getSeed());
 	}
 
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java b/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
index 71814cb868..8ba7c2533b 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
@@ -1,14 +1,25 @@
 package gtPlusPlus.core.block.machine;
 
+import java.util.List;
+
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+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;
@@ -19,24 +30,12 @@ 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.machines.TileEntityRoundRobinator;
-import gtPlusPlus.core.util.minecraft.InventoryUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-
 public class Machine_RoundRobinator extends BlockContainer implements ITileTooltip
 {
 	@SideOnly(Side.CLIENT)
-	private IIcon textureTop;
-	@SideOnly(Side.CLIENT)
-	private IIcon textureBottom;
+	private IIcon[] textureTop = new IIcon[5];
 	@SideOnly(Side.CLIENT)
-	private IIcon textureFront;
+	private IIcon[] textureFront = new IIcon[5];
 
 	/**
 	 * Determines which tooltip is displayed within the itemblock.
@@ -55,8 +54,8 @@ public class Machine_RoundRobinator extends BlockContainer implements ITileToolt
 		this.setResistance(1f);
 		this.setBlockName("blockRoundRobinator");
 		this.setCreativeTab(AddToCreativeTab.tabMachines);
-		GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockRoundRobinator");
-		LanguageRegistry.addName(this, "Round-Robinator");
+		GameRegistry.registerBlock(this, ItemBlockRoundRobinator.class, "blockRoundRobinator");
+		//LanguageRegistry.addName(this, "Round-Robinator");
 
 	}
 
@@ -65,19 +64,23 @@ public class Machine_RoundRobinator extends BlockContainer implements ITileToolt
 	 */
 	@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));
+	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 + ":" + "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");
+	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);			
+		}		
 	}
 
 	/**
@@ -109,16 +112,14 @@ public class Machine_RoundRobinator extends BlockContainer implements ITileToolt
 			if (!mDidScrewDriver) {
 				final TileEntity te = world.getTileEntity(x, y, z);
 				if ((te != null) && (te instanceof TileEntityRoundRobinator)){
-					player.openGui(GTplusplus.instance, GuiHandler.GUI16, world, x, y, z);
-					return true;
+					return ((TileEntityRoundRobinator) te).onRightClick((byte) side, player, x, y, z);
 				}
+				return false;
 			}
 			else {
 				return true;
-			}
-		
+			}		
 		}
-		return false;
 	}
 
 	@Override
@@ -149,9 +150,7 @@ public class Machine_RoundRobinator extends BlockContainer implements ITileToolt
 
 	@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()) {
-			((TileEntityRoundRobinator) world.getTileEntity(x,y,z)).setCustomName(stack.getDisplayName());
-		}
+		super.onBlockPlacedBy(world, x, y, z, entity, stack);
 	}
 
 	@Override
@@ -159,4 +158,17 @@ public class Machine_RoundRobinator extends BlockContainer implements ITileToolt
 		return false;
 	}
 
+	@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));
+		}		
+	}
+
+	@Override
+	public IIcon getIcon(IBlockAccess aBlockAccess, int x, int y, int z, int aSide) {		
+		return super.getIcon(aBlockAccess, x, y, z, aSide);
+	}
+
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/container/Container_RoundRobinator.java b/src/Java/gtPlusPlus/core/container/Container_RoundRobinator.java
index ad2aef02f8..0da2933dfa 100644
--- a/src/Java/gtPlusPlus/core/container/Container_RoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/container/Container_RoundRobinator.java
@@ -1,39 +1,52 @@
 package gtPlusPlus.core.container;
 
+import java.util.Iterator;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.GT_Values;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.Inventory_RoundRobinator;
+import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.inventories.Inventory_RoundRobinator;
-import gtPlusPlus.core.slots.SlotIntegratedCircuit;
-import gtPlusPlus.core.slots.SlotNoInput;
-import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
 
 public class Container_RoundRobinator extends Container {
 
-	protected TileEntityRoundRobinator tile_entity;
+	public TileEntityRoundRobinator tile_entity;
 	public final Inventory_RoundRobinator inventoryChest;
 
 	private final World worldObj;
 	private final int posX;
 	private final int posY;
 	private final int posZ;
+	
+	private final boolean[] mActiveData = new boolean[] {false, false, false, false};
 
-	public static final int SLOT_OUTPUT = 25;
-
-	public static int StorageSlotNumber = 26; // Number of slots in storage area
-	public static int InventorySlotNumber = 36; // Inventory Slots (Inventory
+	public static int mStorageSlotNumber = 4; // Number of slots in storage area
+	public static int mInventorySlotNumber = 36; // Inventory Slots (Inventory
 												// and Hotbar)
-	public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
+	public static int mFullSlotNumber = mInventorySlotNumber + mStorageSlotNumber; // All
 																				// slots
 
 	public Container_RoundRobinator(final InventoryPlayer inventory, final TileEntityRoundRobinator te) {
 		this.tile_entity = te;
 		this.inventoryChest = te.getInventory();
+		boolean [] aTemp = te.getActiveSides();
+		if (aTemp != null && aTemp.length == 4) {
+			for (int i=0;i<4;i++) {
+				mActiveData[i] = aTemp[i];
+			}
+		}
 
 		int var6;
 		int var7;
@@ -54,44 +67,20 @@ public class Container_RoundRobinator extends Container {
 		}*/
 		
 		
-		int xStart = 8;
-		int yStart = 5;
+		int xStart = 134;
+		int yStart = 32;
 
 		try {
 		//0
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart, yStart));
-		//1-10
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+18, yStart));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+36, yStart));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+54, yStart));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+72, yStart));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+90, yStart));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+108, yStart));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+18, yStart+18));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+36, yStart+18));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+54, yStart+18));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+72, yStart+18));
-		//11-20
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+90, yStart+18));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+108, yStart+18));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+18, yStart+36));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+36, yStart+36));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+54, yStart+36));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+72, yStart+36));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+90, yStart+36));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+108, yStart+36));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+18, yStart+54));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+36, yStart+54));
-		//21-24
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+54, yStart+54));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+72, yStart+54));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+90, yStart+54));
-		this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart+108, yStart+54));
+		this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, xStart, yStart));
+		this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, xStart+18, yStart));
+		this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, xStart, yStart+17));
+		this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, xStart+18, yStart+17));		
 		Logger.INFO("2");
 		
 		//Add Output
-		this.addSlotToContainer(new SlotNoInput(this.inventoryChest, SLOT_OUTPUT, xStart+(8*18), yStart+54));
-		o++;
+		//this.addSlotToContainer(new SlotNoInput(this.inventoryChest, SLOT_OUTPUT, xStart+(8*18), yStart+54));
+		//o++;
 		Logger.INFO("3");
 
 		
@@ -112,6 +101,7 @@ public class Container_RoundRobinator extends Container {
 		Logger.INFO("4");
 		}
 		catch (Throwable t) {}
+		this.detectAndSendChanges();
 
 	}
 
@@ -121,10 +111,14 @@ public class Container_RoundRobinator extends Container {
 
 		if (!aPlayer.worldObj.isRemote) {
 			if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
-				// Utils.LOG_WARNING("??? - "+aSlotIndex);
+			}
+			else if (aSlotIndex < 4) {
+				this.tile_entity.toggleSide(aSlotIndex+2);				
+				Logger.INFO("Toggling side: "+(aSlotIndex+2)+" | Active: "+this.tile_entity.getSideActive(aSlotIndex+2)+" | Data:"+this.tile_entity.getDataString());
 			}
 		}
-		return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+		return GT_Values.NI;
+		//return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
 	}
 
 	@Override
@@ -140,51 +134,136 @@ public class Container_RoundRobinator extends Container {
 
 		return par1EntityPlayer.getDistanceSq(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D) <= 64D;
 	}
+	
 
-	@Override
-	public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) {
-		ItemStack var3 = null;
-		final Slot var4 = (Slot) this.inventorySlots.get(par2);
-
-		if ((var4 != null) && var4.getHasStack()) {
-			final ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
-
-			/*
-			 * if (par2 == 0) { if (!this.mergeItemStack(var5,
-			 * InOutputSlotNumber, FullSlotNumber, true)) { return null; }
-			 * 
-			 * var4.onSlotChange(var5, var3); } else if (par2 >=
-			 * InOutputSlotNumber && par2 < InventoryOutSlotNumber) { if
-			 * (!this.mergeItemStack(var5, InventoryOutSlotNumber,
-			 * FullSlotNumber, false)) { return null; } } else if (par2 >=
-			 * InventoryOutSlotNumber && par2 < FullSlotNumber) { if
-			 * (!this.mergeItemStack(var5, InOutputSlotNumber,
-			 * InventoryOutSlotNumber, false)) { return null; } } else if
-			 * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber,
-			 * false)) { return null; }
-			 */
-
-			if (var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
-			} else {
-				var4.onSlotChanged();
-			}
 
-			if (var5.stackSize == var3.stackSize) {
-				return null;
-			}
+	public final void addCraftingToCrafters(ICrafting par1ICrafting) {
+		try {
+			super.addCraftingToCrafters(par1ICrafting);
+		} catch (Throwable var3) {
+			
+		}
+	}
+
+	public final void removeCraftingFromCrafters(ICrafting par1ICrafting) {
+		try {
+			super.removeCraftingFromCrafters(par1ICrafting);
+		} catch (Throwable var3) {
+		}
+	}
 
-			var4.onPickupFromSlot(par1EntityPlayer, var5);
+	public final void detectAndSendChanges() {
+		try {
+			super.detectAndSendChanges();
+			detectAndSendChangesEx();
+		} catch (Throwable var2) {
 		}
+	}
 
-		return var3;
+	public final void updateProgressBar(int par1, int par2) {
+		try {
+			super.updateProgressBar(par1, par2);
+			updateProgressBarEx(par1, par2);
+		} catch (Throwable var4) {
+		}
 	}
+	
+
+	public int mSide_1 = 0;
+	public int mSide_2 = 0;
+	public int mSide_3 = 0;
+	public int mSide_4 = 0;	
+	public int mTier = 1;
+	public int mTickRate = 50;
+	
+	private int oSide_1 = 0;
+	private int oSide_2 = 0;
+	private int oSide_3 = 0;
+	private int oSide_4 = 0;	
+	private int oTier = 1;
+	private int oTickRate = 50;
+	
+	private int mTimer = 0;
+	
+	
+
+	public void detectAndSendChangesEx() {
+		super.detectAndSendChanges();
+		if (!this.tile_entity.getWorldObj().isRemote) {
+			boolean [] aTemp = tile_entity.getActiveSides();
+			for (int i=0;i<4;i++) {
+				mActiveData[i] = aTemp[i];
+			}			
+			this.mSide_1 = aTemp[0] ? 1 : 0;
+			this.mSide_2 = aTemp[1] ? 1 : 0;
+			this.mSide_3 = aTemp[2] ? 1 : 0;
+			this.mSide_4 = aTemp[3] ? 1 : 0;
+			this.mTier = this.tile_entity.getTier();
+			this.mTickRate = this.tile_entity.getTickRate();
+
+			String InventoryContents = ArrayUtils.toString(aTemp, "null");
+			//Logger.INFO("Test: "+InventoryContents);
+			++this.mTimer;
+			Iterator var2 = this.crafters.iterator();
+
+			while (true) {
+				ICrafting var1;
+				do {
+					if (!var2.hasNext()) {
+						this.oSide_1 = this.mSide_1;
+						this.oSide_2 = this.mSide_2;
+						this.oSide_3 = this.mSide_3;
+						this.oSide_4 = this.mSide_4;
+						this.oTier = this.mTier;
+						this.oTickRate = this.mTickRate;
+						return;
+					}
+					var1 = (ICrafting) var2.next();
+					if (this.mTimer % 500 == 10 || this.oSide_1 != this.mSide_1) {
+						var1.sendProgressBarUpdate(this, 2, this.mSide_1);
+					}
+					if (this.mTimer % 500 == 10 || this.oSide_2 != this.mSide_2) {
+						var1.sendProgressBarUpdate(this, 4, this.mSide_2);
+					}
+					if (this.mTimer % 500 == 10 || this.oSide_3 != this.mSide_3) {
+						var1.sendProgressBarUpdate(this, 6, this.mSide_3);
+					}
+					if (this.mTimer % 500 == 10 || this.oSide_4 != this.mSide_4) {
+						var1.sendProgressBarUpdate(this, 8, this.mSide_4);
+					}
+					if (this.mTimer % 500 == 10 || this.oTier != this.mTier) {
+						var1.sendProgressBarUpdate(this, 10, this.mTier);
+					}
+					if (this.mTimer % 500 == 10 || this.oTickRate != this.mTickRate) {
+						var1.sendProgressBarUpdate(this, 12, this.mTickRate);
+					}
+				} while (this.mTimer % 500 != 10);
+
+			}
+		}
+	}
+
+	@SideOnly(Side.CLIENT)
+	public void updateProgressBarEx(int par1, int par2) {
+		super.updateProgressBar(par1, par2);
+		switch (par1) {
+			case 2 :
+				this.mSide_1 = par2;
+				break;
+			case 4 :
+				this.mSide_2 = par2;
+				break;
+			case 6 :
+				this.mSide_3 = par2;			
+			case 8 :
+				this.mSide_4 = par2;		
+			case 10 :
+				this.mTier = par2;		
+			case 12 :
+				this.mTickRate = par2;
+				break;
+		}
 
-	// Can merge Slot
-	@Override
-	public boolean func_94530_a(final ItemStack p_94530_1_, final Slot p_94530_2_) {
-		return super.func_94530_a(p_94530_1_, p_94530_2_);
 	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java
index 7a9417c806..c5a8341d8a 100644
--- a/src/Java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java
@@ -1,29 +1,75 @@
 package gtPlusPlus.core.gui.machine;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
 import gtPlusPlus.core.container.Container_RoundRobinator;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 
 @SideOnly(Side.CLIENT)
 public class GUI_RoundRobinator extends GuiContainer {
 
 	private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(CORE.MODID, "textures/gui/RoundRobinator.png");
+	private TileEntityRoundRobinator mTile;
+	private Container_RoundRobinator mContainer;
+	private static final Method mDrawItemStack;
+	
+	static {
+		mDrawItemStack = ReflectionUtils.getMethod(GuiContainer.class, "drawItemStack", new Class[] {ItemStack.class, int.class, int.class, String.class});
+	}
 
 	public GUI_RoundRobinator(final InventoryPlayer player_inventory, final TileEntityRoundRobinator te){
-		super(new Container_RoundRobinator(player_inventory, te));
+		this(new Container_RoundRobinator(player_inventory, te));
+		mTile = te;
+	}
+	
+	private GUI_RoundRobinator(final Container_RoundRobinator aContainer){
+		super(aContainer);
+		mContainer = aContainer;
 	}
 
 	@Override
 	protected void drawGuiContainerForegroundLayer(final int i, final int j){
-		super.drawGuiContainerForegroundLayer(i, j);
+		super.drawGuiContainerForegroundLayer(i, j);		
+		
+		int xStart = 134;
+		int yStart = 31;
+		mTile = this.mContainer.tile_entity;
+		
+		int tier = mContainer.mTier;	
+		int aTickRate = mContainer.mTickRate;	
+		
+		fontRendererObj.drawString("Round Robinator", 85, 4, Utils.rgbtoHexValue(50, 150, 50));
+		fontRendererObj.drawString("Tier: "+tier, 85, 12, Utils.rgbtoHexValue(50, 150, 50));
+		fontRendererObj.drawString("Rate: 1 Item/"+aTickRate+"t", 85, 20, Utils.rgbtoHexValue(50, 150, 50));
+		
+		boolean[] aStates = new boolean[] {mContainer.mSide_1 == 0 ? false : true, mContainer.mSide_2 == 0 ? false : true, mContainer.mSide_3 == 0 ? false : true,mContainer.mSide_4 == 0 ? false : true};
+		
+		fontRendererObj.drawString("West: "+(aStates[0] ? "Active" : "Disabled"), 5, 5, Utils.rgbtoHexValue(50, 50, 50));
+		fontRendererObj.drawString("North: "+(aStates[1] ? "Active" : "Disabled"), 5, 15, Utils.rgbtoHexValue(50, 50, 50));
+		fontRendererObj.drawString("South: "+(aStates[2] ? "Active" : "Disabled"), 5, 25, Utils.rgbtoHexValue(50, 50, 50));
+		fontRendererObj.drawString("East: "+(aStates[3] ? "Active" : "Disabled"), 5, 35, Utils.rgbtoHexValue(50, 50, 50));
+		fontRendererObj.drawString("Toggling South will visually", 5, 65, Utils.rgbtoHexValue(150, 50, 50));
+		fontRendererObj.drawString("toggle East, This is a visual bug.", 5, 74, Utils.rgbtoHexValue(150, 50, 50));
+		drawStatus(aStates[0], xStart, yStart);
+		drawStatus(aStates[1], xStart+18, yStart);
+		drawStatus(aStates[2], xStart, yStart+18);
+		drawStatus(aStates[3], xStart+18, yStart+18);
+		
 	}
 
 	@Override
@@ -33,6 +79,34 @@ public class GUI_RoundRobinator extends GuiContainer {
 		final int x = (this.width - this.xSize) / 2;
 		final int y = (this.height - this.ySize) / 2;
 		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+		
+		
+		
+	}
+
+	private static ItemStack aGreenGlass;
+	private static ItemStack aRedGlass;
+	
+	private void drawStatus(boolean aStateActive, int x, int y) {
+		if (aGreenGlass == null) {
+			Item pane = ItemUtils.getSimpleStack(Blocks.stained_glass_pane).getItem();
+			aGreenGlass = ItemUtils.simpleMetaStack(pane, 5, 1);
+		}
+		if (aRedGlass == null) {
+			Item pane = ItemUtils.getSimpleStack(Blocks.stained_glass_pane).getItem();
+			aRedGlass = ItemUtils.simpleMetaStack(pane, 14, 1);
+		}
+		if (mDrawItemStack != null) {
+			try {
+				if (aStateActive) {
+					mDrawItemStack.invoke(this, new Object[]{aGreenGlass, x, y, ""});
+				}
+				else {
+					mDrawItemStack.invoke(this, new Object[]{aRedGlass, x, y, ""});
+				}
+			}
+			catch (Throwable t) {}
+		}
 	}
 
 	//This method is called when the Gui is first called!
diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
index 2141210650..e44c9a8f20 100644
--- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
@@ -2,16 +2,22 @@ package gtPlusPlus.core.handler;
 
 import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.World;
-
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
-import gtPlusPlus.core.container.*;
+import gtPlusPlus.core.container.Container_BackpackBase;
+import gtPlusPlus.core.container.Container_CircuitProgrammer;
+import gtPlusPlus.core.container.Container_DecayablesChest;
+import gtPlusPlus.core.container.Container_FishTrap;
+import gtPlusPlus.core.container.Container_Grindle;
+import gtPlusPlus.core.container.Container_ModularityTable;
+import gtPlusPlus.core.container.Container_PestKiller;
+import gtPlusPlus.core.container.Container_ProjectTable;
+import gtPlusPlus.core.container.Container_RoundRobinator;
+import gtPlusPlus.core.container.Container_SuperJukebox;
+import gtPlusPlus.core.container.Container_TradeTable;
+import gtPlusPlus.core.container.Container_Workbench;
+import gtPlusPlus.core.container.Container_WorkbenchAdvanced;
 import gtPlusPlus.core.container.box.LunchBoxContainer;
 import gtPlusPlus.core.container.box.MagicBagContainer;
 import gtPlusPlus.core.container.box.ToolBoxContainer;
@@ -22,20 +28,38 @@ import gtPlusPlus.core.gui.item.GuiBaseGrindle;
 import gtPlusPlus.core.gui.item.box.LunchBoxGui;
 import gtPlusPlus.core.gui.item.box.MagicBagGui;
 import gtPlusPlus.core.gui.item.box.ToolBoxGui;
-import gtPlusPlus.core.gui.machine.*;
+import gtPlusPlus.core.gui.machine.GUI_CircuitProgrammer;
+import gtPlusPlus.core.gui.machine.GUI_DecayablesChest;
+import gtPlusPlus.core.gui.machine.GUI_FishTrap;
+import gtPlusPlus.core.gui.machine.GUI_ModularityTable;
+import gtPlusPlus.core.gui.machine.GUI_PestKiller;
+import gtPlusPlus.core.gui.machine.GUI_ProjectTable;
+import gtPlusPlus.core.gui.machine.GUI_RoundRobinator;
+import gtPlusPlus.core.gui.machine.GUI_SuperJukebox;
+import gtPlusPlus.core.gui.machine.GUI_TradeTable;
+import gtPlusPlus.core.gui.machine.GUI_Workbench;
+import gtPlusPlus.core.gui.machine.GUI_WorkbenchAdvanced;
 import gtPlusPlus.core.interfaces.IGuiManager;
 import gtPlusPlus.core.inventories.BaseInventoryBackpack;
 import gtPlusPlus.core.inventories.BaseInventoryGrindle;
 import gtPlusPlus.core.inventories.box.LunchBoxInventory;
 import gtPlusPlus.core.inventories.box.MagicBagInventory;
 import gtPlusPlus.core.inventories.box.ToolBoxInventory;
-import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase;
-import gtPlusPlus.core.item.tool.misc.box.CustomBoxInventory;
 import gtPlusPlus.core.tileentities.base.TileEntityBase;
 import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
 import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
-import gtPlusPlus.core.tileentities.machines.*;
+import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
+import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
+import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
+import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
+import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
+import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
+import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.world.World;
 
 public class GuiHandler implements IGuiHandler {
 
diff --git a/src/Java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java b/src/Java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java
index 58d60b595f..a47f250c39 100644
--- a/src/Java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.core.inventories;
 
-import gtPlusPlus.core.recipe.common.CI;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
@@ -9,10 +8,10 @@ import net.minecraft.nbt.NBTTagList;
 
 public class Inventory_RoundRobinator implements IInventory{
 
-	private final String name = "Circuit Programmer";
+	private final String name = "Round Robinator";
 
 	/** Defining your inventory size this way is handy */
-	public static final int INV_SIZE = 26;
+	public static final int INV_SIZE = 4;
 
 	/** Inventory's size must be same as number of slots you add to the Container class */
 	private ItemStack[] inventory = new ItemStack[INV_SIZE];
@@ -167,7 +166,7 @@ public class Inventory_RoundRobinator implements IInventory{
 	 */
 	@Override
 	public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
-		return (itemstack.getItem() == CI.getNumberedCircuit(0).getItem());
+		return true;
 	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index 1b13d34495..9022f864cb 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -87,8 +87,7 @@ public class BaseItemDust extends BaseItemComponent {
 			else if (amount == 10) {
 				doesThings[0] = false;
 				doesThings[1] = true;
-				doesThings[2] = false;
-				
+				doesThings[2] = false;				
 			}
 			else if (amount == 100) {
 				doesThings[0] = false;
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index e1c3e179ee..e4fa06c58e 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -118,7 +118,7 @@ public class BaseItemDustUnique extends Item{
 
 	private String getCorrectTexture(final String pileSize){
 		if (!CORE.ConfigSwitches.useGregtechTextures){
-			if ((pileSize == "dust") || (pileSize == "Dust")){
+			if ((pileSize.equals("dust")) || (pileSize.equals("Dust"))){
 				this.setTextureName(CORE.MODID + ":" + "dust");}
 			else{
 				this.setTextureName(CORE.MODID + ":" + "dust"+pileSize);
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
index c52eb0d222..42890ddfa6 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
@@ -44,11 +44,7 @@ public class ItemBlockBasicTile extends ItemBlock {
 			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) { // Round-Robinator
-			list.add("Attempts to output items evenly on all four horizontal planes");
-			list.add("Each tier operates at a factor of one operation every (20/tier)ticks");
-			list.add("Top and bottom do not pull, so you must push item in");
-			list.add("Sides can be disabled with a screwdriver");
+		} else if (this.mID == 7) {
 		} else {
 			list.add("Bad Tooltip ID - " + mID);
 
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
new file mode 100644
index 0000000000..fa18d745fb
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
@@ -0,0 +1,111 @@
+package gtPlusPlus.core.item.base.itemblock;
+import java.util.List;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlockWithMetadata;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
+{
+	private final Block mBlock;
+
+	public ItemBlockRoundRobinator(final Block aBlock){
+		super(aBlock, aBlock);
+		this.mBlock = aBlock;
+		this.setMaxDamage(0);
+		this.setHasSubtypes(true);
+	}
+	
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		list.add("Attempts to output items evenly on all four horizontal planes");		
+		if (stack.getItemDamage() == 0) {
+			list.add("1 Item per enabled side every 400 ticks");			
+		}
+		else if (stack.getItemDamage() == 1) {
+			list.add("1 Item per enabled side every 100 ticks");			
+		}
+		else if (stack.getItemDamage() == 2) {
+			list.add("1 Item per enabled side every 20 ticks");			
+		}
+		else if (stack.getItemDamage() == 3) {
+			list.add("1 Item per enabled side every 10 ticks");			
+		}
+		else if (stack.getItemDamage() == 4) {
+			list.add("1 Item per enabled side every 1 ticks");			
+		}		
+		list.add("Top and bottom do not pull, so you must push item in");
+		list.add("Sides can also be disabled with a screwdriver");	
+		super.addInformation(stack, aPlayer, list, bool);		
+	}
+
+	/**
+	 * Gets an icon index based on an item's damage value
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconFromDamage(final int p_77617_1_)
+	{
+		return this.mBlock.getIcon(2, p_77617_1_);
+	}
+
+	/**
+	 * Returns the metadata of the block which this Item (ItemBlock) can place
+	 */
+	@Override
+	public int getMetadata(final int p_77647_1_)
+	{
+		return p_77647_1_;
+	}
+
+	@Override
+	public String getUnlocalizedName(final ItemStack stack) {
+		return this.getUnlocalizedName() + "." + stack.getItemDamage();
+	}
+
+	@Override
+	public boolean isDamageable() {
+		return false;
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) {
+		return false;
+	}
+
+	@Override
+	public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
+		return false;
+	}
+
+	@Override
+	public int getDisplayDamage(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
+
+	@Override
+	public double getDurabilityForDisplay(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public int getItemEnchantability(ItemStack stack) {
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
index 93a5a969f7..6a8751b682 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
@@ -29,7 +29,7 @@ public class FireProtectionBauble extends BaseBauble {
 	private static Field isImmuneToFire;
 	
 	static {
-		isImmuneToFire = ReflectionUtils.getField(Entity.class, DevHelper.IsObfuscatedEnvironment() ? "func_70045_F" : "isImmuneToFire");
+		isImmuneToFire = ReflectionUtils.getField(Entity.class, DevHelper.isObfuscatedEnvironment() ? "func_70045_F" : "isImmuneToFire");
 	}
 	
 	public static boolean fireImmune(Entity aEntity) {
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 0bd5c0cf76..bc1c7fc398 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -230,6 +230,7 @@ public class RECIPES_Machines {
 		fakeMachineCasingCovers();
 		ztonesCoverRecipes();
 		superBuses();
+		roundRobinators();
 	}
 
 	private static void initModItems(){
@@ -2251,4 +2252,46 @@ public class RECIPES_Machines {
 
 	}
 
+	private static void roundRobinators() {
+
+		RecipeUtils.addShapedGregtechRecipe(
+				ItemUtils.getSimpleStack(Blocks.hopper), "circuitPrimitive", ItemUtils.getSimpleStack(Blocks.hopper), 
+				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),
+				ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 2, 1),
+				ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 3, 1),
+				ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 4, 1),
+		};
+
+		int aCostMultiplier = GTNH ? 2 : 1;	
+
+		for (int i = 0; i < 5; i++) {			
+			if (i == 0) {
+				continue;
+			}			
+			int aTier = i+1;
+			ItemStack[] aInputs = new ItemStack[] {
+					aRobinators[i-1],
+					CI.getTieredMachineHull(aTier, 1 * aCostMultiplier),
+					CI.getConveyor(aTier, 2 * aCostMultiplier),
+					CI.getElectricMotor(aTier, 2 * aCostMultiplier),
+					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					
+					aRobinators[i],					
+					45 * 10 * 1 * (i+1), 
+					MaterialUtils.getVoltageForTier(i));	
+
+		}
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 15589ada84..63477cda19 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -547,7 +547,7 @@ public class CI {
 	
 	private static final Material[] aMaterial_Main = new Material[] {
 			ALLOY.POTIN,
-			ALLOY.ZIRCONIUM_CARBIDE,				
+			ALLOY.TUMBAGA,				
 			ALLOY.EGLIN_STEEL,				
 			ALLOY.INCONEL_792,				
 			ALLOY.TUNGSTEN_TITANIUM_CARBIDE,				
@@ -561,7 +561,7 @@ public class CI {
 	};		
 	
 	private static final Material[] aMaterial_Secondary = new Material[] {
-			ALLOY.TUMBAGA,
+			ALLOY.STEEL,
 			ALLOY.SILICON_CARBIDE,
 			ALLOY.TUNGSTEN_CARBIDE,				
 			ALLOY.INCONEL_690,				
@@ -576,7 +576,7 @@ public class CI {
 	};	
 	
 	private static final Material[] aMaterial_Tertiary = new Material[] {
-			ALLOY.STEEL,
+			ELEMENT.getInstance().LEAD,
 			ELEMENT.getInstance().ALUMINIUM,
 			ALLOY.STAINLESS_STEEL,
 			ELEMENT.getInstance().TUNGSTEN,
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java
index 13ba5ca44d..4950718f4a 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java
@@ -1,19 +1,36 @@
 package gtPlusPlus.core.tileentities.machines;
 
+import java.util.List;
+
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.inventories.Inventory_RoundRobinator;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.core.util.sys.KeyboardUtils;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockChest;
+import net.minecraft.command.IEntitySelector;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.Packet;
 import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
+import net.minecraft.tileentity.IHopper;
 import net.minecraft.tileentity.TileEntity;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.inventories.Inventory_RoundRobinator;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.Facing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
 
-public class TileEntityRoundRobinator extends TileEntity implements ISidedInventory {
+public class TileEntityRoundRobinator extends TileEntity implements ISidedInventory, IHopper {
 
 	private int tickCount = 0;
 	private final Inventory_RoundRobinator inventoryContents;
@@ -21,7 +38,9 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 	public int locationX;
 	public int locationY;
 	public int locationZ;
-	private int aCurrentMode = 0;
+	private int aData = 1111;
+	private int aTier = 1;
+	private int aTickRate = 100;
 
 	public TileEntityRoundRobinator() {
 		this.inventoryContents = new Inventory_RoundRobinator();
@@ -34,6 +53,7 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 				this.locationX = this.xCoord;
 				this.locationY = this.yCoord;
 				this.locationZ = this.zCoord;
+				this.aTier = this.getWorldObj().getBlockMetadata(locationX, locationY, locationZ) + 1;
 				return true;
 			}
 		}
@@ -41,8 +61,8 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 	}
 
 	//Rename to hasCircuitToConfigure
-	public final boolean hasCircuitToConfigure() {
-		for (ItemStack i : this.getInventory().getInventory()) {
+	public final boolean hasInventoryContents() {
+		for (ItemStack i : this.aHopperInventory) {
 			if (i == null) {
 				continue;
 			}
@@ -56,76 +76,54 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 	public Inventory_RoundRobinator getInventory() {
 		return this.inventoryContents;
 	}
-
-	public boolean addOutput() {		
-		ItemStack[] aInputs = this.getInventory().getInventory().clone();
-		//Check if there is output in slot.
-		Boolean hasOutput = false;
-		if (aInputs[25] != null) {
-			hasOutput = true;
-		}		
-		AutoMap<Integer> aValidSlots = new AutoMap<Integer>();
-		int aSlotCount = 0;
-		for (ItemStack i : aInputs) {
-			if (i != null) {
-				aValidSlots.put(aSlotCount);
-			}
-			aSlotCount++;
-		}
-		for (int e : aValidSlots) {
-			boolean doAdd = false;
-			ItemStack g = this.getStackInSlot(e);
-			int aSize = 0;
-			ItemStack aInputStack = null;			
-			if (g != null) {				
-				if (!hasOutput) {
-					aSize = g.stackSize;
-					doAdd = true;
-				}
-				else {
-					ItemStack f = this.getStackInSlot(25);
-					if (f != null) {
-						if (f.getItemDamage() == e) {
-							aSize = f.stackSize + g.stackSize;							
-							if (aSize > 64) {
-								aInputStack = g.copy();
-								aInputStack.stackSize = (aSize-64);
-							}
-							doAdd = true;							
-						}
-					}
-					else {
-						doAdd = true;
-						aSize = g.stackSize;
-					}					
-				}				
-				if (doAdd) {				
-					ItemStack aOutput = CI.getNumberedCircuit(e);
-					if (aOutput != null) {
-						aOutput.stackSize = aSize;
-						this.setInventorySlotContents(e, aInputStack);
-						this.setInventorySlotContents(25, aOutput);
-						return true;
-					}
-				}
-			}
-			continue;
-		}		
-		return false;
+	
+	public int getTier() {
+		return this.aTier;
+	}
+	
+	public int getTickRate() {
+		return this.aTickRate;
 	}
 
 	@Override
 	public void updateEntity() {
 		try{
-			if (!this.worldObj.isRemote) {
-				if (tickCount % 10 == 0) {
-					if (hasCircuitToConfigure()) {
-						this.addOutput();
-						this.markDirty();
+			// TODO
+			if (this.worldObj != null && !this.worldObj.isRemote){	
+				setTileLocation();
+				aTickRate = (60-(aTier*10));
+				if (this.getTier() == 1) {
+					// 20 s
+					aTickRate = 400;
+				}
+				else if (this.getTier() == 2) {
+					// 5
+					aTickRate = 100;
+				}
+				else if (this.getTier() == 3) {
+					// 1
+					aTickRate = 20;
+				}
+				else if (this.getTier() == 4) {
+					// 1/5
+					aTickRate = 10;
+				}
+				else if (this.getTier() == 5) {
+					// 1/20
+					aTickRate = 1;
+				}
+				else {
+					aTickRate = 999999;
+				}				
+				
+				if (tickCount % getTickRate() == 0) {
+					if (hasInventoryContents()) {
+						Logger.INFO("Trying to move items. "+aTickRate);
+						this.tryProcessItems();							
 					}	
 				}
-				this.tickCount++;				
-			}			
+				this.tickCount++;
+			}
 		}
 		catch (final Throwable t){}
 	}
@@ -144,55 +142,26 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 	@Override
 	public void writeToNBT(final NBTTagCompound nbt) {
 		super.writeToNBT(nbt);
-		// Utils.LOG_WARNING("Trying to write NBT data to TE.");
-		final NBTTagCompound chestData = new NBTTagCompound();
-		this.inventoryContents.writeToNBT(chestData);
-		nbt.setTag("ContentsChest", chestData);
 		if (this.hasCustomInventoryName()) {
 			nbt.setString("CustomName", this.getCustomName());
 		}
-		nbt.setInteger("aCurrentMode", aCurrentMode);
+		nbt.setInteger("aCurrentMode", aData);
+		this.writeToNBT2(nbt);
 	}
 
 	@Override
 	public void readFromNBT(final NBTTagCompound nbt) {
 		super.readFromNBT(nbt);
-		// Utils.LOG_WARNING("Trying to read NBT data from TE.");
-		this.inventoryContents.readFromNBT(nbt.getCompoundTag("ContentsChest"));
 		if (nbt.hasKey("CustomName", 8)) {
 			this.setCustomName(nbt.getString("CustomName"));
 		}
-		aCurrentMode = nbt.getInteger("aCurrentMode");
-	}
-
-	@Override
-	public int getSizeInventory() {
-		return this.getInventory().getSizeInventory();
-	}
-
-	@Override
-	public ItemStack getStackInSlot(final int slot) {
-		return this.getInventory().getStackInSlot(slot);
-	}
-
-	@Override
-	public ItemStack decrStackSize(final int slot, final int count) {
-		return this.getInventory().decrStackSize(slot, count);
-	}
-
-	@Override
-	public ItemStack getStackInSlotOnClosing(final int slot) {
-		return this.getInventory().getStackInSlotOnClosing(slot);
-	}
-
-	@Override
-	public void setInventorySlotContents(final int slot, final ItemStack stack) {
-		this.getInventory().setInventorySlotContents(slot, stack);
+		aData = nbt.getInteger("aCurrentMode");
+		this.readFromNBT2(nbt);
 	}
 
 	@Override
 	public int getInventoryStackLimit() {
-		return this.getInventory().getInventoryStackLimit();
+		return 64;
 	}
 
 	@Override
@@ -205,7 +174,7 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 		this.worldObj.addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, 1);
 		this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
 		this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord - 1, this.zCoord, this.getBlockType());
-		this.getInventory().openInventory();
+		//this.getInventory().openInventory();
 	}
 
 	@Override
@@ -213,32 +182,27 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 		this.worldObj.addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, 1);
 		this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
 		this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord - 1, this.zCoord, this.getBlockType());
-		this.getInventory().closeInventory();
+		//this.getInventory().closeInventory();
 	}
 
 	@Override
 	public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
-		return this.getInventory().isItemValidForSlot(slot, itemstack);
+		return true;
 	}
 
 	@Override
-	public int[] getAccessibleSlotsFromSide(final int p_94128_1_) {
-		final int[] accessibleSides = new int[this.getSizeInventory()];
-		for (int r=0; r<this.getInventory().getSizeInventory(); r++){
-			accessibleSides[r]=r;
-		}
-		return accessibleSides;
-
+	public int[] getAccessibleSlotsFromSide(final int aSide) {
+			return new int[] {0, 1, 2, 3, 4};		
 	}
 
 	@Override
-	public boolean canInsertItem(final int p_102007_1_, final ItemStack p_102007_2_, final int p_102007_3_) {
-		return p_102007_1_ >= 0 && p_102007_1_ <= 24;
+	public boolean canInsertItem(final int aSlot, final ItemStack aStack, final int aSide) {
+		return aSide < 2;
 	}
 
 	@Override
-	public boolean canExtractItem(final int p_102008_1_, final ItemStack p_102008_2_, final int p_102008_3_) {
-		return p_102008_1_ == 25;
+	public boolean canExtractItem(final int aSlot, final ItemStack aStack, final int aSide) {
+		return false;
 	}
 
 	public String getCustomName() {
@@ -251,7 +215,7 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 
 	@Override
 	public String getInventoryName() {
-		return this.hasCustomInventoryName() ? this.customName : "container.circuitprogrammer";
+		return this.hasCustomInventoryName() ? this.customName : "container.roundrobinator";
 	}
 
 	@Override
@@ -272,15 +236,37 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 		this.readFromNBT(tag);
 	}
 
-	public boolean onScrewdriverRightClick(byte side, EntityPlayer player, int x, int y, int z) {
-		try {			
-			if (aCurrentMode == 24) {
-				aCurrentMode = 0;
+
+	public boolean onRightClick(byte side, EntityPlayer player, int x, int y, int z) {
+		if (player != null && player.getHeldItem() == null) {
+			if (!player.isSneaking() && !KeyboardUtils.isShiftKeyDown()) {
+				player.openGui(GTplusplus.instance, GuiHandler.GUI16, player.getEntityWorld(), x, y, z);
 			}
 			else {
-				aCurrentMode++;
+				String InventoryContents = ItemUtils.getArrayStackNames(this.aHopperInventory);
+				PlayerUtils.messagePlayer(player, "Contents: "+InventoryContents+" | "+getDataString());				
+			}			
+			return true;
+		}
+		else {
+			return false;			
+		}	
+	}
+
+	public boolean onScrewdriverRightClick(byte side, EntityPlayer player, int x, int y, int z) {
+		try {		
+			if (side < 2) {
+				// Top/Bottom
 			}
-			PlayerUtils.messagePlayer(player, "Now configuring units for type "+aCurrentMode+".");			
+			else {				
+				if (toggleSide(side)) {
+					PlayerUtils.messagePlayer(player, "Enabling side "+side+".");					
+				}
+				else {
+					PlayerUtils.messagePlayer(player, "Disabling side "+side+".");					
+				}
+				PlayerUtils.messagePlayer(player, "Mode String: "+aData+"");
+			}	
 			return true;
 		}
 		catch (Throwable t) {
@@ -288,4 +274,461 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 		}		
 	}
 
+	public int getDataString() {
+		return aData;
+	}
+
+	public boolean[] getActiveSides() {
+		this.markDirty();
+		String s = String.valueOf(aData);
+		if (s == null || s.length() != 4) {
+			s = "1111";
+		}
+		boolean[] aActiveSides = new boolean[4];
+		for (int i=0;i<4;i++) {
+			char ch = s.charAt(i);
+			if (ch == '1') {
+				aActiveSides[i] = true;
+			}
+			else {
+				aActiveSides[i] = false;
+			}
+		}		
+		return aActiveSides;
+	}
+
+	/**
+	 * Toggle active state of side
+	 * @param aSide - Forge Direction / Side
+	 * @return - True if the side is now Active, false if now disabled.
+	 */
+	public boolean toggleSide(int aSide) {
+		setSideActive(!getSideActive(aSide), aSide);
+		return getSideActive(aSide);
+	}
+
+
+	public void setSideActive(boolean aActive, int aSide) {
+		try {		
+			if (aSide < 2) {
+			}
+			else {
+				if (aData < 1111) {
+					aData = 1111;
+				}
+				else if (aData > 2222) {
+					aData = 2222;
+				}				
+				String s = String.valueOf(aData);
+				StringBuilder aDataString = new StringBuilder(s);
+				int aIndex = aSide - 2;
+				if (aActive) {
+					aDataString.setCharAt(aIndex, '1');
+				}
+				else {
+					aDataString.setCharAt(aIndex, '2');					
+				}
+				aData = Integer.valueOf(aDataString.toString());
+				this.markDirty();
+			}	
+		}
+		catch (Throwable t) {
+		}
+	}
+
+	public boolean getSideActive(int aSide) {
+		this.markDirty();
+		try {		
+			if (aSide < 2) {
+				return false;
+			}
+			else {
+				if (aData < 1111) {
+					aData = 1111;
+				}
+				else if (aData > 2222) {
+					aData = 2222;
+				}				
+				String s = String.valueOf(aData);
+				int aIndex = aSide - 2;
+				char ch = s.charAt(aIndex);
+				if (ch == '1') {
+					return true;
+				}
+				else {
+					return false;				
+				}
+
+			}	
+		}
+		catch (Throwable t) {
+			return false;
+		}
+	}
+
+	@Override
+	public double getXPos() {
+		return this.locationX;
+	}
+
+	@Override
+	public double getYPos() {
+		return this.locationY;
+	}
+
+	@Override
+	public double getZPos() {
+		return this.locationZ;
+	}
+
+
+
+
+
+
+
+
+	// TODO
+
+
+
+	/*
+	 * Hopper Code
+	 */
+
+
+	private ItemStack[] aHopperInventory = new ItemStack[5];
+
+	public int getSizeInventory() {
+		return this.aHopperInventory.length;
+	}
+
+	public ItemStack getStackInSlot(int aSlot) {
+		return this.aHopperInventory[aSlot];
+	}
+
+	/**
+	 * Removes from an inventory slot (first arg) up to a specified number (second arg) of items and returns them in a
+	 * new stack.
+	 */
+	public ItemStack decrStackSize(int aSlot, int aMinimumSizeOfExistingStack)
+	{
+		if (this.aHopperInventory[aSlot] != null)
+		{
+			ItemStack itemstack;
+
+			if (this.aHopperInventory[aSlot].stackSize <= aMinimumSizeOfExistingStack)
+			{
+				itemstack = this.aHopperInventory[aSlot];
+				this.aHopperInventory[aSlot] = null;
+				return itemstack;
+			}
+			else
+			{
+				itemstack = this.aHopperInventory[aSlot].splitStack(aMinimumSizeOfExistingStack);
+
+				if (this.aHopperInventory[aSlot].stackSize == 0)
+				{
+					this.aHopperInventory[aSlot] = null;
+				}
+
+				return itemstack;
+			}
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * When some containers are closed they call this on each slot, then drop whatever it returns as an EntityItem -
+	 * like when you close a workbench GUI.
+	 */
+	public ItemStack getStackInSlotOnClosing(int aSlot)
+	{
+		if (this.aHopperInventory[aSlot] != null)
+		{
+			ItemStack itemstack = this.aHopperInventory[aSlot];
+			this.aHopperInventory[aSlot] = null;
+			return itemstack;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections).
+	 */
+	public void setInventorySlotContents(int aSlot, ItemStack aStack)
+	{
+		this.aHopperInventory[aSlot] = aStack;
+
+		if (aStack != null && aStack.stackSize > this.getInventoryStackLimit())
+		{
+			aStack.stackSize = this.getInventoryStackLimit();
+		}
+	}
+
+	public boolean tryProcessItems() {
+		if (this.worldObj != null && !this.worldObj.isRemote) {
+			boolean didSomething = false;
+			if (!this.isEmpty()) {
+				Logger.INFO("Has Items, Trying to push to all active directions.");
+				didSomething = this.tryPushItemsIntoNeighbours();
+			}			
+			if (didSomething) {
+				this.markDirty();
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Is Empty
+	 * @return
+	 */
+	private boolean isEmpty() {
+		ItemStack[] aitemstack = this.aHopperInventory;
+		int i = aitemstack.length;
+
+		for (int j = 0; j < i; ++j) {
+			ItemStack itemstack = aitemstack[j];
+
+			if (itemstack != null) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	private boolean tryPushItemsIntoNeighbours() {
+
+		boolean aDidPush = false;
+
+		for (int u = 2; u < 6; u++) {
+			if (!this.getSideActive(u)) {
+				Logger.INFO("Not pushing on side "+u);
+				continue;
+			}			
+			
+			Logger.INFO("Pushing on side "+u);
+			IInventory iinventory = this.getInventoryFromFacing(u);
+
+			if (iinventory == null) {
+				Logger.INFO("No inventory found.");
+				continue;
+			}
+			else {			
+
+				int i = Facing.oppositeSide[u];
+				Logger.INFO("Using Opposite direction: "+i);
+
+				if (this.isInventoryFull(iinventory, i)) {
+					Logger.INFO("Target is full, skipping.");
+					continue;
+				}
+				else {
+					Logger.INFO("Target has space, let's move a single item.");
+					for (int j = 0; j < this.getSizeInventory(); ++j) {
+						if (this.getStackInSlot(j) != null) {
+							ItemStack itemstack = this.getStackInSlot(j).copy();
+							ItemStack itemstack1 = setStackInNeighbour(iinventory, this.decrStackSize(j, 1), i);
+							if (itemstack1 == null || itemstack1.stackSize == 0) {
+								iinventory.markDirty();
+								aDidPush = true;
+								continue;
+							}
+							this.setInventorySlotContents(j, itemstack);							
+						}
+					}					
+				}
+			}
+		}
+
+		return aDidPush;
+	}
+
+	private boolean isInventoryFull(IInventory aInv, int aSide) {
+		if (aInv instanceof ISidedInventory && aSide > -1) {
+			ISidedInventory isidedinventory = (ISidedInventory)aInv;
+			int[] aint = isidedinventory.getAccessibleSlotsFromSide(aSide);
+
+			for (int l = 0; l < aint.length; ++l)
+			{
+				ItemStack itemstack1 = isidedinventory.getStackInSlot(aint[l]);
+
+				if (itemstack1 == null || itemstack1.stackSize != itemstack1.getMaxStackSize())
+				{
+					return false;
+				}
+			}
+		}
+		else {
+			int j = aInv.getSizeInventory();
+
+			for (int k = 0; k < j; ++k)
+			{
+				ItemStack itemstack = aInv.getStackInSlot(k);
+
+				if (itemstack == null || itemstack.stackSize != itemstack.getMaxStackSize())
+				{
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	public static ItemStack setStackInNeighbour(IInventory aNeighbour, ItemStack aStack, int aSide) {
+		if (aNeighbour instanceof ISidedInventory && aSide > -1)
+		{
+			ISidedInventory isidedinventory = (ISidedInventory)aNeighbour;
+			int[] aint = isidedinventory.getAccessibleSlotsFromSide(aSide);
+
+			for (int l = 0; l < aint.length && aStack != null && aStack.stackSize > 0; ++l)
+			{
+				aStack = tryMoveStack(aNeighbour, aStack, aint[l], aSide);
+			}
+		}
+		else
+		{
+			int j = aNeighbour.getSizeInventory();
+
+			for (int k = 0; k < j && aStack != null && aStack.stackSize > 0; ++k)
+			{
+				aStack = tryMoveStack(aNeighbour, aStack, k, aSide);
+			}
+		}
+
+		if (aStack != null && aStack.stackSize == 0)
+		{
+			aStack = null;
+		}
+
+		return aStack;
+	}
+
+	private static boolean canInsertItemIntoNeighbour(IInventory aNeighbour, ItemStack aStack, int aSlot, int aSide) {
+		return !aNeighbour.isItemValidForSlot(aSlot, aStack) ? false : !(aNeighbour instanceof ISidedInventory) || ((ISidedInventory)aNeighbour).canInsertItem(aSlot, aStack, aSide);
+	}
+
+	private static ItemStack tryMoveStack(IInventory aNeighbour, ItemStack aStack, int aSlot, int aSide) {
+		ItemStack itemstack1 = aNeighbour.getStackInSlot(aSlot);
+		if (canInsertItemIntoNeighbour(aNeighbour, aStack, aSlot, aSide)) {
+			boolean aDidSomething = false;
+			if (itemstack1 == null) {
+				//Forge: BUGFIX: Again, make things respect max stack sizes.
+				int max = Math.min(aStack.getMaxStackSize(), aNeighbour.getInventoryStackLimit());
+				if (max >= aStack.stackSize) {
+					aNeighbour.setInventorySlotContents(aSlot, aStack);
+					aStack = null;
+				}
+				else {
+					aNeighbour.setInventorySlotContents(aSlot, aStack.splitStack(max));
+				}
+				aDidSomething = true;
+			}
+			else if (areItemStacksEqual(itemstack1, aStack)) {
+				//Forge: BUGFIX: Again, make things respect max stack sizes.
+				int max = Math.min(aStack.getMaxStackSize(), aNeighbour.getInventoryStackLimit());
+				if (max > itemstack1.stackSize)	{
+					int l = Math.min(aStack.stackSize, max - itemstack1.stackSize);
+					aStack.stackSize -= l;
+					itemstack1.stackSize += l;
+					aDidSomething = l > 0;
+				}
+			}
+			if (aDidSomething){
+				aNeighbour.markDirty();
+			}
+		}
+		return aStack;
+	}
+
+	private IInventory getInventoryFromFacing(int aSide)
+	{
+		int i = aSide;
+		return tryFindInvetoryAtXYZ(this.getWorldObj(), (double)(this.xCoord + Facing.offsetsXForSide[i]), (double)(this.yCoord + Facing.offsetsYForSide[i]), (double)(this.zCoord + Facing.offsetsZForSide[i]));
+	}
+
+	public static IInventory tryFindInvetoryAtXYZ(World aWorld, double aX, double aY, double aZ)
+	{
+		IInventory iinventory = null;
+		int sX = MathHelper.floor_double(aX);
+		int sY = MathHelper.floor_double(aY);
+		int sZ = MathHelper.floor_double(aZ);
+		TileEntity tileentity = aWorld.getTileEntity(sX, sY, sZ);
+
+		if (tileentity != null && tileentity instanceof IInventory)
+		{
+			iinventory = (IInventory)tileentity;
+
+			if (iinventory instanceof TileEntityChest)
+			{
+				Block block = aWorld.getBlock(sX, sY, sZ);
+
+				if (block instanceof BlockChest)
+				{
+					iinventory = ((BlockChest)block).func_149951_m(aWorld, sX, sY, sZ);
+				}
+			}
+		}
+
+		if (iinventory == null)
+		{
+			List list = aWorld.getEntitiesWithinAABBExcludingEntity((Entity)null, AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1.0D, aY + 1.0D, aZ + 1.0D), IEntitySelector.selectInventories);
+
+			if (list != null && list.size() > 0)
+			{
+				iinventory = (IInventory)list.get(aWorld.rand.nextInt(list.size()));
+			}
+		}
+
+		return iinventory;
+	}
+
+	private static boolean areItemStacksEqual(ItemStack aStack, ItemStack aStack2) {
+		return aStack.getItem() != aStack2.getItem() ? false : (aStack.getItemDamage() != aStack2.getItemDamage() ? false : (aStack.stackSize > aStack.getMaxStackSize() ? false : ItemStack.areItemStackTagsEqual(aStack, aStack2)));
+	}
+
+	public void readFromNBT2(NBTTagCompound p_145839_1_) {
+		super.readFromNBT(p_145839_1_);
+		NBTTagList nbttaglist = p_145839_1_.getTagList("Items", 10);
+		this.aHopperInventory = new ItemStack[this.getSizeInventory()];
+		for (int i = 0; i < nbttaglist.tagCount(); ++i) {
+			NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i);
+			byte b0 = nbttagcompound1.getByte("Slot");
+			if (b0 >= 0 && b0 < this.aHopperInventory.length) {
+				this.aHopperInventory[b0] = ItemStack.loadItemStackFromNBT(
+						nbttagcompound1
+				);
+			}
+		}
+	}
+
+	public void writeToNBT2(NBTTagCompound aNBT) {
+		super.writeToNBT(aNBT);
+		NBTTagList nbttaglist = new NBTTagList();
+		for (int i = 0; i < this.aHopperInventory.length; ++i) {
+			if (this.aHopperInventory[i] != null) {
+				NBTTagCompound nbttagcompound1 = new NBTTagCompound();
+				nbttagcompound1.setByte("Slot", (byte) i);
+				this.aHopperInventory[i].writeToNBT(nbttagcompound1);
+				nbttaglist.appendTag(nbttagcompound1);
+			}
+		}
+		aNBT.setTag("Items", nbttaglist);
+	}
+
+
+
+
+
+
+
 }
diff --git a/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java b/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java
index b5f5fa7989..dae1a663d7 100644
--- a/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java
+++ b/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java
@@ -220,7 +220,8 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler {
 
 		@Override
 		public int compareTo(CachedRecipe o) {
-			if (o instanceof DecayableRecipeNEI) {
+			boolean b = DecayableRecipeNEI.class.isInstance(o);
+			if (b) {
 				DecayableRecipeNEI p = (DecayableRecipeNEI) o;
 				if (p.time > this.time) {
 					return 1;
@@ -232,5 +233,30 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler {
 			}
 			return 0;
 		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj != null) {
+				if (DecayableRecipeNEI.class.isInstance(obj)) {
+					DecayableRecipeNEI p = (DecayableRecipeNEI) obj;
+					if (p != null) {
+						// Time check first to keep it simple and not unbox the Recipes.
+						if (p.time == this.time) {
+							ItemStack aInput = p.input.item;
+							ItemStack aOutput = p.output.item;
+							if (GT_Utility.areStacksEqual(aInput, this.input.item, true)) {
+								if (GT_Utility.areStacksEqual(aOutput, this.output.item, true)) {
+									return true;
+								}
+							}
+						}
+					}
+					
+				}
+			}
+			return false;
+		}
+		
+		
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java b/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java
index 6612ab703f..e3c980e6a4 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java
@@ -928,7 +928,7 @@ extends TemplateRecipeHandler {
 	}
 
 
-	public class recipeCompare implements Comparator<GT_Recipe> {
+	public class RecipeCompare implements Comparator<GT_Recipe> {
 		public int compare(GT_Recipe a, GT_Recipe b) {
 			if (a.mEUt != b.mEUt) {
 				return a.mEUt - b.mEUt;
diff --git a/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
index 5f3b1d8abd..f33cc71fc6 100644
--- a/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
+++ b/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
@@ -23,7 +23,7 @@ public class VanillaBedHeightFix implements IBugFix {
 		mParent = minstance;
 		if (DevHelper.isValidHelperObject()) {	
 			Method m;
-			if (DevHelper.IsObfuscatedEnvironment()) {
+			if (DevHelper.isObfuscatedEnvironment()) {
 				m = ReflectionUtils.getMethod(EntityPlayer.class, "func_71018_a", int.class, int.class,	int.class);
 			}
 			else {
diff --git a/src/Java/gtPlusPlus/preloader/DevHelper.java b/src/Java/gtPlusPlus/preloader/DevHelper.java
index d942de503a..81d36d591b 100644
--- a/src/Java/gtPlusPlus/preloader/DevHelper.java
+++ b/src/Java/gtPlusPlus/preloader/DevHelper.java
@@ -32,7 +32,7 @@ public class DevHelper {
 
 
 
-	public static boolean IsObfuscatedEnvironment() {
+	public static boolean isObfuscatedEnvironment() {
 		// Are we in a 'decompiled' environment?
 		boolean deobfuscatedEnvironment = false;
 		byte[] bs;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index dda1a6b0c0..7300b3507b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -21,6 +21,7 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.preloader.asm.AsmConfig;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_PowerSubStation;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_PowerSubStation;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBattery;
@@ -120,7 +121,9 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 		checkMachineProblem(problem);
 	}
 	private void checkMachineProblem(String msg) {
-		Logger.INFO("Power Sub-Station problem: " + msg);
+		if (!AsmConfig.disableAllLogging) {
+			Logger.INFO("Power Sub-Station problem: " + msg);			
+		}
 	}
 
 	public static int getCellTier(Block aBlock, int aMeta) {
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 193df880f0..a66ac39435 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -3025,4 +3025,13 @@ item.dustImpureRareEarthIII.name=Impure Rare Earth (III) Dust
 item.dustPureRareEarthIII.name=Purified Rare Earth (III) Dust
 item.itemDustRareEarthIII.name=Rare Earth (III) Dust
 item.itemDustTinyRareEarthIII.name=Tiny Pile of Rare Earth (III) Dust
-item.itemDustSmallRareEarthIII.name=Small Pile of Rare Earth (III) Dust
\ No newline at end of file
+item.itemDustSmallRareEarthIII.name=Small Pile of Rare Earth (III) Dust
+
+
+
+//Added 13/10/19
+tile.blockRoundRobinator.0.name=Round Robinator I
+tile.blockRoundRobinator.1.name=Round Robinator II
+tile.blockRoundRobinator.2.name=Round Robinator III
+tile.blockRoundRobinator.3.name=Round Robinator IV
+tile.blockRoundRobinator.4.name=Round Robinator V
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_0.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_0.png
new file mode 100644
index 0000000000..cbf604f2b3
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_0.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_1.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_1.png
new file mode 100644
index 0000000000..3b7ac3d50e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_1.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_2.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_2.png
new file mode 100644
index 0000000000..a5a5e2c559
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_2.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_3.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_3.png
new file mode 100644
index 0000000000..b68c900ddd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_3.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_4.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_4.png
new file mode 100644
index 0000000000..df182aeaa5
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_4.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_0.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_0.png
new file mode 100644
index 0000000000..85bc3f16cd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_0.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_1.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_1.png
new file mode 100644
index 0000000000..f82185ebdb
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_1.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_2.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_2.png
new file mode 100644
index 0000000000..345476e03c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_2.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_3.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_3.png
new file mode 100644
index 0000000000..971164eb3e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_3.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_4.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_4.png
new file mode 100644
index 0000000000..5b5bac3ad2
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_4.png
diff --git a/src/resources/assets/miscutils/textures/gui/RoundRobinator.png b/src/resources/assets/miscutils/textures/gui/RoundRobinator.png
new file mode 100644
index 0000000000..54c06f22ae
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/gui/RoundRobinator.png