From 419a2950969770fd08d4f93e536de6aaf92633d9 Mon Sep 17 00:00:00 2001
From: Aidan Brady <aidancbrady@aol.com>
Date: Wed, 27 Nov 2013 18:17:44 -0500
Subject: [PATCH] Work on Rotary Condensentrator, fix IC2 energy integration
 (mostly)

---
 common/mekanism/client/ClientProxy.java       |   5 +
 .../model/ModelRotaryCondensentrator.java     | 229 ++++++++++++++++++
 .../render/block/MachineRenderingHandler.java |  10 +
 .../RenderRotaryCondensentrator.java          |  44 ++++
 common/mekanism/common/CommonProxy.java       |   4 +-
 common/mekanism/common/EnergyNetwork.java     |  13 +-
 common/mekanism/common/Mekanism.java          |   4 +
 .../mekanism/common/block/BlockMachine.java   |   5 +-
 .../ContainerRotaryCondensentrator.java       | 126 ++++++++++
 .../common/item/ItemBlockMachine.java         |   4 +-
 .../tileentity/TileEntityElectricBlock.java   |  23 +-
 .../TileEntityRotaryCondensentrator.java      |   9 +-
 .../tileentity/TileEntityUniversalCable.java  |   7 +-
 .../assets/mekanism/gui/GuiElectricPump.png   | Bin 4325 -> 3932 bytes
 resources/assets/mekanism/gui/GuiGasTank.png  | Bin 3982 -> 3600 bytes
 .../mekanism/gui/GuiMetallurgicInfuser.png    | Bin 4467 -> 4070 bytes
 .../mekanism/gui/GuiRotaryCondensentrator.png | Bin 4550 -> 4305 bytes
 resources/assets/mekanism/lang/en_US.lang     |   3 +
 .../mekanism/render/RotaryCondensentrator.png | Bin 0 -> 3702 bytes
 19 files changed, 452 insertions(+), 34 deletions(-)
 create mode 100644 common/mekanism/client/model/ModelRotaryCondensentrator.java
 create mode 100644 common/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java
 create mode 100644 common/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java
 create mode 100644 resources/assets/mekanism/render/RotaryCondensentrator.png

diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java
index 1c06d0172..a36828231 100644
--- a/common/mekanism/client/ClientProxy.java
+++ b/common/mekanism/client/ClientProxy.java
@@ -53,6 +53,7 @@ import mekanism.client.render.tileentity.RenderMechanicalPipe;
 import mekanism.client.render.tileentity.RenderMetallurgicInfuser;
 import mekanism.client.render.tileentity.RenderObsidianTNT;
 import mekanism.client.render.tileentity.RenderPressurizedTube;
+import mekanism.client.render.tileentity.RenderRotaryCondensentrator;
 import mekanism.client.render.tileentity.RenderUniversalCable;
 import mekanism.client.sound.Sound;
 import mekanism.client.sound.SoundHandler;
@@ -91,6 +92,7 @@ import mekanism.common.tileentity.TileEntityObsidianTNT;
 import mekanism.common.tileentity.TileEntityOsmiumCompressor;
 import mekanism.common.tileentity.TileEntityPressurizedTube;
 import mekanism.common.tileentity.TileEntityPurificationChamber;
+import mekanism.common.tileentity.TileEntityRotaryCondensentrator;
 import mekanism.common.tileentity.TileEntityTeleporter;
 import mekanism.common.tileentity.TileEntityUniversalCable;
 import net.minecraft.client.Minecraft;
@@ -251,6 +253,7 @@ public class ClientProxy extends CommonProxy
 		ClientRegistry.registerTileEntity(TileEntityLogisticalSorter.class, "LogisticalSorter", new RenderLogisticalSorter());
 		ClientRegistry.registerTileEntity(TileEntityBin.class, "Bin", new RenderBin());
 		ClientRegistry.registerTileEntity(TileEntityDigitalMiner.class, "DigitalMiner", new RenderDigitalMiner());
+		ClientRegistry.registerTileEntity(TileEntityRotaryCondensentrator.class, "RotaryCondensentrator", new RenderRotaryCondensentrator());
 	}
 	
 	@Override
@@ -299,6 +302,8 @@ public class ClientProxy extends CommonProxy
 				return new GuiCombiner(player.inventory, (TileEntityAdvancedElectricMachine)tileEntity);
 			case 6:
 				return new GuiCrusher(player.inventory, (TileEntityElectricMachine)tileEntity);
+			case 7:
+				//return new GuiRotaryCondensentrator(player.inventory, (TileEntityRotaryCondensentrator)tileEntity); TODO
 			case 8:
 				return new GuiEnergyCube(player.inventory, (TileEntityEnergyCube)tileEntity);
 			case 9:
