diff --git a/buildcraft_resources/build.number b/buildcraft_resources/build.number
index cbdce481..0da5bf79 100644
--- a/buildcraft_resources/build.number
+++ b/buildcraft_resources/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed Sep 12 21:13:27 CEST 2012
-build.number=4
+#Sat Oct 20 18:51:20 CEST 2012
+build.number=6
diff --git a/buildcraft_resources/build.xml b/buildcraft_resources/build.xml
index e8b46fc5..97ba3087 100644
--- a/buildcraft_resources/build.xml
+++ b/buildcraft_resources/build.xml
@@ -15,11 +15,11 @@
       
     <property name="clientsrc.dir"       value="${mcp.dir}/src/minecraft"/>
           
-	<property name="mc.version"			value="1.3.2"/>
-    <property name="mcp.version"         value="72"/>
-    <property name="forge.version"       value="4.1.4.287"/>
+	<property name="mc.version"			value="1.4.1"/>
+    <property name="mcp.version"         value="718_pre1"/>
+    <property name="forge.version"       value="6.0.0.329"/>
     <property name="bc.version"          value="3.2.0"/>
-    <property name="bc.version.full"     value="${bc.version}pre7"/>
+    <property name="bc.version.full"     value="${bc.version}"/>
     
     <echo message="Starting build for ${bc.version.full}"/>
 	
diff --git a/common/buildcraft/builders/FillerFlattener.java b/common/buildcraft/builders/FillerFlattener.java
index e2fb8779..2f73b4d4 100644
--- a/common/buildcraft/builders/FillerFlattener.java
+++ b/common/buildcraft/builders/FillerFlattener.java
@@ -9,7 +9,6 @@
 
 package buildcraft.builders;
 
-import buildcraft.api.core.BuildCraftAPI;
 import buildcraft.api.core.IBox;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.proxy.CoreProxy;
diff --git a/common/buildcraft/builders/FillerPattern.java b/common/buildcraft/builders/FillerPattern.java
index 1765d118..d4b28a6e 100644
--- a/common/buildcraft/builders/FillerPattern.java
+++ b/common/buildcraft/builders/FillerPattern.java
@@ -10,7 +10,6 @@
 package buildcraft.builders;
 
 import buildcraft.BuildCraftBuilders;
-import buildcraft.api.core.BuildCraftAPI;
 import buildcraft.api.core.IBox;
 import buildcraft.api.filler.IFillerPattern;
 import buildcraft.core.proxy.CoreProxy;
diff --git a/common/buildcraft/builders/ItemBptBluePrint.java b/common/buildcraft/builders/ItemBptBluePrint.java
index ede9d3fb..6b19c974 100644
--- a/common/buildcraft/builders/ItemBptBluePrint.java
+++ b/common/buildcraft/builders/ItemBptBluePrint.java
@@ -9,9 +9,6 @@
 
 package buildcraft.builders;
 
-import buildcraft.BuildCraftBuilders;
-import buildcraft.core.blueprints.BptBase;
-
 public class ItemBptBluePrint extends ItemBptBase {
 
 	public ItemBptBluePrint(int i) {
diff --git a/common/buildcraft/builders/ItemBptTemplate.java b/common/buildcraft/builders/ItemBptTemplate.java
index 0ab6bf15..73c550a3 100644
--- a/common/buildcraft/builders/ItemBptTemplate.java
+++ b/common/buildcraft/builders/ItemBptTemplate.java
@@ -1,8 +1,5 @@
 package buildcraft.builders;
 
-import buildcraft.BuildCraftBuilders;
-import buildcraft.core.blueprints.BptBase;
-
 public class ItemBptTemplate extends ItemBptBase {
 
 	public ItemBptTemplate(int i) {
diff --git a/common/buildcraft/core/EntityRobot.java b/common/buildcraft/core/EntityRobot.java
index daf9303d..3d1b116a 100644
--- a/common/buildcraft/core/EntityRobot.java
+++ b/common/buildcraft/core/EntityRobot.java
@@ -22,7 +22,6 @@ import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
 
 import buildcraft.BuildCraftCore;
 import buildcraft.api.blueprints.BptSlotInfo;
-import buildcraft.api.core.BuildCraftAPI;
 import buildcraft.api.core.Position;
 import buildcraft.core.blueprints.BptBuilderBase;
 import buildcraft.core.blueprints.BptContext;
diff --git a/common/buildcraft/core/TileBuffer.java b/common/buildcraft/core/TileBuffer.java
index 1b32f106..b93b6ebd 100644
--- a/common/buildcraft/core/TileBuffer.java
+++ b/common/buildcraft/core/TileBuffer.java
@@ -11,7 +11,6 @@ package buildcraft.core;
 
 import buildcraft.api.core.SafeTimeTracker;
 import net.minecraft.src.Block;
-import net.minecraft.src.BlockContainer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 
diff --git a/common/buildcraft/core/proxy/CoreProxy.java b/common/buildcraft/core/proxy/CoreProxy.java
index 7a1e18ec..a85cf663 100644
--- a/common/buildcraft/core/proxy/CoreProxy.java
+++ b/common/buildcraft/core/proxy/CoreProxy.java
@@ -13,7 +13,6 @@ import java.io.File;
 import java.util.List;
 import java.util.Random;
 
-import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.registry.GameRegistry;
diff --git a/common/buildcraft/core/utils/BlockUtil.java b/common/buildcraft/core/utils/BlockUtil.java
index 59bf7a16..8837329a 100644
--- a/common/buildcraft/core/utils/BlockUtil.java
+++ b/common/buildcraft/core/utils/BlockUtil.java
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import buildcraft.BuildCraftCore;
 
 import buildcraft.BuildCraftEnergy;
-import buildcraft.BuildCraftFactory;
 import buildcraft.api.core.BuildCraftAPI;
 import net.minecraft.src.Block;
 import net.minecraft.src.ItemStack;
diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java
index 45c02c8f..d5047ae8 100644
--- a/common/buildcraft/energy/TileEngine.java
+++ b/common/buildcraft/energy/TileEngine.java
@@ -14,6 +14,7 @@ import java.util.LinkedList;
 import buildcraft.BuildCraftCore;
 import buildcraft.BuildCraftEnergy;
 import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.liquids.ILiquidTank;
 import net.minecraftforge.liquids.ITankContainer;
 import net.minecraftforge.liquids.LiquidStack;
 import net.minecraftforge.liquids.LiquidTank;
@@ -475,5 +476,6 @@ public class TileEngine extends TileBuildCraft implements IPowerReceptor, IInven
 			return engine.getLiquidSlots();
 		}
 	}
+	@Override public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) { return null; }
 
 }
diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java
index 1e54039d..4923dcc1 100644
--- a/common/buildcraft/factory/BlockQuarry.java
+++ b/common/buildcraft/factory/BlockQuarry.java
@@ -11,8 +11,6 @@ package buildcraft.factory;
 
 import java.util.ArrayList;
 
-import com.google.common.math.IntMath;
-
 import buildcraft.BuildCraftFactory;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.api.core.Position;
diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java
index 06e87bf8..dd15a54a 100644
--- a/common/buildcraft/factory/TileQuarry.java
+++ b/common/buildcraft/factory/TileQuarry.java
@@ -15,12 +15,10 @@ import java.util.Set;
 
 import com.google.common.collect.Sets;
 
-import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.network.Player;
 
 import buildcraft.BuildCraftFactory;
-import buildcraft.api.core.BuildCraftAPI;
 import buildcraft.api.core.IAreaProvider;
 import buildcraft.api.core.LaserKind;
 import net.minecraftforge.common.ForgeDirection;
@@ -43,10 +41,8 @@ import buildcraft.core.utils.BlockUtil;
 import buildcraft.core.utils.Utils;
 
 import net.minecraft.src.AxisAlignedBB;
-import net.minecraft.src.Block;
 import net.minecraft.src.ChunkCoordIntPair;
 import net.minecraft.src.EntityItem;
-import net.minecraft.src.EntityLiving;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java
index 20367be4..e3d1b7c7 100644
--- a/common/buildcraft/silicon/BlockAssemblyTable.java
+++ b/common/buildcraft/silicon/BlockAssemblyTable.java
@@ -1,8 +1,6 @@
 package buildcraft.silicon;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