diff --git a/common/mekanism/client/model/ModelRotaryCondensentrator.java b/common/mekanism/client/model/ModelRotaryCondensentrator.java
new file mode 100644
index 000000000..c52693ee9
--- /dev/null
+++ b/common/mekanism/client/model/ModelRotaryCondensentrator.java
@@ -0,0 +1,229 @@
+package mekanism.client.model;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class ModelRotaryCondensentrator extends ModelBase
+{
+	ModelRenderer GasBottleLid1;
+	ModelRenderer GasBottleLid2;
+	ModelRenderer GasBottleDecor1;
+	ModelRenderer GasBottleDecor2;
+	ModelRenderer GasBottleDecor3;
+	ModelRenderer GasBottleDecor4;
+	ModelRenderer GasBottle1;
+	ModelRenderer GasBottle2;
+	ModelRenderer GasBottleBot1;
+	ModelRenderer GasBottleBot2;
+	ModelRenderer LiqBottleLid1;
+	ModelRenderer LiqBottleLid2;
+	ModelRenderer LiqBottleBot1;
+	ModelRenderer LiqBottleBot2;
+	ModelRenderer LiqBottle2;
+	ModelRenderer LiqBottle1;
+	ModelRenderer LiqBottleDecor1;
+	ModelRenderer LiqBottleDecor2;
+	ModelRenderer LiqBottleDecor3;
+	ModelRenderer LiqBottleDecor4;
+	ModelRenderer GasInput;
+	ModelRenderer MidSection1;
+	ModelRenderer MidSection2;
+	ModelRenderer LiquidOutput;
+	ModelRenderer MidSection3;
+
+	public ModelRotaryCondensentrator()
+	{
+		textureWidth = 128;
+		textureHeight = 128;
+
+		GasBottleLid1 = new ModelRenderer(this, 0, 40);
+		GasBottleLid1.addBox(0F, 0F, 0F, 6, 1, 6);
+		GasBottleLid1.setRotationPoint(-7F, 11F, 1F);
+		GasBottleLid1.setTextureSize(128, 128);
+		GasBottleLid1.mirror = true;
+		setRotation(GasBottleLid1, 0F, 0F, 0F);
+		GasBottleLid2 = new ModelRenderer(this, 0, 40);
+		GasBottleLid2.addBox(0F, 0F, 0F, 6, 1, 6);
+		GasBottleLid2.setRotationPoint(1F, 11F, 1F);
+		GasBottleLid2.setTextureSize(128, 128);
+		GasBottleLid2.mirror = true;
+		setRotation(GasBottleLid2, 0F, 0F, 0F);
+		GasBottleDecor1 = new ModelRenderer(this, 0, 33);
+		GasBottleDecor1.addBox(0F, 0F, 0F, 5, 1, 5);
+		GasBottleDecor1.setRotationPoint(1.5F, 21F, 1.5F);
+		GasBottleDecor1.setTextureSize(128, 128);
+		GasBottleDecor1.mirror = true;
+		setRotation(GasBottleDecor1, 0F, 0F, 0F);
+		GasBottleDecor2 = new ModelRenderer(this, 0, 33);
+		GasBottleDecor2.addBox(0F, 0F, 0F, 5, 1, 5);
+		GasBottleDecor2.setRotationPoint(1.5F, 13F, 1.5F);
+		GasBottleDecor2.setTextureSize(128, 128);
+		GasBottleDecor2.mirror = true;
+		setRotation(GasBottleDecor2, 0F, 0F, 0F);
+		GasBottleDecor3 = new ModelRenderer(this, 0, 33);
+		GasBottleDecor3.addBox(0F, 0F, 0F, 5, 1, 5);
+		GasBottleDecor3.setRotationPoint(-6.5F, 21F, 1.5F);
+		GasBottleDecor3.setTextureSize(128, 128);
+		GasBottleDecor3.mirror = true;
+		setRotation(GasBottleDecor3, 0F, 0F, 0F);
+		GasBottleDecor4 = new ModelRenderer(this, 0, 33);
+		GasBottleDecor4.addBox(0F, 0F, 0F, 5, 1, 5);
+		GasBottleDecor4.setRotationPoint(-6.5F, 13F, 1.5F);
+		GasBottleDecor4.setTextureSize(128, 128);
+		GasBottleDecor4.mirror = true;
+		setRotation(GasBottleDecor4, 0F, 0F, 0F);
+		GasBottle1 = new ModelRenderer(this, 0, 48);
+		GasBottle1.addBox(0F, 0F, 0F, 4, 11, 4);
+		GasBottle1.setRotationPoint(-6F, 12F, 2F);
+		GasBottle1.setTextureSize(128, 128);
+		GasBottle1.mirror = true;
+		setRotation(GasBottle1, 0F, 0F, 0F);
+		GasBottle2 = new ModelRenderer(this, 0, 48);
+		GasBottle2.addBox(0F, 0F, 0F, 4, 11, 4);
+		GasBottle2.setRotationPoint(2F, 12F, 2F);
+		GasBottle2.setTextureSize(128, 128);
+		GasBottle2.mirror = true;
+		setRotation(GasBottle2, 0F, 0F, 0F);
+		GasBottleBot1 = new ModelRenderer(this, 0, 40);
+		GasBottleBot1.addBox(0F, 0F, 0F, 6, 1, 6);
+		GasBottleBot1.setRotationPoint(-7F, 23F, 1F);
+		GasBottleBot1.setTextureSize(128, 128);
+		GasBottleBot1.mirror = true;
+		setRotation(GasBottleBot1, 0F, 0F, 0F);
+		GasBottleBot2 = new ModelRenderer(this, 0, 40);
+		GasBottleBot2.addBox(0F, 0F, 0F, 6, 1, 6);
+		GasBottleBot2.setRotationPoint(1F, 23F, 1F);
+		GasBottleBot2.setTextureSize(128, 128);
+		GasBottleBot2.mirror = true;
+		setRotation(GasBottleBot2, 0F, 0F, 0F);
+		LiqBottleLid1 = new ModelRenderer(this, 25, 40);
+		LiqBottleLid1.addBox(0F, 0F, 0F, 6, 1, 6);
+		LiqBottleLid1.setRotationPoint(-7F, 11F, -7F);
+		LiqBottleLid1.setTextureSize(128, 128);
+		LiqBottleLid1.mirror = true;
+		setRotation(LiqBottleLid1, 0F, 0F, 0F);
+		LiqBottleLid2 = new ModelRenderer(this, 25, 40);
+		LiqBottleLid2.addBox(0F, 0F, 0F, 6, 1, 6);
+		LiqBottleLid2.setRotationPoint(1F, 11F, -7F);
+		LiqBottleLid2.setTextureSize(128, 128);
+		LiqBottleLid2.mirror = true;
+		setRotation(LiqBottleLid2, 0F, 0F, 0F);
+		LiqBottleBot1 = new ModelRenderer(this, 25, 40);
+		LiqBottleBot1.addBox(0F, 0F, 0F, 6, 1, 6);
+		LiqBottleBot1.setRotationPoint(-7F, 23F, -7F);
+		LiqBottleBot1.setTextureSize(128, 128);
+		LiqBottleBot1.mirror = true;
+		setRotation(LiqBottleBot1, 0F, 0F, 0F);
+		LiqBottleBot2 = new ModelRenderer(this, 25, 40);
+		LiqBottleBot2.addBox(0F, 0F, 0F, 6, 1, 6);
+		LiqBottleBot2.setRotationPoint(1F, 23F, -7F);
+		LiqBottleBot2.setTextureSize(128, 128);
+		LiqBottleBot2.mirror = true;
+		setRotation(LiqBottleBot2, 0F, 0F, 0F);
+		LiqBottle2 = new ModelRenderer(this, 25, 48);
+		LiqBottle2.addBox(0F, 0F, 0F, 4, 11, 4);
+		LiqBottle2.setRotationPoint(2F, 12F, -6F);
+		LiqBottle2.setTextureSize(128, 128);
+		LiqBottle2.mirror = true;
+		setRotation(LiqBottle2, 0F, 0F, 0F);
+		LiqBottle1 = new ModelRenderer(this, 25, 48);
+		LiqBottle1.addBox(0F, 0F, 0F, 4, 11, 4);
+		LiqBottle1.setRotationPoint(-6F, 12F, -6F);
+		LiqBottle1.setTextureSize(128, 128);
+		LiqBottle1.mirror = true;
+		setRotation(LiqBottle1, 0F, 0F, 0F);
+		LiqBottleDecor1 = new ModelRenderer(this, 25, 33);
+		LiqBottleDecor1.addBox(0F, 0F, 0F, 5, 1, 5);
+		LiqBottleDecor1.setRotationPoint(1.5F, 21F, -6.5F);
+		LiqBottleDecor1.setTextureSize(128, 128);
+		LiqBottleDecor1.mirror = true;
+		setRotation(LiqBottleDecor1, 0F, 0F, 0F);
+		LiqBottleDecor2 = new ModelRenderer(this, 25, 33);
+		LiqBottleDecor2.addBox(0F, 0F, 0F, 5, 1, 5);
+		LiqBottleDecor2.setRotationPoint(1.5F, 13F, -6.5F);
+		LiqBottleDecor2.setTextureSize(128, 128);
+		LiqBottleDecor2.mirror = true;
+		setRotation(LiqBottleDecor2, 0F, 0F, 0F);
+		LiqBottleDecor3 = new ModelRenderer(this, 25, 33);
+		LiqBottleDecor3.addBox(0F, 0F, 0F, 5, 1, 5);
+		LiqBottleDecor3.setRotationPoint(-6.5F, 21F, -6.5F);
+		LiqBottleDecor3.setTextureSize(128, 128);
+		LiqBottleDecor3.mirror = true;
+		setRotation(LiqBottleDecor3, 0F, 0F, 0F);
+		LiqBottleDecor4 = new ModelRenderer(this, 25, 33);
+		LiqBottleDecor4.addBox(0F, 0F, 0F, 5, 1, 5);
+		LiqBottleDecor4.setRotationPoint(-6.5F, 13F, -6.5F);
+		LiqBottleDecor4.setTextureSize(128, 128);
+		LiqBottleDecor4.mirror = true;
+		setRotation(LiqBottleDecor4, 0F, 0F, 0F);
+		GasInput = new ModelRenderer(this, 0, 24);
+		GasInput.addBox(0F, 0F, 0F, 6, 6, 1);
+		GasInput.setRotationPoint(-3F, 13F, 7F);
+		GasInput.setTextureSize(128, 128);
+		GasInput.mirror = true;
+		setRotation(GasInput, 0F, 0F, 0F);
+		MidSection1 = new ModelRenderer(this, 15, 20);
+		MidSection1.addBox(0F, 0F, 0F, 4, 5, 6);
+		MidSection1.setRotationPoint(-2F, 18F, 1F);
+		MidSection1.setTextureSize(128, 128);
+		MidSection1.mirror = true;
+		setRotation(MidSection1, 0F, 0F, 0F);
+		MidSection2 = new ModelRenderer(this, 37, 0);
+		MidSection2.addBox(0F, 0F, 0F, 6, 7, 8);
+		MidSection2.setRotationPoint(-3F, 17F, -7F);
+		MidSection2.setTextureSize(128, 128);
+		MidSection2.mirror = true;
+		setRotation(MidSection2, 0F, 0F, 0F);
+		LiquidOutput = new ModelRenderer(this, 36, 22);
+		LiquidOutput.addBox(0F, 0F, 0F, 8, 8, 1);
+		LiquidOutput.setRotationPoint(-4F, 12F, -8F);
+		LiquidOutput.setTextureSize(128, 128);
+		LiquidOutput.mirror = true;
+		setRotation(LiquidOutput, 0F, 0F, 0F);
+		MidSection3 = new ModelRenderer(this, 0, 0);
+		MidSection3.addBox(0F, 0F, 0F, 4, 2, 14);
+		MidSection3.setRotationPoint(-2F, 15F, -7F);
+		MidSection3.setTextureSize(128, 128);
+		MidSection3.mirror = true;
+		setRotation(MidSection3, 0F, 0F, 0F);
+	}
+
+	public void render(float size)
+	{
+		GasBottleLid1.render(size);
+		GasBottleLid2.render(size);
+		GasBottleDecor1.render(size);
+		GasBottleDecor2.render(size);
+		GasBottleDecor3.render(size);
+		GasBottleDecor4.render(size);
+		GasBottle1.render(size);
+		GasBottle2.render(size);
+		GasBottleBot1.render(size);
+		GasBottleBot2.render(size);
+		LiqBottleLid1.render(size);
+		LiqBottleLid2.render(size);
+		LiqBottleBot1.render(size);
+		LiqBottleBot2.render(size);
+		LiqBottle2.render(size);
+		LiqBottle1.render(size);
+		LiqBottleDecor1.render(size);
+		LiqBottleDecor2.render(size);
+		LiqBottleDecor3.render(size);
+		LiqBottleDecor4.render(size);
+		GasInput.render(size);
+		MidSection1.render(size);
+		MidSection2.render(size);
+		LiquidOutput.render(size);
+		MidSection3.render(size);
+	}
+
+	private void setRotation(ModelRenderer model, float x, float y, float z)
+	{
+		model.rotateAngleX = x;
+		model.rotateAngleY = y;
+		model.rotateAngleZ = z;
+	}
+}
diff --git a/common/mekanism/client/render/block/MachineRenderingHandler.java b/common/mekanism/client/render/block/MachineRenderingHandler.java
index 4ea7d1047..49ec3a3e4 100644
--- a/common/mekanism/client/render/block/MachineRenderingHandler.java
+++ b/common/mekanism/client/render/block/MachineRenderingHandler.java
@@ -6,6 +6,7 @@ import mekanism.client.model.ModelDigitalMiner;
 import mekanism.client.model.ModelElectricPump;
 import mekanism.client.model.ModelLogisticalSorter;
 import mekanism.client.model.ModelMetallurgicInfuser;
+import mekanism.client.model.ModelRotaryCondensentrator;
 import mekanism.client.render.MekanismRenderer;
 import mekanism.common.block.BlockMachine.MachineType;
 import mekanism.common.util.MekanismUtils;
@@ -29,6 +30,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler
 	public ModelChargepad chargepad = new ModelChargepad();
 	public ModelLogisticalSorter logisticalSorter = new ModelLogisticalSorter();
 	public ModelDigitalMiner digitalMiner = new ModelDigitalMiner();
+	public ModelRotaryCondensentrator rotaryCondensentrator = new ModelRotaryCondensentrator();
 	
 	@Override
 	public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
@@ -80,6 +82,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler
 		  	Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png"));
 		  	digitalMiner.render(0.03125F, false);
 		}
+		else if(MachineType.get(block.blockID, metadata) == MachineType.ROTARY_CONDENSENTRATOR)
+		{
+			GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
+			GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F);
+	    	GL11.glTranslatef(0.0F, -1F, -0.05F);
+	    	Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png"));
+			rotaryCondensentrator.render(0.0625F);
+		}
 		else {
 	        MekanismRenderer.renderItem(renderer, metadata, block);
 		}
diff --git a/common/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/common/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java
new file mode 100644
index 000000000..7b4073f2f
--- /dev/null
+++ b/common/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java
@@ -0,0 +1,44 @@
+package mekanism.client.render.tileentity;
+
+import org.lwjgl.opengl.GL11;
+
+import mekanism.client.model.ModelRotaryCondensentrator;
+import mekanism.common.tileentity.TileEntityRotaryCondensentrator;
+import mekanism.common.util.MekanismUtils;
+import mekanism.common.util.MekanismUtils.ResourceType;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer
+{
+	private ModelRotaryCondensentrator model = new ModelRotaryCondensentrator();
+	
+	@Override
+	public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick)
+	{
+		renderAModelAt((TileEntityRotaryCondensentrator)tileEntity, x, y, z, partialTick);
+	}
+	
+	private void renderAModelAt(TileEntityRotaryCondensentrator tileEntity, double x, double y, double z, float partialTick)
+	{
+		GL11.glPushMatrix();
+		GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F);
+		
+		bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png"));
+		
+	    switch(tileEntity.facing)
+	    {
+		    case 2: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break;
+			case 3: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break;
+			case 4: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break;
+			case 5: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break;
+	    }
+	    
+		GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
+		model.render(0.0625F);
+		GL11.glPopMatrix();
+	}
+}
diff --git a/common/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java
index 405d909cb..7d987f7d8 100644
--- a/common/mekanism/common/CommonProxy.java
+++ b/common/mekanism/common/CommonProxy.java
@@ -47,6 +47,7 @@ import mekanism.common.tileentity.TileEntityObsidianTNT;
 import mekanism.common.tileentity.TileEntityOsmiumCompressor;
 import mekanism.common.tileentity.TileEntityPressurizedTube;
 import mekanism.common.tileentity.TileEntityPurificationChamber;
+import mekanism.common.tileentity.TileEntityRotaryCondensentrator;
 import mekanism.common.tileentity.TileEntityTeleporter;
 import mekanism.common.tileentity.TileEntityUniversalCable;
 import net.minecraft.entity.player.EntityPlayer;
@@ -97,6 +98,7 @@ public class CommonProxy
 		GameRegistry.registerTileEntity(TileEntityBin.class, "Bin");
 		GameRegistry.registerTileEntity(TileEntityDigitalMiner.class, "DigitalMiner");
 		GameRegistry.registerTileEntity(TileEntityObsidianTNT.class, "ObsidianTNT");