@@ -16,7 +14,6 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import buildcraft.BuildCraftSilicon;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.GuiIds;
 import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.utils.Utils;
 
diff --git a/common/buildcraft/silicon/GuiHandler.java b/common/buildcraft/silicon/GuiHandler.java
index 37bb06f3..b36999e0 100644
--- a/common/buildcraft/silicon/GuiHandler.java
+++ b/common/buildcraft/silicon/GuiHandler.java
@@ -1,7 +1,6 @@
 package buildcraft.silicon;
 
 import cpw.mods.fml.common.network.IGuiHandler;
-import buildcraft.core.GuiIds;
 import buildcraft.silicon.gui.ContainerAssemblyAdvancedWorkbench;
 import buildcraft.silicon.gui.ContainerAssemblyTable;
 import buildcraft.silicon.gui.GuiAssemblyAdvancedWorkbench;
diff --git a/common/buildcraft/silicon/ItemAssemblyTable.java b/common/buildcraft/silicon/ItemAssemblyTable.java
index 17b7314b..d2d8a9a9 100644
--- a/common/buildcraft/silicon/ItemAssemblyTable.java
+++ b/common/buildcraft/silicon/ItemAssemblyTable.java
@@ -1,6 +1,5 @@
 package buildcraft.silicon;
 
-import buildcraft.core.proxy.CoreProxy;
 import net.minecraft.src.ItemBlock;
 import net.minecraft.src.ItemStack;
 