+		GameRegistry.registerTileEntity(TileEntityRotaryCondensentrator.class, "RotaryCondensentrator");
 	}
 	
 	/**
@@ -261,7 +263,7 @@ public class CommonProxy
 			case 6:
 				return new ContainerElectricMachine(player.inventory, (TileEntityElectricMachine)tileEntity);
 			case 7:
-				return new ContainerAdvancedElectricMachine(player.inventory, (TileEntityAdvancedElectricMachine)tileEntity);
+				//return new ContainerRotaryCondensentrator(player.inventory, (TileEntityRotaryCondensentrator)tileEntity); TODO
 			case 8:
 				return new ContainerEnergyCube(player.inventory, (TileEntityEnergyCube)tileEntity);
 			case 9:
diff --git a/common/mekanism/common/EnergyNetwork.java b/common/mekanism/common/EnergyNetwork.java
index 37f769bec..ab7066151 100644
--- a/common/mekanism/common/EnergyNetwork.java
+++ b/common/mekanism/common/EnergyNetwork.java
@@ -24,7 +24,6 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.Event;
 import universalelectricity.core.block.IElectrical;
-import universalelectricity.core.electricity.ElectricityDisplay;
 import universalelectricity.core.electricity.ElectricityPack;
 import buildcraft.api.power.IPowerReceptor;
 import buildcraft.api.power.PowerHandler.PowerReceiver;
@@ -131,7 +130,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
 			prevEnergy = energyToSend;
 			sent = 0;
 			
-			energyToSend = doEmit(energyToSend, ignored);
+			energyToSend -= (energyToSend - doEmit(energyToSend, ignored));
 			sent = prevEnergy-energyToSend;
 			
 			if(energyToSend > 0 && sent > 0)
@@ -143,6 +142,9 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
 		return energyToSend;
 	}
 	
+	/**
+	 * @return rejects
+	 */
 	public synchronized double doEmit(double energyToSend, ArrayList<TileEntity> ignored)
 	{
 		double energyAvailable = energyToSend;		
@@ -180,7 +182,8 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
 					}
 					else if(acceptor instanceof IEnergySink)
 					{
-						double toSend = Math.min(currentSending, (((IEnergySink)acceptor).getMaxSafeInput()*Mekanism.FROM_IC2));
+						double toSend = Math.min(currentSending, ((IEnergySink)acceptor).getMaxSafeInput()*Mekanism.FROM_IC2);
+						toSend = Math.min(toSend, ((IEnergySink)acceptor).demandedEnergyUnits()*Mekanism.FROM_IC2);
 						energyToSend -= (toSend - (((IEnergySink)acceptor).injectEnergyUnits(side.getOpposite(), toSend*Mekanism.TO_IC2)*Mekanism.FROM_IC2));
 					}
 					else if(acceptor instanceof IPowerReceptor && MekanismUtils.useBuildcraft())
@@ -440,12 +443,12 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
 	@Override
 	public String getNeeded()
 	{
-		return ElectricityDisplay.getDisplay((float)(getEnergyNeeded(new ArrayList<TileEntity>())*Mekanism.TO_UE), ElectricityDisplay.ElectricUnit.JOULES);
+		return MekanismUtils.getEnergyDisplay(getEnergyNeeded(new ArrayList<TileEntity>()));
 	}
 
 	@Override
 	public String getFlow()
 	{
-		return ElectricityDisplay.getDisplay((float)(getPower()*Mekanism.TO_UE), ElectricityDisplay.ElectricUnit.JOULES);
+		return MekanismUtils.getEnergyDisplay(getPower());
 	}
 }
diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java
index 314f66e45..c3a0f3bda 100644
--- a/common/mekanism/common/Mekanism.java
+++ b/common/mekanism/common/Mekanism.java
@@ -435,6 +435,10 @@ public class Mekanism
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Transmitter, 1, 4), new Object[] {
 			"RRR", "SBS", "RRR", Character.valueOf('R'), Item.redstone, Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Block.fenceIron
 		}));
+		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 0), new Object[] {
+			"GCG", "tET", "GIG", Character.valueOf('G'), Block.glass, Character.valueOf('C'), "circuitBasic", Character.valueOf('t'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), EnergyTablet.getUnchargedItem(), 
+			Character.valueOf('T'), new ItemStack(BasicBlock, 1, 9), Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8)
+		}));
 		
 		for(RecipeType type : RecipeType.values())
 		{
diff --git a/common/mekanism/common/block/BlockMachine.java b/common/mekanism/common/block/BlockMachine.java
index 7ca236006..9e876bd57 100644
--- a/common/mekanism/common/block/BlockMachine.java
+++ b/common/mekanism/common/block/BlockMachine.java
@@ -21,7 +21,6 @@ import mekanism.common.ItemAttacher;
 import mekanism.common.Mekanism;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
-import mekanism.common.Tier.FactoryTier;
 import mekanism.common.miner.MinerFilter;
 import mekanism.common.network.PacketElectricChest;
 import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
@@ -45,6 +44,7 @@ import mekanism.common.tileentity.TileEntityLogisticalSorter;
 import mekanism.common.tileentity.TileEntityMetallurgicInfuser;
 import mekanism.common.tileentity.TileEntityOsmiumCompressor;
 import mekanism.common.tileentity.TileEntityPurificationChamber;
+import mekanism.common.tileentity.TileEntityRotaryCondensentrator;
 import mekanism.common.tileentity.TileEntityTeleporter;
 import mekanism.common.transporter.TransporterFilter;
 import mekanism.common.util.MekanismUtils;
@@ -1010,7 +1010,8 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds
 		ELECTRIC_PUMP(Mekanism.machineBlockID, 12, "ElectricPump", 17, 10000, TileEntityElectricPump.class, true),
 		ELECTRIC_CHEST(Mekanism.machineBlockID, 13, "ElectricChest", -1, 12000, TileEntityElectricChest.class, true),
 		CHARGEPAD(Mekanism.machineBlockID, 14, "Chargepad", -1, 10000, TileEntityChargepad.class, true),
-		LOGISTICAL_SORTER(Mekanism.machineBlockID, 15, "LogisticalSorter", -1, 0, TileEntityLogisticalSorter.class, true);
+		LOGISTICAL_SORTER(Mekanism.machineBlockID, 15, "LogisticalSorter", -1, 0, TileEntityLogisticalSorter.class, true),
+		ROTARY_CONDENSENTRATOR(Mekanism.machineBlock2ID, 0, "RotaryCondensentrator", 7, 20000, TileEntityRotaryCondensentrator.class, true);
 		
 		public int typeId;
 		public int meta;
diff --git a/common/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java b/common/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java
new file mode 100644
index 000000000..3f216ecf9
--- /dev/null
+++ b/common/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java
@@ -0,0 +1,126 @@
+package mekanism.common.inventory.container;
+
+import mekanism.common.inventory.slot.SlotOutput;
+import mekanism.common.inventory.slot.SlotStorageTank;
+import mekanism.common.tileentity.TileEntityRotaryCondensentrator;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+
+public class ContainerRotaryCondensentrator extends Container
+{
+    private TileEntityRotaryCondensentrator tileEntity;
+
+    public ContainerRotaryCondensentrator(InventoryPlayer inventory, TileEntityRotaryCondensentrator tentity)
+    {
+        tileEntity = tentity;
+		addSlotToContainer(new SlotStorageTank(tentity, null, true, 0, 8, 8));
+		addSlotToContainer(new SlotStorageTank(tentity, null, true, 1, 8, 40));
+        addSlotToContainer(new Slot(tentity, 0, 146, 20));
+        addSlotToContainer(new SlotOutput(tentity, 1, 146, 51));
+        int slotX;
+
+        for(slotX = 0; slotX < 3; ++slotX)
+        {
+            for(int slotY = 0; slotY < 9; ++slotY)
+            {
+                addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18));
+            }
+        }
+
+        for(slotX = 0; slotX < 9; ++slotX)
+        {
+            addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142));
+        }
+        
+        tileEntity.playersUsing.add(inventory.player);
+        tileEntity.openChest();
+    }
+    
+    @Override
+    public void onContainerClosed(EntityPlayer entityplayer)
+    {
+		super.onContainerClosed(entityplayer);
+		
+		tileEntity.playersUsing.remove(entityplayer);
+		tileEntity.closeChest();
+    }
+
+	@Override
+    public boolean canInteractWith(EntityPlayer entityplayer)
+	{
+        return tileEntity.isUseableByPlayer(entityplayer);
+    }
+
+    @Override
+    public ItemStack transferStackInSlot(EntityPlayer player, int slotID)
+    {
+        ItemStack stack = null;
+        Slot currentSlot = (Slot)inventorySlots.get(slotID);
+
+        if(currentSlot != null && currentSlot.getHasStack())
+        {
+            ItemStack slotStack = currentSlot.getStack();
+            stack = slotStack.copy();
+            
+            if(FluidContainerRegistry.isEmptyContainer(slotStack) || FluidContainerRegistry.isFilledContainer(slotStack))
+            {
+            	if(slotID != 0 && slotID != 1)
+            	{
+            		if(!mergeItemStack(slotStack, 0, 1, false))
+            		{
+            			return null;
+            		}
+            	}
+            	else {
+            	 	if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true))
+	            	{
+	            		return null;
+	            	}
+            	}
+            }
+            else {
+	        	if(slotID >= 2 && slotID <= 8)
+	        	{
+	        		if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false))
+	        		{
+	        			return null;
+	        		}
+	        	}
+	        	else if(slotID > 28)
+	        	{
+	        		if(!mergeItemStack(slotStack, 2, 28, false))
+	        		{
+	        			return null;
+	        		}
+	        	}
+	        	else {
+            		if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true))
+            		{
+            			return null;
+            		}
+            	}
+            }
+            
+            if(slotStack.stackSize == 0)
+            {
+                currentSlot.putStack((ItemStack)null);
+            }
+            else {
+                currentSlot.onSlotChanged();
+            }
+
+            if(slotStack.stackSize == stack.stackSize)
+            {
+                return null;
+            }
+
+            currentSlot.onPickupFromSlot(player, slotStack);
+        }
+
+        return stack;
+    }
+}
diff --git a/common/mekanism/common/item/ItemBlockMachine.java b/common/mekanism/common/item/ItemBlockMachine.java
index 76caa214f..4b9509214 100644
--- a/common/mekanism/common/item/ItemBlockMachine.java
+++ b/common/mekanism/common/item/ItemBlockMachine.java
@@ -100,9 +100,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem
 	@Override
 	public String getUnlocalizedName(ItemStack itemstack)
 	{
-		if(MachineType.get(itemstack.itemID, itemstack.getItemDamage()) != null)
+		if(MachineType.get(itemstack) != null)
 		{
-			return getUnlocalizedName() + "." + MachineType.get(itemstack.itemID, itemstack.getItemDamage()).name;
+			return getUnlocalizedName() + "." + MachineType.get(itemstack).name;
 		}
 		
 		return "null";
diff --git a/common/mekanism/common/tileentity/TileEntityElectricBlock.java b/common/mekanism/common/tileentity/TileEntityElectricBlock.java
index 3f36b1bcd..15966ee0c 100644
--- a/common/mekanism/common/tileentity/TileEntityElectricBlock.java
+++ b/common/mekanism/common/tileentity/TileEntityElectricBlock.java
@@ -3,7 +3,6 @@ package mekanism.common.tileentity;
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;
 import ic2.api.energy.tile.IEnergySink;
-import ic2.api.energy.tile.IEnergySource;
 import ic2.api.energy.tile.IEnergyTile;
 import ic2.api.tile.IEnergyStorage;
 import ic2.api.tile.IWrenchable;
@@ -34,7 +33,7 @@ import cofh.api.energy.IEnergyHandler;
 
 import com.google.common.io.ByteArrayDataInput;
 
-public abstract class TileEntityElectricBlock extends TileEntityContainerBlock implements IWrenchable, ITileNetwork, IPowerReceptor, IEnergyTile, IElectrical, IElectricalStorage, IConnector, IStrictEnergyStorage, IEnergyHandler, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter
+public abstract class TileEntityElectricBlock extends TileEntityContainerBlock implements IWrenchable, ITileNetwork, IPowerReceptor, IEnergyTile, IElectrical, IElectricalStorage, IConnector, IStrictEnergyStorage, IEnergyHandler, IEnergySink, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter
 {
 	/** How much energy is stored in this block. */
 	public double electricityStored;
@@ -343,7 +342,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
 	@Override
 	public int getMaxSafeInput()
 	{
-		return 2048;
+		return Integer.MAX_VALUE;
 	}
 
 	@Override
@@ -401,36 +400,18 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
 		return (getMaxEnergy() - getEnergy())*Mekanism.TO_IC2;
 	}
 	
-	@Override
-	public double getOfferedEnergy() 
-	{
-		return Math.min(getEnergy()*Mekanism.TO_IC2, getOutput());
-	}
-	
 	@Override
 	public boolean canReceiveEnergy(ForgeDirection side)
 	{
 		return side != getOutputtingSide();
 	}
 
-	@Override
-	public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction)
-	{
-		return direction == getOutputtingSide() && !(receiver instanceof TileEntityUniversalCable);
-	}
-
 	@Override
 	public double getOutputEnergyUnitsPerTick()
 	{
 		return getMaxOutput()*Mekanism.TO_IC2;
 	}
 
-	@Override
-	public void drawEnergy(double amount)
-	{
-		setEnergy(getEnergy()-amount*Mekanism.FROM_IC2);
-	}
-
 	@Override
     public double injectEnergyUnits(ForgeDirection direction, double i)
     {
diff --git a/common/mekanism/common/tileentity/TileEntityRotaryCondensentrator.java b/common/mekanism/common/tileentity/TileEntityRotaryCondensentrator.java
index a3b70a4c8..670500b7e 100644
--- a/common/mekanism/common/tileentity/TileEntityRotaryCondensentrator.java
+++ b/common/mekanism/common/tileentity/TileEntityRotaryCondensentrator.java
@@ -1,6 +1,13 @@
 package mekanism.common.tileentity;
 
+import mekanism.common.block.BlockMachine.MachineType;
+import net.minecraft.item.ItemStack;
+
 public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock
 {
-
+	public TileEntityRotaryCondensentrator()
+	{
+		super("RotaryCondensentrator", MachineType.ROTARY_CONDENSENTRATOR.baseEnergy);
+		inventory = new ItemStack[5];
+	}
 }
diff --git a/common/mekanism/common/tileentity/TileEntityUniversalCable.java b/common/mekanism/common/tileentity/TileEntityUniversalCable.java
index 049950e5e..d76e59488 100644
--- a/common/mekanism/common/tileentity/TileEntityUniversalCable.java
+++ b/common/mekanism/common/tileentity/TileEntityUniversalCable.java
@@ -108,6 +108,9 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
 		if(!worldObj.isRemote)
 		{
 			TransmitterNetworkRegistry.getInstance().pruneEmptyNetworks();
+			
+			Mekanism.ic2Registered.remove(Object3D.get(this));
+			MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));
 		}
 		
 		super.invalidate();
@@ -279,13 +282,13 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
     {
 		ArrayList list = new ArrayList();
 		list.add(Object3D.get(this).getFromSide(direction).getTileEntity(worldObj));
-    	return i - (getTransmitterNetwork().emit(i*Mekanism.FROM_IC2, list)*Mekanism.TO_IC2);
+    	return getTransmitterNetwork().emit(i*Mekanism.FROM_IC2, list)*Mekanism.TO_IC2;
     }
 
 	@Override
 	public int getMaxSafeInput()
 	{
-		return 2048;
+		return Integer.MAX_VALUE;
 	}
 
 	@Override