diff --git a/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java
index 1c17cb7d..d760a909 100644
--- a/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java
+++ b/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java
@@ -25,7 +25,6 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.NBTTagList;
 import net.minecraft.src.SlotCrafting;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.World;
 
 public class TileAssemblyAdvancedWorkbench extends TileEntity implements IInventory, ILaserTarget, IMachine {
 	private final class InternalInventoryCraftingContainer extends Container {
diff --git a/common/buildcraft/silicon/gui/ContainerAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/gui/ContainerAssemblyAdvancedWorkbench.java
index 038c20ad..490ebf3b 100644
--- a/common/buildcraft/silicon/gui/ContainerAssemblyAdvancedWorkbench.java
+++ b/common/buildcraft/silicon/gui/ContainerAssemblyAdvancedWorkbench.java
@@ -2,27 +2,19 @@ package buildcraft.silicon.gui;
 
 import java.util.Iterator;
 
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
-
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ICrafting;
-import net.minecraft.src.IInventory;
 import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.Slot;
 import buildcraft.core.gui.BuildCraftContainer;
-import buildcraft.factory.gui.ContainerAutoWorkbench.SlotAutoCrafting;
 import buildcraft.silicon.TileAssemblyAdvancedWorkbench;
-import buildcraft.silicon.TileAssemblyTable;
 
 public class ContainerAssemblyAdvancedWorkbench extends BuildCraftContainer {
-	private InventoryPlayer player;
 	private TileAssemblyAdvancedWorkbench workbench;
 
 	public ContainerAssemblyAdvancedWorkbench(InventoryPlayer playerInventory, TileAssemblyAdvancedWorkbench table) {
 		super(table.getSizeInventory());
-		this.player = playerInventory;
 		this.workbench = table;
 //		addSlotToContainer(new SlotAutoCrafting(inventoryplayer.player, tile, craftResult, 0, 124, 35));
 //		for (int k = 0; k < 3; k++) {
diff --git a/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java
index ccbdcb1f..fba66d4d 100644
--- a/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java
+++ b/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java
@@ -1,32 +1,15 @@
 package buildcraft.silicon.gui;
 
-import java.util.Iterator;
-import java.util.LinkedList;
-
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.IRecipe;
 import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.ItemStack;
-import buildcraft.api.recipes.AssemblyRecipe;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.gui.BuildCraftContainer;
 import buildcraft.core.gui.GuiAdvancedInterface;
-import buildcraft.core.gui.GuiAdvancedInterface.AdvancedSlot;
-import buildcraft.core.gui.GuiAdvancedInterface.IInventorySlot;
-import buildcraft.core.network.PacketCoordinates;
-import buildcraft.core.network.PacketIds;
-import buildcraft.core.network.PacketPayload;
-import buildcraft.core.network.PacketSlotChange;
-import buildcraft.core.network.PacketUpdate;
-import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.utils.StringUtil;
 import buildcraft.silicon.TileAssemblyAdvancedWorkbench;
-import buildcraft.silicon.TileAssemblyTable;
-import buildcraft.silicon.TileAssemblyTable.SelectionMessage;
-import buildcraft.silicon.gui.GuiAssemblyTable.AssemblyLedger;
-import buildcraft.silicon.gui.GuiAssemblyTable.RecipeSlot;
 
 public class GuiAssemblyAdvancedWorkbench extends GuiAdvancedInterface {
 	class AssemblyWorkbenchLedger extends Ledger
diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java
index 8d1a5ee9..ec4dbe87 100644
--- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java
+++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java
@@ -26,7 +26,6 @@ import buildcraft.core.network.PacketPayload;
 import buildcraft.core.network.PacketUpdate;
 import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.utils.StringUtil;
-import buildcraft.energy.TileEngine;
 import buildcraft.silicon.TileAssemblyTable;
 import buildcraft.silicon.TileAssemblyTable.SelectionMessage;
 
@@ -189,8 +188,6 @@ public class GuiAssemblyTable extends GuiAdvancedInterface {
 			message.itemID = slot.recipe.output.itemID;
 			message.itemDmg = slot.recipe.output.getItemDamage();
 
-			ContainerAssemblyTable container = (ContainerAssemblyTable) inventorySlots;
-
 			if (CoreProxy.proxy.isRenderWorld(assemblyTable.worldObj)) {
 				PacketPayload payload = TileAssemblyTable.selectionMessageWrapper.toPayload(assemblyTable.xCoord, assemblyTable.yCoord,
 						assemblyTable.zCoord, message);
diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java
index e63c3ad5..954fbf8a 100644
--- a/common/buildcraft/transport/ItemFacade.java
+++ b/common/buildcraft/transport/ItemFacade.java
@@ -2,14 +2,11 @@ package buildcraft.transport;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Set;
 
 import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import cpw.mods.fml.common.Side;
@@ -25,7 +22,6 @@ import net.minecraft.src.Block;
 import net.minecraft.src.CreativeTabs;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.Item;
-import net.minecraft.src.ItemBlock;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
diff --git a/common/buildcraft/transport/network/PacketHandlerTransport.java b/common/buildcraft/transport/network/PacketHandlerTransport.java
index 2ba9875e..74f1fbd2 100644
--- a/common/buildcraft/transport/network/PacketHandlerTransport.java
+++ b/common/buildcraft/transport/network/PacketHandlerTransport.java
@@ -12,7 +12,6 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import buildcraft.core.network.PacketCoordinates;
 import buildcraft.core.network.PacketIds;
-import buildcraft.core.network.PacketNBT;
 import buildcraft.core.network.PacketSlotChange;
 import buildcraft.core.network.PacketUpdate;
 import buildcraft.transport.PipeTransportItems;
diff --git a/common/buildcraft/transport/network/PacketPipeTransportContent.java b/common/buildcraft/transport/network/PacketPipeTransportContent.java
index 41494ba3..a92a3ffb 100644
--- a/common/buildcraft/transport/network/PacketPipeTransportContent.java
+++ b/common/buildcraft/transport/network/PacketPipeTransportContent.java
@@ -1,7 +1,6 @@
 package buildcraft.transport.network;
 
 import net.minecraftforge.common.ForgeDirection;
-import buildcraft.api.transport.IPipedItem;
 
 import buildcraft.core.network.PacketIds;
 import buildcraft.core.network.PacketPayload;
@@ -9,8 +8,6 @@ import buildcraft.core.network.PacketUpdate;
 
 import buildcraft.transport.EntityData;
 
-import java.util.EnumSet;
-
 public class PacketPipeTransportContent extends PacketUpdate {
 
 	public PacketPipeTransportContent() {