diff --git a/resources/assets/mekanism/gui/GuiElectricPump.png b/resources/assets/mekanism/gui/GuiElectricPump.png
index b0f95a9a264c1f70543d1e3f2959d9ff396679a5..22e743384368b095880cd311c90256ea6fcf0e33 100644
GIT binary patch
delta 2855
zcmc&$X;c$g8m%fTO%fEt5Ca|u2tf@fD2M_ohNvvkNC=CH0um9LML}=@nypfbD1xHR
zG()o`f&vN+K}0q+p-~Y*MFH6*h_cEeYXC#KnASPdXU?2CXMT+J>(;4y-*?~r?tN7s
zG&<A-4lqKTurk}}7y=G=>ic)>p#W^(!k7fyG)z>TCsI=9prBHgp*@Y`&sR)6@y=OG
z-{R~GaUIuSiPBbAl>j}Fw`1~=_|-<ao{@$%whYLkC`DRxd#0vfZEgy~dm%kvmcGT3
z^9GXh8(NU^&OMKuZ!c(m-t3nA{Lb_awF=w<GTWRnlyYm{HIbBbO;lMqyi>Tfz7}=M
z>Jq-lxn`9-9-k7lO_H$M+CWAwEiKhDSa4q^*nO7=80MDWzu!@pqM>Jr78Mos_V?$M
zm6zMYX9?@DhY9D9-AAHD>)??U+<lWybONabuLZ0k8o+Ppd?0UQU+7+rCLcJih18Lp
zcw9*EFm*^Dy^MkDdb>Fh5K%ODGQS!&#6a|KOVKGp_>7GxQ7n;^rVUFa;~#2!XD9j|
z^x*zN6}X`<Ahw~ig81p_(9kwX&=E7X4k{%Y<5~&|ij|UznNv!lJm>ttSh8fSyDC^Z
zC;4=AVz4Q9^zh6s7bXH;Ty>~Q1dVnHg(Xj_s;a_X?pVnZX^R39-<VO;78lEqg|edE
zvbllm7oM*2aXP1KLefN=p(d!lkJ{C=OjEuhN{6nO&UN5^%JYj6eT2!})|+PM@NsnZ
z4xCECN@>aD^l<w^B`qZ(L5aAYvd0bhek8nI(53eI-D4y+63w7!vUP#o@sN&%jU`^k
zjDHB2)+Y)`Mx9gv9#jUEuUVu~>us4}f8W|mA{tiT{DvJJKdHn9=E`Dd0z5is&dda2
zpBA!6{p1`9kO`#uQ%Fux7^N?7=0rmMCEwc}BaJnTczPTJoh;Po1Lt``w#aXcehW)o
z!1IE3Fwszvs<#~V1yw@H{LkuOWT`>?qhmOfhOx5%Kdy!obun}_NZOEXJ7YLAInaQK
zrNQKcpsi$Xcf}8v710aXzHSf0eGUsFRS({5SxM9a4E8>2v{@&IY!#2Px*kSU%r}1C
z1&1qoYsCEZ_9|C7M3!Q7BDyVVs%{T|j=(o0j^!{^#>2=BE^qG+i#Pg(jlZ{=80oCA
zP)xGUiausp48-XZ$Hv~dwHHsHQC{MFO=@~?27lif-xj~1upphcEj*9$&)oR|II(>C
zLi?#PQ*x_pVp<$59_<QMa89}pkfZ#}MU|!tBX$Z4FL{V*mw$`f=TFk?mUlWt=76M=
zCKjtB2fUX@$}LEy9sC0gaeS)rSa$o0wh7t5Ax^CW-cg?EN9M%IM>%j?)}mVoj`E^<
zxw5XS1wPHMo0nq75X37;md!F8tKIrsBHN^kksEcZ9+lbOGY$ovh#hV7`hVvIA<~;$
zosh5%H0jJf@x^o}s0K&oz9%$>LyG92HrI}e|J4baP|l%nuUmq>FR!16->kv(AIhk2
zkAq}>$wT=;vVuTVP@5Iu3VN?G$sz|_t$y80<J8%1MjIg_b8ynf1WjU2kwsd}r3W^n
zW%3yFL_0v}kuvX}6>(|>RvIZYob#_>u~;LFEy7J;CQulay%8uJiG8twL#8I~R0fYm
zW)N;r*noYuZ4coQd^>y5sdXQW-s^9A1t)%S?&5u|6)&B15mSSCyeWe)sbp+o5`LO*
z$F+3ui^zloKR=FjAee+r=V{B-wy(s6<TXyul;M%m&d0g%evSHBf(Tc!@4XxSz=ryR
zfQ!I+HvRg1E-8R0xU_j_H98EX@ql~6&Rn>6%_6boIBG9F)P0dKY>c}&8?*N6Attyd
zjd7Vy!gAsMXVNZk+-yv`)1tkSvVN7)GN7@f2am#jST8`Pml!7}`GUp_#+7`bwwpG?
z)U+gB0c5D^ArD-_pOx6#%qwC#-KqJByLiBaIs<uL6*S)PhT+`DedFVIA_fCFSVrZ(
zE8YhEf<<$0>+Ai{68VoNIF*pF{gxay+NQ;okE*z}g4=2FR{tm{_oL2M7WkDQ@<moM
zH;LyB-NGEuIM5IR>0>1^;pr4TBFUNyktURO6k?8Wf>NPJpUsr^=<<OZEZ!5Piv%q|
z-}Du1FRumMYRLWsyF(kGC!fu1brwb9`hr@*?v29gE37vT%I_U!Zs~3zvKv|-d=&TU
zHXAhzZ&yd&hE%Ge<zVg3A(my2#N@taeQRs$aCAX_{<EX47i@OmZu5X=+iI_<{nGI%
zE5F*S<YkrV-YL8_VkR;dslOUO49R19Qxe&o8e^K!c3Uvg!}F~*=QuVQ{lNb|B;;SL
z^=}$1E>C9qf;j4#xy|X!y-e^w3_53lB1-ceEc;+^#WrGnq6OTcn3J8p9ct>1o(#0)
zm!I+QnNngN47Bp_I9Z)iuEy(RjNl!OF6o>>mQge4iOiE&j~}5eJf<1eqd#WNRTs=m
z>CESJk|G<Rg}M_~E3<*0=<ErC88+iThZS4;zm~W?gDeTCP6-W~jq7pfx^xo@zA8#v
zPqF5>L0(>7CAkmF%h$zwsvAy`1BmrXEERMO_8GN)n!zCTYx9B0C?yLH0cwinR##Vd
zGZcOdZkd=kH9SCax-(H#0R@vn$}TXAfxk`tth#<v*^r-W{7ZlJU|jwx^TchqKembd
zU-tR+T>B~&Iw%D?rtYP?GLRlgV~M+unaCB@40Wd~1{@G~x1>Q!y?kuo*O<8n?6WH2
zXv|^JMR&6l;kJ00=5gN@DO$?la{sKM*x1<bM%JCoPr&{Zf@RJ(hcYuWpF;+4uZ~!V
zTeWt3usri%&y-$nF$D@!4k;ZSi8yD-<N_cB<4M$i0OX(O+W_P%k#Ex;k9^VL8?`5?
f|1k!5dgGX!u7B#s7*gsCfL&JREVKMwoU^|J(hqA{

delta 3251
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

diff --git a/resources/assets/mekanism/gui/GuiGasTank.png b/resources/assets/mekanism/gui/GuiGasTank.png
index 1a4ce82e2ce4c46c629fad88ee883aa10cecf8bf..30c3aad8cd605837b9f219591a38639bef960fd9 100644
GIT binary patch
delta 2520
zcmcIlX;c$g7JgL}lAwVQRvlU*i-2r)3qofA%Mn`y1Y{Fh1bSKm_9y`d5F=PsZY+W@
z>WF}Zur#1BG&W06Xvi6QMC@h_h#1f~(IE!HA|SiznsesQ{OF^z`2M_m-o590_xtX>
z?_Dv<F|74RFlxnqx7`6rkYaRq%%<NOsKq96b7cwnfsQ|*-|~n9J-)@fQvHXY>56$J
zez`7Rgc<5S@;X1uo*?eFJ$DZ@5N=*speX^3-Mm!i^6s9DK?JTpo?W^!BTb!soA&AQ
z(%Q;GS4XyyPf%$=(JAFx$}6epZNH+%q?Sb}5(~Vs$D;H??|AWZco+6=b>&f?gVI@X
zW;)w<qUNyV#fvSpUQV@oB+FIBDPdkA7KkGCDb)uf+MaVJCntBNw(q9s=vla^IGxzM
zYObzNxj;8S(6o&OrVwlnL9r#V1nNw*JyUTqf1*enYp%0x!<1)d-zvl*Cmf8?h!Em9
z2FmtSsKs`^U78)sTF~=A8q8{M39F#mk>YtTekgN|CR8pdC*PRN51$9Jx|*-p^H0O?
zUnFjRevkuqUl3)Yny@1c|1P{OrhnIOAXuQ)bPSBJA6@alg$Ge!Xtruf_m#*waO>Q4
z<?4M+BUi-wyrp(imT*u-vQyN8B@ftzw}!U%*_abPMXrUm&Ar+GbgeqB&NwQU5(NB|
z*?)A|Xo!FQ6kA&!{5hBwpN}tq^3(Smi5dh!552PA2#b)KcMM5#lHjZybJfeGy6H@B
zVE%rvD^JLQAV~m|9*hFSw)M95!&bGN$FO_Rm_Uo!TY>Hb{g{WV-mI){n!T4vO`=Mi
z$ynyf24=?Pw)o3_$7T)JU(f`Y)Ya8&Vjp9g!SrkB`m@j-1)1msBh8cvj044?)Jy~s
zQhu~0++p~A0SDH$<fuBYupHL39xKL&y#Q9Grffbn6=TOn1`)pl7g2}qkWV62A_U?t
z`CQAvW%sz{fZ{Ab%u|o5Flml1xMyQM56{-grF`QV@j1kSZKJB9;3|DOsIvPL#0d6A
zf%SV&B!kLz)hRNmBOH#&hlVa5xf<s}EW<o#z;V!oV3TTY5ONmT-82;%Q?e1ojSGwk
zPZ*Y5%^as9bUJ`Cj%OgYR0{6-S&cazCB?P)-jdNo>S5d2#6tlwfvJ=?fc~+i69{F_
zGKYrOU(NoT^RjhIh?YAX20Lj|5Is5|E_37<g5ZC|(Fh2lH!YTv**mF`zK8GZg!!TU
z`tFNtzC&PHvURIY*+^}DDjQ}V7@+!p8Ka<XP;EgBxKB*z9w@l5P0-0OP^aL<sV;Ca
z*%g&13#^G^9K1gO``;n{9pPv$B32}}pXqtx8E%(|VY^CS)ux}lv|0KCFQwlxVEBgC
z!*wX@DC@3A<J{;uOAO4-es5fqd*sT{R-<sAQv;Pskte=f&Nc1L#6fg<z&a0pD-J3-
zclN<u6bjDvh~y*k^_2ft2=*&C9UW3}FM8oq)L}b1cTNB0wS~Cxld!m=#;B-q%p_Ak
ztk$?Ua&eB|(BGGk{J;uUEUb*F7-^)=?I>(-%!7xc!0n#+lHB7#EuG^tr$?h!FIztU
z>tFnl7Pakre@daoZ)F0ORpo2?P0W}H%A@bu5#40jqEsC|f&Iy8(y>`E>&?S~teRiG
zCn5s}H%nf%A}nn>DAXN@r+8`6fq(r-E*b^H{JL}b8iXYbM`YYsVaU8t5Fg|#+OmBw
z3cUJGhQozqn|7;z!$QhQ^(?=f^yKd#Cb%HzPUoS5o`huV&Azxlq~p2-TOOiip?OHu
zk%68bzk0Z?2l#c|&M_;{<-Fl0hb`PS_I+0QGH43AE<5JQkAtAzB#2gorsKe(Pjmy7
zl8MZ~n_LM71o@U!*bom?5mc&bpA4Ik9yg!Ea28p!2kWC35f74RI<FDgM9yrMKGr);
zy-sGva5+J>w`GD&cKjFG79>A2?o&o|C<^Su&~|fQQYDYMdb8dpG|>fEJ$qU8(-_Nj
zskEuVjoEDMyT9WpBiMud6?UCUaWd@hiPsRb)sv{(wY_)1E+qKoJJA{lo1Bll*nBP7
zZsy8XNsPdX_jT9cSJ>3lRMyxzw5MAdNZ8SvxR=OR(GPq5<F?^yZo!ar_I`FCG5dv?
zfJ^<4czq}>>|eadUT?uK`S9IP@M{VW&jT{0?`(_47hh)o{V@Zof^%iZ&S;bS(ANtL
zKJQx|#on9=@~!e9?Ml*+hsa;6!yOgMLrwu{d&(Rkfsa_)-rl}0CN00fl(;5b8rp`r
zJR2P?jEN<L`Krk_!G-c$YN&kXuD5`@rM5}9IC5ka*FbRq!3c%U{0Ij2@t{8l8T)9=
jKInSL_rDePhW?`FEs6$WG|<5U<l4X2+pXqz5$ApZ+efxB

delta 2905
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

diff --git a/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png b/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png
index 81192d36e6ec24af6dc8c6ec92c0bedf80c45bae..159ec34c5d623d71cdd629ef8444d27833c68d72 100644
GIT binary patch
delta 2994
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

delta 3394
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

diff --git a/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png b/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png
index 80cae4b02f367eb9e5e498d2b7d45960da93960e..4348e6402920253120b063a101e9cb154b894fc8 100644
GIT binary patch
delta 3231
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

delta 3478
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

diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang
index b5455dfcf..f4fbc0ca5 100644
--- a/resources/assets/mekanism/lang/en_US.lang
+++ b/resources/assets/mekanism/lang/en_US.lang
@@ -57,6 +57,9 @@ tile.MachineBlock.Chargepad.name=Chargepad
 tile.MachineBlock.LogisticalSorter.name=Logistical Sorter
 tile.MachineBlock.DigitalMiner.name=Digital Miner
 
+//Machine Block 2 (second ID iteration)
+tile.MachineBlock2.RotaryCondensentrator.name=Rotary Condensentrator
+
 //Ore Block
 tile.OreBlock.OsmiumOre.name=Osmium Ore
 
diff --git a/resources/assets/mekanism/render/RotaryCondensentrator.png b/resources/assets/mekanism/render/RotaryCondensentrator.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0f8e3574322ba3e96afd2b9882bef73c72e06cd
GIT binary patch
literal 3702
zcmeHJi#yZ%AK%V2DpQV2Y&fM~iCV6)88(->H*+b82U8)*hB241xg|sLGj}mYm^+n}
zaEMMK)H))fI+BW7%ONJ`OPzkt??3oG&-s0x=kt6%pZE3kdVk)Z=lP@%30AOe@NFOv
z2xen#;RFJKfh`y$0RfhCwI^JFMa<9is3{24l(Ahz+5!SWKty{NJRp~sm*2H(mx6+V
zqM{-k4o4smN=iz~%E~G#Dh37yR1Z{`2Rhutkm`X6^F)PvqQgB6!#y#Pp6EzV!w4@7
z-OG^SWke&PXx`{ZZ*(-tF!~fKnq(B^Z4&Kc66u4bdt+iq#xW$5SZ}O_g#{jux3sjh
zva+(awzjdcv9-0ev$M0ew?BIHD1ks=1e!5|&Ef*Fab#@Ld29+98yA92q+(Mj*aWgw
zQV=egY??&2V3Bbb$)+r_Ig5;EkuB56=9kD8m&jHL6kI~6X<Ue9QZOzl*z`iM*@a;9
z<Pcm^h*@%oc_IaWfohsc!KF}4Qz&K^DdwyYTuO*pD#e0D!KY9xSyYSkVAHfv^E8S@
z8U=qT*fNcZ&(6-y%gZY&Dk>={DJ?B6D=Xu2x#i{M6%`d%uU@UHs^al@H8nMLb#;x6
zjZIBW&CSg%EiE^0+yH9(|M5Rwfs}%~=QbV+)rsJ|{?8sD=Oyudz;$h<Si6OSKvLZs
z6D)VYmI(;qRQw65Guf9)BZZs+5lLr*sD}x7m)+sIhmRcA*0vIw833N+HWsEX5uWo!
zsksOPxxOoch{6biz(?gqIew*{LlNz`L49@g^S6k_6?!;zx2I+t_62s1?ALXfg(r0Q
zx%Zhy@x`amOJ4~?U-Xu2uP@qgGmV}}6^rG`wYZ^?8Fi`?Sxw^QGJE`S*=M+<@UsDO
zFN)KIq@0Z6`!;<+igOkcaN_Cc9+Li{TEJAG^`Q9ye<lzW{=izzY?!H28S6LJbSyF2
z$MDL?!2PpO)EOXFJM_KdkT7r~l+hNbOOG90=&+F}xcEbUtY16y5a8Smg;Y)T(0w-2
zHM}1wv(in5QTjK7qG@zJjm>P?MhGX}sKm?Q2Re^ZcIr+4i|glFEO%Ub;eOu!wThx3
zW&JMoy;me&C=#*jYJhmF@#;HwKZ|cD{JX9#Eb}$GjTMD0S+i>@iqq^&LLv;B2ivJg
zJlJilozbyp($LKl3w5+Kl<tOpygS%j4N&={r@(|=1~xkNYQ|w#g20t&RMkXS7xcG{
zSbp3hDO_%H`(_SO0@!zEKO_KuQw_CNA4gRcgXQrNoRnjU#vH~7=Sz+Rf;rm>oQ7jd
zq}CL#tmtYCOXq18PC-Oyy{VrOl3E#99nSGY<Fvu!4C~6+lkaXmZvSM^DZU))-?1+q
zD!cfqp^?=n-ZFOIl8-f6EXx`Uep+HKL`v&(Vnsk9{?xiUH>jIbyf|_DcWD&+zcd}6
z($GSwP~Ay)t7)RtVC&t@iWf;%$&q$Y|ESQ_oL_n~Y`6Hg))!*Q9cQL@iVtVz1_hj)
zi1cpDnt#=3ko?+RH4rq}EW$81h{O=?l&>A0|6;XweEqRf<-?b#_d}%sQTWcb9US+f
zgO5B)oi)P>G{5jnq@p)i=qmu1v$_DOa=tcHs{LBg8T+>2F$cRD7Pn>_=(7RmCD*jV
zX7I`@$NGDD_4Z?h01@r33!?Qtg)S=-6X8hdhmdz-3jHq%15?0A2R(RrMnB{+J96%2
z(GzcFooR;H)M-1(2%SgDLAU$x?)oy>KOIj9`}pA*+N8(b+hFVA_@9Xoj*sJirZK9T
z6>?HG=~yDINCLuZKD2G+o<=u@kO&s?4)wbQ1AVEi*3BFX>{Bjr$4A^t(PlzBs+L<b
zPf7=MRsXh~x6hIf*V25zE5iWyhZuIytjbZ)hPvnpYQ`osx<Pj&<9RmHBoK1#NiC01
zt14N=5Y>;yK-%R^pOo*0EEk5y!D0Ll|5gEq)<{4Cyq{CiWag-9Re`KDbif~?wfZML
zNREVq-7H){OkbDa?Z<yq)8>P-0!%71OHSeyh+!)8GY-ij%@Zk{0H;Q<$m{NaKh0f5
zm>XVC6ld$rcj{IegJelKq^nn41D<$9{V9{xq14H}sW+oJ?}5JE**5mIV3y%JpwPIo
zjgE{Tvfrl9(Gs#dNWXfGw}pf=_^$9Mq38qa3ADETC$H3L-K==nfp?Jwey`;z^*OgY
zSwoE9nV0gkna|o9x<*x(2g<e1;nqgsk-kCT*?_jy!t9yTJ_csW+O=T5*R0&~NwJcA
zSzp*R>7^rYlsWSxWXY-}#`ay=7$~ea4eZ-S^8|2y%(rnwcz-=XVmmC`VO$?fPSsA&
zT}mffNkWI~7JlH!D<qXU>ZEc)uTQKE`rmowWflS9%jrUier+Yu?SBXk3a(3-=mL~w
zgvhh(H1NaCY<K1YT?gR9D+uPMc0iJoZ+~$0^V5l+HuU#s(M`=V)KglVH3QH&X}T{^
zRnMH;*p6qewD=&POdBE#rQ{L<A5?XM4>}N+&D-LnLag56gh>FHGx`s_vF5Wcf7&^v
zYU}~wm6ajCvI$~Gx2o?DARqM{VHUsDHJlrX(BD^Xbhp(y<9DQ1gD-WMD+si;j=V_D
zRH<|4l&wbi?!SiIGqa}yA9YP~I?K~-IEADB?R*nD;6U(K+HNTGcZeLY(S;dyU&{{z
zDw8el5)j9KxYJ1LHpe8c%aUju{0(juIFtq}$KaBVTz(E7hoZ<ACV}Sy07<_AKIT|p
zKG}qxI&!8Q10aE)hio$(5u`S3ou4oIVYH8MT_lt2Y<VkTS-!fd89H#*%Hh;+GUMud
zCr#<8{1a}FH@H)T>!|6nG^)4&>2#`>iC&lUaQi6e`)=Zoz=b|73dk4)xBifHts})q
zgk^%_oYYJA^1gma%5$04=RdE0gJHCL60A`h_gQLq6%{C;jf<P8JAR|{CM$P}E>LSF
zuZspWy1{_2^{K8gA3^_|9qnPAs?zQbJnN8O*UR4Cxw_u`V~G%esWc6GNWK9XVU+$&
zkJ6oHW6WN;9o+Q47`=T0z4lz)!JjK34y0FIKvHJ2b3JFao|k<A0tlT(L&{B{QxQvl
zx|8p$)=WJOnpo+5wlsz5TzywE8S^D~N9^a>OF_M@*7?7tBZidUfB1ziaGzT49_^$H
z$G^TXz%nRnW3!$p)UDXhqLIbIs#%~_&Onn_OKwMnuD^aUTCcowb#=5OYH|AQVvQGC
z^eCOnMTjSVx5LtBX$^NmmzEkzVrap$tql62$YE({3bWpm!B|OHZD6cFuQNDI90HoB
z{|%gTj#&@x9%ZH`@AxHVxphgC&We&^f58M$HF)z92`voR#e04xcw_N?x@ftndZfDQ
z#$L&V7@g&JJq{|*h3aq7#Mhc17^lD6i?1utKaNZ%h;O<Wt^9B~Jm9kaxx4Z^NWb;3
zL);zMwb^_J$8SIgL|XhU8UABVJ@^*%4SaV5jLE|P)8|dFL$PR=S%gpNy|7;oZv5wM
M@C1u`Gw=An00v}V=Kufz

literal 0
HcmV?d00001