Bring in experimental branch

30 files changed, 1921 insertions, 259 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
index 23b9d74fb7..fad3acec3f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
@@ -14,7 +14,6 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

 import gregtech.api.util.GT_Utility;

 import net.minecraft.item.ItemStack;

-import net.minecraft.item.crafting.CraftingManager;

 

 public class GT_MetaTileEntity_Boxinator

   extends GT_MetaTileEntity_BasicMachine

@@ -98,11 +97,11 @@ public class GT_MetaTileEntity_Boxinator
     if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack))

     {

       if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) || (ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) || (ItemList.Schematic_3by3.isStackEqual(getInputAt(1)))) {

-      if(GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[this.mTier], null, new ItemStack[] { GT_Utility.copyAmount(64L, new Object[] { aStack }), getInputAt(1) }) != null){return true;}

-      if(ItemList.Schematic_1by1.isStackEqual(getInputAt(1))&&GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack })!=null)return true;

-      if(ItemList.Schematic_2by2.isStackEqual(getInputAt(1))&&GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack, aStack, null, aStack, aStack })!=null){return true;}

-      if(ItemList.Schematic_3by3.isStackEqual(getInputAt(1))&&(GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack,aStack,aStack,aStack,aStack,aStack,aStack,aStack,aStack })!=null)){return true;}

-      }else{return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.containsInput(aStack);}

+    	  if(GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[this.mTier], null, new ItemStack[] { GT_Utility.copyAmount(64L, new Object[] { aStack }), getInputAt(1) }) != null){return true;}

+    	  if(ItemList.Schematic_1by1.isStackEqual(getInputAt(1))&&GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack })!=null)return true;

+    	  if(ItemList.Schematic_2by2.isStackEqual(getInputAt(1))&&GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack, aStack, null, aStack, aStack })!=null){return true;}

+    	  if(ItemList.Schematic_3by3.isStackEqual(getInputAt(1))&&(GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack,aStack,aStack,aStack,aStack,aStack,aStack,aStack,aStack })!=null)){return true;}

+    	  }else{return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.containsInput(aStack);}

     }

     return false;

   }

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
new file mode 100644
index 0000000000..8504cf3197
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
@@ -0,0 +1,79 @@
+package gregtech.common.tileentities.machines.basic;
+
+import static gregtech.api.enums.GT_Values.V;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.BaseMetaTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer;
+import gregtech.api.util.GT_ModHandler;
+
+public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuffer {
+
+	public GT_MetaTileEntity_Charger(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) {
+		super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount);
+	}
+
+	public GT_MetaTileEntity_Charger(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
+		super(aName, aTier, aDescription, aTextures, aSlotCount);
+	}
+
+	@Override
+	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_Charger(mName, mTier, mDescription, mTextures, mInventory.length);
+	}
+	
+	@Override
+	public long getMinimumStoredEU() {
+		return V[mTier] * 64 * mInventory.length;
+	}
+
+	@Override
+	public long maxEUStore() {
+		return V[mTier] * 256 * mInventory.length;
+	}
+
+	@Override
+	public long maxAmperesIn() {
+		return mChargeableCount * 8;
+	}
+
+	@Override
+	public long maxAmperesOut() {
+		return mBatteryCount * 4;
+	}
+
+	@Override
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		if (aBaseMetaTileEntity.isServerSide()) {
+			super.onPostTick(aBaseMetaTileEntity, aTick);
+			if (this.getBaseMetaTileEntity() instanceof BaseMetaTileEntity) {
+				BaseMetaTileEntity mBaseMetaTileEntity = (BaseMetaTileEntity) getBaseMetaTileEntity();
+				if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) {
+					MetaTileEntity mMetaTileEntity = (MetaTileEntity) mBaseMetaTileEntity.getMetaTileEntity();
+					//for (int t = 0; t < 6; t++) {
+						if (mMetaTileEntity.dechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
+							for (int i = mMetaTileEntity.dechargerSlotStartIndex(), k = mMetaTileEntity.dechargerSlotCount() + i; i < k; i++) {
+								if (mMetaTileEntity.mInventory[i] != null && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
+									mBaseMetaTileEntity.increaseStoredEnergyUnits(GT_ModHandler.dischargeElectricItem(mMetaTileEntity.mInventory[i], (int)Math.min(V[mTier]*15, mBaseMetaTileEntity.getEUCapacity() - mBaseMetaTileEntity.getStoredEU()), (int)Math.min(Integer.MAX_VALUE, mMetaTileEntity.getInputTier()), true, false, false), true);
+									if (mMetaTileEntity.mInventory[i].stackSize <= 0)
+										mMetaTileEntity.mInventory[i] = null;
+								}
+							}
+						}
+						if (mMetaTileEntity.rechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() > 0) {
+							for (int i = mMetaTileEntity.rechargerSlotStartIndex(), k = mMetaTileEntity.rechargerSlotCount() + i; i < k; i++) {
+								if (mBaseMetaTileEntity.getStoredEU() > 0 && mMetaTileEntity.mInventory[i] != null) {
+									mBaseMetaTileEntity.decreaseStoredEU(GT_ModHandler.chargeElectricItem(mMetaTileEntity.mInventory[i], (int)Math.min(V[this.mTier]*15, mBaseMetaTileEntity.getStoredEU()), (int)Math.min(Integer.MAX_VALUE, mMetaTileEntity.getOutputTier()), true, false), true);
+									if (mMetaTileEntity.mInventory[i].stackSize <= 0)
+										mMetaTileEntity.mInventory[i] = null;
+								}
+							}
+						//}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
index 07337cd305..f82517bedc 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
@@ -1,5 +1,6 @@
 package gregtech.common.tileentities.machines.basic;

 

+import static gregtech.api.enums.GT_Values.V;

 import gregtech.api.enums.ConfigCategories;

 import gregtech.api.enums.ItemList;

 import gregtech.api.enums.Materials;

@@ -46,14 +47,17 @@ public class GT_MetaTileEntity_Massfabricator
     Materials.UUAmplifier.mChemicalFormula = ("Mass Fabricator Eff/Speed Bonus: x" + sUUASpeedBonus);

   }

   

+@Override public long maxAmperesIn(){return 10;}

+@Override public long maxEUStore()  {return V[mTier]*512;}

+  

   public int checkRecipe()

   {

     FluidStack tFluid = getDrainableStack();

     if ((tFluid == null) || (tFluid.amount < getCapacity()))

     {

       this.mOutputFluid = Materials.UUMatter.getFluid(1L);

-      this.mEUt = ((int)gregtech.api.enums.GT_Values.V[this.mTier]);

-      this.mMaxProgresstime = (sDurationMultiplier / (1 << this.mTier - 1));

+      this.mEUt = ((int)gregtech.api.enums.GT_Values.V[this.mTier])*8;

+      this.mMaxProgresstime = (sDurationMultiplier / (1 << (this.mTier*2) - 2));

       if (((tFluid = getFillableStack()) != null) && (tFluid.amount >= sUUAperUUM) && (tFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L))))

       {

         tFluid.amount -= sUUAperUUM;

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
new file mode 100644
index 0000000000..11489dfa56
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
@@ -0,0 +1,296 @@
+
+package gregtech.common.tileentities.machines.basic;
+
+import static gregtech.api.enums.GT_Values.V;
+import net.minecraft.client.particle.EntityFX;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityHanging;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.boss.EntityDragonPart;
+import net.minecraft.entity.effect.EntityWeatherEffect;
+import net.minecraft.entity.item.EntityBoat;
+import net.minecraft.entity.item.EntityEnderCrystal;
+import net.minecraft.entity.item.EntityEnderEye;
+import net.minecraft.entity.item.EntityFireworkRocket;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.item.EntityTNTPrimed;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.entity.projectile.EntityFireball;
+import net.minecraft.entity.projectile.EntityFishHook;
+import net.minecraft.entity.projectile.EntityThrowable;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures;
+import gregtech.api.gui.GT_Container_MultiMachine;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IEnergyConnected;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Config;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.gui.GT_Container_MicrowaveEnergyTransmitter;
+import gregtech.common.gui.GT_Container_Teleporter;
+import gregtech.common.gui.GT_GUIContainer_FusionReactor;
+import gregtech.common.gui.GT_GUIContainer_MicrowaveEnergyTransmitter;
+import gregtech.common.gui.GT_GUIContainer_Teleporter;
+
+public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEntity_BasicTank{
+
+	  public int mTargetX = 0;
+	  public int mTargetY = 0;
+	  public int mTargetZ = 0;
+	  public int mTargetD = 0;
+	  public boolean mDebug = false;
+	  public boolean hasEgg = false;
+	  public static boolean sInterDimensionalTeleportAllowed = true;
+	  public int mMaxLoss = 50;
+	  public int mMaxLossDistance = 10000;
+	  public boolean mPassiveEnergyUse = true;
+	
+	public GT_MetaTileEntity_MicrowaveEnergyTransmitter(int aID, String aName, String aNameRegional, int aTier) {
+		super(aID, aName, aNameRegional, aTier, 3, "Transmits Energy wireless");
+	}
+
+	public GT_MetaTileEntity_MicrowaveEnergyTransmitter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+		super(aName, aTier, 3, aDescription, aTextures);
+	}
+	
+	@Override
+	public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+		if (aBaseMetaTileEntity.isClientSide()) return true;
+		this.hasEgg = checkForEgg();
+		aBaseMetaTileEntity.openGUI(aPlayer);
+		return true;
+	}
+	
+	@Override
+	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+		return new GT_Container_MicrowaveEnergyTransmitter(aPlayerInventory, aBaseMetaTileEntity);
+	}
+	
+
+	@Override
+	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+		return new GT_GUIContainer_MicrowaveEnergyTransmitter(aPlayerInventory, aBaseMetaTileEntity);
+	}
+	
+	@Override
+	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_MicrowaveEnergyTransmitter(this.mName, this.mTier, this.mDescription, this.mTextures);
+	}
+	
+	  public String[] getInfoData()
+	  {
+	    return new String[] { "Coordinates:", "X: " + this.mTargetX, "Y: " + this.mTargetY, "Z: " + this.mTargetZ, "Dimension: " + this.mTargetD };
+	  }
+
+	@Override
+	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+		return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1], (aSide == 0) ? null : aActive ? new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE) : new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER) };
+	}
+
+
+	  public void saveNBTData(NBTTagCompound aNBT)
+	  {
+		if (mFluid != null) aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+	    aNBT.setInteger("mTargetX", this.mTargetX);
+	    aNBT.setInteger("mTargetY", this.mTargetY);
+	    aNBT.setInteger("mTargetZ", this.mTargetZ);
+	    aNBT.setInteger("mTargetD", this.mTargetD);
+	    aNBT.setBoolean("mDebug", this.mDebug);
+	  }
+	  
+	  public void loadNBTData(NBTTagCompound aNBT)
+	  {
+	    mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
+	    this.mTargetX = aNBT.getInteger("mTargetX");
+	    this.mTargetY = aNBT.getInteger("mTargetY");
+	    this.mTargetZ = aNBT.getInteger("mTargetZ");
+	    this.mTargetD = aNBT.getInteger("mTargetD");
+	    this.mDebug = aNBT.getBoolean("mDebug");
+	  }
+	  
+	  public void onConfigLoad(GT_Config aConfig)
+	  {
+	    sInterDimensionalTeleportAllowed = aConfig.get(ConfigCategories.machineconfig, "Teleporter.Interdimensional", true);
+		mMaxLoss = Math.max(aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.MaxLoss",50),11);
+		mMaxLossDistance = aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.MaxLossDistance",10000);
+		mPassiveEnergyUse = aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.PassiveEnergy",true);
+	  }
+	  
+	  public void onFirstTick()
+	  {
+	    if (getBaseMetaTileEntity().isServerSide())
+	    {
+	      if ((this.mTargetX == 0) && (this.mTargetY == 0) && (this.mTargetZ == 0) && (this.mTargetD == 0))
+	      {
+	        this.mTargetX = getBaseMetaTileEntity().getXCoord();
+	        this.mTargetY = getBaseMetaTileEntity().getYCoord();
+	        this.mTargetZ = getBaseMetaTileEntity().getZCoord();
+	        this.mTargetD = getBaseMetaTileEntity().getWorld().provider.dimensionId;
+	      }
+	      this.hasEgg = checkForEgg();
+	    }
+	  }
+	  
+	  public boolean checkForEgg()
+	  {
+	    for (byte i = -5; i <= 5; i = (byte)(i + 1)) {
+	      for (byte j = -5; j <= 5; j = (byte)(j + 1)) {
+	        for (byte k = -5; k <= 5; k = (byte)(k + 1)) {
+	          if (getBaseMetaTileEntity().getBlockOffset(i, j, k) == Blocks.dragon_egg) {
+	            return true;
+	          }
+	        }
+	      }
+	    }
+	    return false;
+	  }
+	  
+	  public boolean hasDimensionalTeleportCapability()
+	  {
+	    return (this.mDebug) || (this.hasEgg) || (mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1))&&mFluid.amount>=1000);
+	  }
+	  
+	  public boolean isDimensionalTeleportAvailable()
+	  {
+	    return (this.mDebug) || ((hasDimensionalTeleportCapability()) && (GT_Utility.isRealDimension(this.mTargetD)) && (GT_Utility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId)));
+	  }
+	  
+	  public int tTargetX = 0;
+	  public int tTargetY = 0;
+	  public int tTargetZ = 0;
+	  public int tTargetD = 0;
+	  public TileEntity tTile = null;
+	  
+	  @Override
+	  public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		if(mFluid==null){
+			mFluid=Materials.Nitrogen.getPlasma(0);
+		}
+		super.onPostTick(aBaseMetaTileEntity, aTick);
+	    if (getBaseMetaTileEntity().isServerSide())
+	    {
+	      if (getBaseMetaTileEntity().getTimer() % 100L == 50L) {
+	        this.hasEgg = checkForEgg();
+	      }
+	      if ((getBaseMetaTileEntity().isAllowedToWork()) && (getBaseMetaTileEntity().getRedstone()))
+	      {
+	    	if(getBaseMetaTileEntity().getStoredEU()>(V[mTier]*16)){
+	    		if(mPassiveEnergyUse){getBaseMetaTileEntity().decreaseStoredEnergyUnits((long) Math.pow(2, mTier), false);}
+	    		if(hasDimensionalTeleportCapability()&&this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId&&mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1))){
+	    			mFluid.amount--;
+	    			if(mFluid.amount<1){mFluid=null;}
+	    		}
+	    	if(tTargetD!=mTargetD||tTargetX!=mTargetX||tTargetY!=mTargetY||tTargetZ!=mTargetZ){
+	    		tTargetD=mTargetD;
+	    		tTargetX=mTargetX;
+	    		tTargetY=mTargetY;
+	    		tTargetZ=mTargetZ;
+	    		if(this.mTargetD == getBaseMetaTileEntity().getWorld().provider.dimensionId){
+    	        	tTile = getBaseMetaTileEntity().getTileEntity(this.mTargetX, this.mTargetY, this.mTargetZ);}else{
+    	        		World tWorld = DimensionManager.getWorld(this.mTargetD);
+    	        		if(tWorld!=null){
+    	        		tTile = tWorld.getTileEntity(this.mTargetX, this.mTargetY, this.mTargetZ);
+    	        		}
+    	        	}
+	    	}
+	        int tDistance = distanceCalculation();
+	        long tEnergyTrans = Math.min(V[mTier], getBaseMetaTileEntity().getStoredEU());
+	        if(tTile!=null&&tTile instanceof IEnergyConnected){
+	        	if(((IEnergyConnected)tTile).injectEnergyUnits((byte) 6, V[mTier], 1)>0){
+	        		int tLoss=1;
+	        		if(mMaxLossDistance!=0){
+	        		tLoss = 10 + tDistance*(mMaxLoss-10)/mMaxLossDistance;}
+	        		getBaseMetaTileEntity().decreaseStoredEnergyUnits(V[mTier]+((V[mTier]*tLoss)/100), false);
+	        	}
+	        }
+	        }
+	        getBaseMetaTileEntity().setActive(true);
+	      }
+	      else
+	      {
+	        getBaseMetaTileEntity().setActive(false);
+	      }
+	    }
+	  }
+	  
+	  private int distanceCalculation()
+	  {
+	    return Math.abs(((this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId) && (isDimensionalTeleportAvailable()) ? 100 : 1) * (int)Math.sqrt(Math.pow(getBaseMetaTileEntity().getXCoord() - this.mTargetX, 2.0D) + Math.pow(getBaseMetaTileEntity().getYCoord() - this.mTargetY, 2.0D) + Math.pow(getBaseMetaTileEntity().getZCoord() - this.mTargetZ, 2.0D)));
+	  }
+	  
+		@Override public boolean isSimpleMachine()						{return false;}
+		@Override public boolean isOverclockerUpgradable()				{return false;}
+		@Override public boolean isTransformerUpgradable()				{return false;}
+		@Override public boolean isElectric()							{return true;}
+		@Override public boolean isFacingValid(byte aFacing)			{return true;}
+		@Override public boolean isEnetInput() 							{return true;}
+		@Override public boolean isInputFacing(byte aSide)				{return true;}
+		@Override public boolean isOutputFacing(byte aSide)				{return false;}
+		@Override public boolean isTeleporterCompatible()				{return false;}
+		@Override public long getMinimumStoredEU()						{return V[mTier]*16;}
+		@Override public long maxEUStore()								{return V[mTier]*256;}
+	    @Override public long maxEUInput()								{return V[mTier];}
+	    @Override public long maxSteamStore()							{return maxEUStore();}
+	    @Override public long maxAmperesIn()							{return 3;}
+		@Override public int getStackDisplaySlot()						{return 2;}
+		@Override public boolean isAccessAllowed(EntityPlayer aPlayer)	{return true;}
+		@Override public int getInputSlot() {return 0;}
+		@Override public int getOutputSlot() {return 0;}
+		
+		@Override
+		public int getCapacity() {return 64000;}
+
+		@Override
+		public boolean doesFillContainers() {
+			return false;
+		}
+
+		@Override
+		public boolean doesEmptyContainers() {
+			return false;
+		}
+
+		@Override
+		public boolean canTankBeFilled() {
+			return true;
+		}
+
+		@Override
+		public boolean canTankBeEmptied() {
+			return true;
+		}
+
+		@Override
+		public boolean displaysItemStack() {
+			return false;
+		}
+
+		@Override
+		public boolean displaysStackSize() {
+			return false;
+		}
+
+		@Override
+		public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+			return null;
+		}
+	
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
index 40020ef435..92248da910 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
@@ -196,10 +196,9 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
 			}
 		} else if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord()) != GT_Utility
 				.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))&&this.mInventory[0] != null&&this.mInventory[0].stackSize>0&&GT_Utility.areStacksEqual(this.mInventory[0], GT_ModHandler.getIC2Item("miningPipe", 1L))) {
-			getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord(),
-					GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L)));
+ 			getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord(),
+ 					GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L)));
 			getBaseMetaTileEntity().decrStackSize(0, 1);
-			
 		}
 		return y;
 	}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index 3360369114..a08ec27c23 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -171,6 +171,20 @@ public class GT_MetaTileEntity_Scanner
           return 2;

         }

       }

+      if(getSpecialSlot()==null&&ItemList.Tool_DataStick.isStackEqual(aStack, false, true)){

+    	  if(GT_Utility.ItemNBT.getBookTitle(aStack).equals("Raw Prospection Data")){

+    		  GT_Utility.ItemNBT.setBookTitle(aStack,"Analyzed Prospection Data");

+    		  GT_Utility.ItemNBT.convertProspectionData(aStack);

+              aStack.stackSize -= 1;

+              

+              this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[] { aStack });

+              this.mMaxProgresstime = (1000 / (1 << this.mTier - 1));

+              this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+              return 2;

+    		  

+    	  }

+      }

+      

     }

     return 0;

   }

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
new file mode 100644
index 0000000000..09b06b033e
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
@@ -0,0 +1,109 @@
+package gregtech.common.tileentities.machines.basic;
+
+import ic2.core.Ic2Items;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.ItemData;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.blocks.GT_Block_Ores;
+import gregtech.common.blocks.GT_TileEntity_Ores;
+
+public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_BasicMachine{
+	
+	boolean ready = false;
+
+	  public GT_MetaTileEntity_SeismicProspector(int aID, String aName, String aNameRegional, int aTier)
+	  {
+	    super(aID, aName, aNameRegional, aTier, 1, "Place, activate with explosives, use Data Stick", 1, 1, "Default.png", "", new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER) });
+	  }
+	  
+	  public GT_MetaTileEntity_SeismicProspector(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName)
+	  {
+	    super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
+	  }
+	  
+	  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
+	  {
+	    return new GT_MetaTileEntity_SeismicProspector(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+	  }
+
+		@Override
+		public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+			if (aBaseMetaTileEntity.isServerSide()) {
+				ItemStack aStack = aPlayer.getCurrentEquippedItem();
+				if ((aStack != null) && (aStack.getItem() == Item.getItemFromBlock(Blocks.tnt)||aStack.getItem() == Ic2Items.industrialTnt.getItem()) && aStack.stackSize > 7&&!ready) {
+					if ((!aPlayer.capabilities.isCreativeMode) && (aStack.stackSize != 111)) {
+							aStack.stackSize -= 8;
+					}
+					this.ready = true;
+					this.mMaxProgresstime = 200;
+				} else if (ready&&mMaxProgresstime==0&&aStack!=null&&aStack.stackSize==1&&aStack.getItem()==ItemList.Tool_DataStick.getItem()) {
+					this.ready=false;
+					GT_Utility.ItemNBT.setBookTitle(aPlayer.getCurrentEquippedItem(),"Raw Prospection Data");
+					List<String> tStringList = new ArrayList<String>();
+					for(int i = this.getBaseMetaTileEntity().getYCoord();i>0;i--){
+						for(int f = -1; f<2;f++){
+							for(int g = -1; g<2;g++){
+								Block tBlock = this.getBaseMetaTileEntity().getBlockOffset(f, -i, g);
+								if ((tBlock instanceof GT_Block_Ores))
+						          {
+						            TileEntity tTileEntity = getBaseMetaTileEntity().getWorld().getTileEntity(getBaseMetaTileEntity().getXCoord()+f, getBaseMetaTileEntity().getYCoord()+(-i), getBaseMetaTileEntity().getZCoord()+g);
+						            if ((tTileEntity instanceof GT_TileEntity_Ores))
+						            {
+						              Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores)tTileEntity).mMetaData % 1000)];
+						              if ((tMaterial != null) && (tMaterial != Materials._NULL))
+						              {
+						            	if(!tStringList.contains(tMaterial.mDefaultLocalName)){
+						            		tStringList.add(tMaterial.mDefaultLocalName);
+						            	}
+						              }
+						            }
+						          }
+						          else
+						          {
+						            int tMetaID = getBaseMetaTileEntity().getWorld().getBlockMetadata(getBaseMetaTileEntity().getXCoord()+f, getBaseMetaTileEntity().getYCoord()+(-i), getBaseMetaTileEntity().getZCoord()+g);
+						            ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
+						            if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore")))
+						            {
+						            	if(!tStringList.contains( tAssotiation.mMaterial.mMaterial.mDefaultLocalName)){
+						            		tStringList.add( tAssotiation.mMaterial.mMaterial.mDefaultLocalName);
+						            	}
+						            }
+						          }
+							}
+						}
+					}
+					FluidStack tFluid = GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getZCoord());
+					String[] tStringArray = new String[tStringList.size()];{
+						for(int i = 0;i<tStringArray.length;i++){
+							tStringArray[i] = tStringList.get(i);
+						}
+					}
+					GT_Utility.ItemNBT.setProspectionData(aPlayer.getCurrentEquippedItem(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), this.getBaseMetaTileEntity().getWorld().provider.dimensionId,tFluid, tStringArray);
+				}
+			}
+			
+			return true;
+		}
+	  
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
index e0c6225a61..4f6259e7e8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
@@ -23,9 +23,15 @@ import net.minecraft.entity.projectile.EntityFireball;
 import net.minecraft.entity.projectile.EntityFishHook;
 import net.minecraft.entity.projectile.EntityThrowable;
 import net.minecraft.init.Blocks;
+import net.minecraft.inventory.IInventory;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.fluids.FluidStack;
 import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_Container_MultiMachine;
 import gregtech.api.interfaces.ITexture;
@@ -92,9 +98,9 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 		return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1], (aSide !=this.getBaseMetaTileEntity().getFrontFacing()) ? null : aActive ? new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE) : new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER) };
 	}
 
-
 	  public void saveNBTData(NBTTagCompound aNBT)
 	  {
+		if (mFluid != null) aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
 	    aNBT.setInteger("mTargetX", this.mTargetX);
 	    aNBT.setInteger("mTargetY", this.mTargetY);
 	    aNBT.setInteger("mTargetZ", this.mTargetZ);
@@ -104,6 +110,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 	  
 	  public void loadNBTData(NBTTagCompound aNBT)
 	  {
+    	mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
 	    this.mTargetX = aNBT.getInteger("mTargetX");
 	    this.mTargetY = aNBT.getInteger("mTargetY");
 	    this.mTargetZ = aNBT.getInteger("mTargetZ");
@@ -147,7 +154,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 	  
 	  public boolean hasDimensionalTeleportCapability()
 	  {
-	    return (this.mDebug) || (this.hasEgg);
+	    return (this.mDebug) || (this.hasEgg) || (mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1))&&mFluid.amount>=1000);
 	  }
 	  
 	  public boolean isDimensionalTeleportAvailable()
@@ -157,6 +164,9 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 	  
 	  @Override
 	  public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+			if(mFluid==null){
+				mFluid=Materials.Nitrogen.getPlasma(0);
+			}
 		super.onPostTick(aBaseMetaTileEntity, aTick);
 	    if (getBaseMetaTileEntity().isServerSide())
 	    {
@@ -165,14 +175,40 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 	      }
 	      if ((getBaseMetaTileEntity().isAllowedToWork()) && (getBaseMetaTileEntity().getRedstone()))
 	      {
-	    	if(getBaseMetaTileEntity().decreaseStoredEnergyUnits(8192, false)){
+	    	if(getBaseMetaTileEntity().decreaseStoredEnergyUnits(2048, false)){
+	    		if(hasDimensionalTeleportCapability()&&this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId&&mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1))){
+	    			mFluid.amount--;
+	    			if(mFluid.amount<1){mFluid=null;}
+	    		}
 	        int tDistance = distanceCalculation();
+	        if(mInventory[0]!=null){
+	        	TileEntity tTile = null;
+	        	if(this.mTargetD == getBaseMetaTileEntity().getWorld().provider.dimensionId){
+	        	tTile = getBaseMetaTileEntity().getTileEntity(this.mTargetX, this.mTargetY, this.mTargetZ);}else{
+	        		World tWorld = DimensionManager.getWorld(this.mTargetD);
+	        		if(tWorld!=null){
+	        		tTile = tWorld.getTileEntity(this.mTargetX, this.mTargetY, this.mTargetZ);
+	        		}
+	        	}
+	        	if(tTile!=null&&tTile instanceof IInventory){
+	        		int tStacksize = mInventory[0].stackSize;
+	        		GT_Utility.moveOneItemStack(this, tTile, (byte)0 ,(byte)0, null, false, (byte)64, (byte)1, (byte)64, (byte)1);
+	        		if(mInventory[0]==null||mInventory[0].stackSize<tStacksize){
+	        			getBaseMetaTileEntity().decreaseStoredEnergyUnits((int)(tDistance * tDistance * (tStacksize - (mInventory[0]==null ? 0 : mInventory[0].stackSize))), false);
+	        		}
+	        		   }
+	        	
+	        }
 	        for (Object tObject : getBaseMetaTileEntity().getWorld().getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) + 2))) {
 	          if (((tObject instanceof Entity)) && (!((Entity)tObject).isDead))
 	          {
 	            Entity tEntity = (Entity)tObject;
 	            if (getBaseMetaTileEntity().decreaseStoredEnergyUnits((int)(tDistance * tDistance * weightCalculation(tEntity)), false))
 	            {
+		    		if(hasDimensionalTeleportCapability()&&this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId&&mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1))){
+		    			mFluid.amount = mFluid.amount - ((int)Math.min(1000,(tDistance * tDistance * weightCalculation(tEntity)/8192)));
+		    			if(mFluid.amount<1){mFluid=null;}
+		    		}
 	              if (tEntity.ridingEntity != null) {
 	                tEntity.mountEntity(null);
 	              }
@@ -301,6 +337,11 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 	    @Override public long maxAmperesIn()							{return 2;}
 		@Override public int getStackDisplaySlot()						{return 2;}
 		@Override public boolean isAccessAllowed(EntityPlayer aPlayer)	{return true;}
+		@Override public int getInputSlot() {return 0;}
+		@Override public int getOutputSlot() {return 0;}
+		
+		@Override
+		public int getCapacity() {return 64000;}
 
 		@Override
 		public boolean doesFillContainers() {
@@ -319,7 +360,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank{
 
 		@Override
 		public boolean canTankBeEmptied() {
-			return false;
+			return true;
 		}
 
 		@Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
new file mode 100644
index 0000000000..86a7120605
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
@@ -0,0 +1,261 @@
+package gregtech.common.tileentities.machines.multi;
+
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.ChunkPosition;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.blocks.GT_TileEntity_Ores;
+
+public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBase{
+
+	public GT_MetaTileEntity_AdvMiner2(int aID, String aName, String aNameRegional)
+	  {
+	    super(aID, aName, aNameRegional);
+	  }
+	  
+	  public GT_MetaTileEntity_AdvMiner2(String aName)
+	  {
+	    super(aName);
+	  }
+	  
+	  public String[] getDescription()
+	  {
+	    return new String[] { 
+	    		"Controller Block for the Advanced Miner II", 
+	    		"Size: 3x7x3", "Controller (front middle at bottom)", 
+	    		"3x3 Base of Solid Steel Casings", 
+	    		"Also part of Base: MV+ Energy Input Hatch",
+	    		"Fluid Input Hatch, Output Bus and Maintainance Hatch", 
+	    		"3x Solid Steel Casings on top the Center of the base",
+	    		"Steel Frame Boxes on each side and 3 more on top"};
+	  }
+
+	  public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)
+	  {
+	    if (aSide == aFacing) {
+	      return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[16], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER) };
+	    }
+	    return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[16] };
+	  }
+	  	public ArrayList<ChunkPosition> mMineList = new ArrayList();
+	  	private boolean completedCycle = false;
+	  
+		@Override
+		public boolean checkRecipe(ItemStack aStack) {
+			if(mInventory[1]==null||(mInventory[1].isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L)) && mInventory[1].stackSize<mInventory[1].getMaxStackSize())){
+				ArrayList<ItemStack> tItems = getStoredInputs();
+				for(ItemStack tStack : tItems){
+					if(tStack.isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L))){
+						if(tStack.stackSize<2){
+							tStack = null;
+						}else{tStack.stackSize--;}
+						
+					}
+					if(mInventory[1]==null){
+						mInventory[1] = GT_ModHandler.getIC2Item("miningPipe", 1L);
+					}else{
+					mInventory[1].stackSize++;}
+				}
+			}
+			if(mInputHatches==null||mInputHatches.get(0).mFluid==null||mInputHatches.get(0).mFluid.getFluid().getID()!=ItemList.sDrillingFluid.getID()){
+				return false;}
+			FluidStack tFluid = mInputHatches.get(0).mFluid.copy();
+			if(tFluid==null){
+				return false;
+			}
+			if(tFluid.amount<20){
+				return false;
+			}
+			tFluid.amount=100;
+			depleteInput(tFluid);
+			long tVoltage = getMaxInputVoltage();
+			if(getBaseMetaTileEntity().getRandomNumber(20)==0){
+			if(mMineList.isEmpty()){
+				int yLevel = getYOfPumpHead();
+				for(int i=-48;i<49;i++){
+					for(int f=-48;f<49;f++){
+						Block tBlock = getBaseMetaTileEntity().getBlockOffset(i, yLevel-getBaseMetaTileEntity().getYCoord(), f);
+						if(tBlock==GregTech_API.sBlockOres1){
+							TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(i, yLevel-getBaseMetaTileEntity().getYCoord(), f);
+							if ((tTileEntity instanceof GT_TileEntity_Ores)&&((GT_TileEntity_Ores)tTileEntity).mNatural == true&&!mMineList.contains(new ChunkPosition(i, yLevel-getBaseMetaTileEntity().getYCoord(), f))){
+						        mMineList.add(new ChunkPosition(i, yLevel-getBaseMetaTileEntity().getYCoord(), f));
+						      }
+						}
+					}
+				}
+			}
+			if(mMineList.isEmpty()&&getBaseMetaTileEntity().getBlockOffset(ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX, getYOfPumpHead()-1-getBaseMetaTileEntity().getYCoord(), ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ)!=Blocks.bedrock){		
+				if(mEnergyHatches.size()>0&&mEnergyHatches.get(0).getEUVar()>(512+getMaxInputVoltage()*4)){moveOneDown();}
+			}
+			ArrayList<ItemStack> tDrops = new ArrayList();			
+			if(!mMineList.isEmpty()){
+			Block tMineBlock = getBaseMetaTileEntity().getBlockOffset(mMineList.get(0).chunkPosX,mMineList.get(0).chunkPosY,mMineList.get(0).chunkPosZ);
+			tDrops = tMineBlock.getDrops(getBaseMetaTileEntity().getWorld(), mMineList.get(0).chunkPosX,mMineList.get(0).chunkPosY,mMineList.get(0).chunkPosZ, getBaseMetaTileEntity().getMetaIDOffset(mMineList.get(0).chunkPosX,mMineList.get(0).chunkPosY,mMineList.get(0).chunkPosZ), 1);
+			if(!tDrops.isEmpty()){
+				if(GT_OreDictUnificator.getItemData(tDrops.get(0)).mPrefix != OrePrefixes.crushed){
+				GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.findRecipe(getBaseMetaTileEntity(), false, tVoltage, null , tDrops.get(0));
+				if(tRecipe!=null){
+					this.mOutputItems=new ItemStack[tRecipe.mOutputs.length];
+					for(int g=0;g<mOutputItems.length;g++){
+						mOutputItems[g] = tRecipe.mOutputs[g].copy();
+						mOutputItems[g].stackSize = mOutputItems[g].stackSize*(getBaseMetaTileEntity().getRandomNumber(4)+1);
+					}
+				  }
+				}else{
+					this.mOutputItems=null;
+					ItemStack[] tStack = new ItemStack[tDrops.size()];
+					for(int j=0;j<tDrops.size();j++){
+						tStack[j]=tDrops.get(j).copy();
+						tStack[j].stackSize = tStack[j].stackSize*(getBaseMetaTileEntity().getRandomNumber(4)+1);
+					}
+					mOutputItems = tStack;
+				}
+			  }
+			getBaseMetaTileEntity().getWorld().setBlockToAir(mMineList.get(0).chunkPosX+getBaseMetaTileEntity().getXCoord(), mMineList.get(0).chunkPosY+getBaseMetaTileEntity().getYCoord(), mMineList.get(0).chunkPosZ+getBaseMetaTileEntity().getZCoord());
+			mMineList.remove(0);
+			}
+			}
+			
+			byte tTier = (byte)Math.max(1, GT_Utility.getTier(tVoltage));
+			this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
+	        this.mEfficiencyIncrease = 10000;
+	        int tEU = 48;
+	        int tDuration = 40;
+	        if (tEU <= 16)
+	        {
+	          this.mEUt = (tEU * (1 << tTier - 1) * (1 << tTier - 1));
+	          this.mMaxProgresstime = (tDuration / (1 << tTier - 1));
+	        }
+	        else
+	        {
+	          this.mEUt = tEU;
+	          this.mMaxProgresstime = tDuration;
+	          while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)])
+	          {
+	            this.mEUt *= 4;
+	            this.mMaxProgresstime /= 2;
+	          }
+	        }
+	        if (this.mEUt > 0) {
+	          this.mEUt = (-this.mEUt);
+	        }
+	        this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+			return true;
+		}
+
+		private boolean moveOneDown() {
+			if ((this.mInventory[1] == null) || (this.mInventory[1].stackSize < 1)
+					|| (!GT_Utility.areStacksEqual(this.mInventory[1], GT_ModHandler.getIC2Item("miningPipe", 1L)))) {
+				return false;
+			}
+			int xDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX;int zDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ;
+			int yHead = getYOfPumpHead();
+			if (yHead <= 0) {
+				return false;
+			}
+			if(getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord()+xDir, yHead-1, getBaseMetaTileEntity().getZCoord()+zDir) == Blocks.bedrock){
+				return false;
+			}
+			if (!(getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord()+xDir, yHead - 1, getBaseMetaTileEntity().getZCoord()+zDir,GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))))) {
+				return false;
+			}
+			if (yHead != getBaseMetaTileEntity().getYCoord()) {
+				getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord()+xDir, yHead, getBaseMetaTileEntity().getZCoord()+zDir,GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L)));
+			}
+			getBaseMetaTileEntity().decrStackSize(1, 1);
+			return true;
+		}
+
+		private int getYOfPumpHead() {
+			int xDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX;int zDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ;
+			int y = getBaseMetaTileEntity().getYCoord() - 1;
+			while (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord()+xDir, y, getBaseMetaTileEntity().getZCoord()+zDir) == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L))) {
+				y--;
+			}
+			if (y == getBaseMetaTileEntity().getYCoord() - 1) {
+				if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord()+xDir, y, getBaseMetaTileEntity().getZCoord()+zDir) != GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))) {
+					return y + 1;
+				}
+			} else if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord()+xDir, y, getBaseMetaTileEntity().getZCoord()+zDir) != GT_Utility
+					.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))&&this.mInventory[1] != null&&this.mInventory[1].stackSize>0&&GT_Utility.areStacksEqual(this.mInventory[1], GT_ModHandler.getIC2Item("miningPipe", 1L))) {
+	 			getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord()+xDir, y, getBaseMetaTileEntity().getZCoord()+zDir,
+	 					GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L)));
+				getBaseMetaTileEntity().decrStackSize(0, 1);
+			}
+			return y;
+		}
+
+	@Override
+	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+		int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
+	    for (int i = -1; i < 2; i++) {
+	        for (int j = -1; j < 2; j++) {
+	          if ((xDir + i != 0) || (zDir + j != 0))
+	          {
+	            IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 0, zDir + j);
+	            if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16)) && (!addOutputToMachineList(tTileEntity, 16)) && (!addEnergyInputToMachineList(tTileEntity, 16)))
+	            {
+	              if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j) != GregTech_API.sBlockCasings2) {
+	            	  return false;
+	              }
+	              if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 0, zDir + j) != 0) {
+	            	  return false;
+	              }
+	            }
+	          }
+	        }
+	      }
+	    for(int y=1;y<4;y++){
+	    	if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir) != GregTech_API.sBlockCasings2) {
+	    		return false;
+             }
+	    	if (aBaseMetaTileEntity.getBlockOffset(xDir+1, y, zDir) != GregTech_API.sBlockMachines) {
+	    		return false;
+             }
+	    	if (aBaseMetaTileEntity.getBlockOffset(xDir-1, y, zDir) != GregTech_API.sBlockMachines) {
+	    		return false;
+             }
+	    	if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir+1) != GregTech_API.sBlockMachines) {
+	    		return false;
+             }
+	    	if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir-1) != GregTech_API.sBlockMachines) {
+	    		return false;
+             }
+	    	if (aBaseMetaTileEntity.getBlockOffset(xDir, y+3, zDir) != GregTech_API.sBlockMachines) {
+	    		return false;
+             }
+	    }
+		return true;
+	}
+	
+	@Override	public boolean isCorrectMachinePart(ItemStack aStack) {return true;	}
+	@Override	public int getMaxEfficiency(ItemStack aStack) {return 10000;}
+	@Override	public int getPollutionPerTick(ItemStack aStack) {return 0;	}
+	@Override	public int getDamageToComponent(ItemStack aStack) {return 0;}
+	@Override   public int getAmountOfOutputs() {return 0;}
+	@Override	public boolean explodesOnComponentBreak(ItemStack aStack) {return false;}
+
+	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
+	  {
+	    return new GT_MetaTileEntity_AdvMiner2(this.mName);
+	  }
+
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
new file mode 100644
index 0000000000..fcfdbfc104
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
@@ -0,0 +1,214 @@
+package gregtech.common.tileentities.machines.multi;
+
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.ChunkPosition;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import gregtech.GT_Mod;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Textures;
+import gregtech.api.gui.GT_GUIContainer_MultiMachine;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.blocks.GT_Block_Reinforced;
+
+public class GT_MetaTileEntity_Charcoal_Pit  extends GT_MetaTileEntity_MultiBlockBase{
+
+	private boolean running = false;
+	public GT_MetaTileEntity_Charcoal_Pit(int aID, String aName, String aNameRegional)
+	  {
+	    super(aID, aName, aNameRegional);
+	  }
+	  
+	  public GT_MetaTileEntity_Charcoal_Pit(String aName)
+	  {
+	    super(aName);
+	  }
+	  
+	  public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
+	  {
+	    return new GT_MetaTileEntity_Charcoal_Pit(this.mName);
+	  }
+	  
+	  public String[] getDescription()
+	  {
+	    return new String[] { "Charcoal pit controller",
+	    		"Place on top of a pile of wood logs",
+	    		"Maximum size of logs below 11x5x11",
+	    		"Each log only can have other logs,", 
+	    		"dirt or grass on its sides or above",
+	    		"or only logs or bricks below",
+	    		"Turns logs into Brittle Charcoal blocks"};
+	  }
+	  
+	  public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)
+	  {
+		  if (aSide == 1) {
+		      return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[10], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER) };
+		    }
+	    return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[10] };
+	  }
+	  
+	  public GT_Recipe.GT_Recipe_Map getRecipeMap()
+	  {
+	    return null;
+	  }
+	  
+		@Override
+		public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+			if (aBaseMetaTileEntity.isClientSide()) return true;
+			
+			return true;
+		}
+	  
+	  public boolean isCorrectMachinePart(ItemStack aStack)
+	  {
+	    return true;
+	  }
+	  
+	  public boolean isFacingValid(byte aFacing)
+	  {
+	    return aFacing > 1;
+	  }
+	  
+	  public boolean checkRecipe(ItemStack aStack)
+	  {
+		  if(!checkRecursiveBlocks()){
+			  return false;
+		  }
+		  
+		  if(mEfficiency==0){
+		  this.mEfficiency = 10000;
+	      this.mEfficiencyIncrease = 10000; 
+	      this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+	      return true;
+	      }else{
+	    	  this.mEfficiency=0;
+	    	  this.mEfficiencyIncrease = 0;
+	    	  this.mMaxProgresstime = 0;
+	      }
+	    return false;
+	  }
+	  
+	  private boolean checkRecursiveBlocks(){
+		  ArrayList<ChunkPosition> tList1 = new ArrayList();
+		  ArrayList<ChunkPosition> tList2 = new ArrayList();
+		  
+		 Block tBlock = this.getBaseMetaTileEntity().getBlockOffset(0, -1, 0);
+		 if(tBlock!=Blocks.log&&tBlock!=Blocks.log2){
+			 return false;
+		 }else{
+			 tList2.add(new ChunkPosition(0,-1,0));//this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord()-1, this.getBaseMetaTileEntity().getZCoord()));
+		 }
+		  while(!tList2.isEmpty()){
+			  ChunkPosition tPos= (ChunkPosition) tList2.get(0);
+			  tList2.remove(0);
+			  if(!checkAllBlockSides(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ, tList1, tList2)){
+				  return false;
+			  }
+		  }
+		  if(running){
+			  for(ChunkPosition tPos : tList1){
+				  if(this.getBaseMetaTileEntity().getBlockOffset(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ)==Blocks.log)
+				  this.getBaseMetaTileEntity().getWorld().setBlock(this.getBaseMetaTileEntity().getXCoord()+tPos.chunkPosX, this.getBaseMetaTileEntity().getYCoord()+tPos.chunkPosY, this.getBaseMetaTileEntity().getZCoord()+tPos.chunkPosZ, GregTech_API.sBlockReinforced, 4, 3);
+			  }
+			  running = false;
+			  return false;
+		  }else{
+			  this.mMaxProgresstime = (int) Math.sqrt(tList1.size()* 240000);
+		  }
+		  running = true;  
+		  return true;
+	  }
+	  private boolean p1,p2,p3,p4,p5,p6;	  
+	  private boolean checkAllBlockSides(int aX, int aY, int aZ, ArrayList<ChunkPosition> aList1, ArrayList<ChunkPosition> aList2){
+		  p1=false;p2=false;p3=false;p4=false;p5=false;p6=false;
+		  Block tBlock = this.getBaseMetaTileEntity().getBlockOffset(aX +1, aY, aZ);
+		  if(aX+1<6&&(tBlock==Blocks.log||tBlock==Blocks.log2)){
+			 if(!aList1.contains(new ChunkPosition(aX +1, aY, aZ))&&(!aList2.contains(new ChunkPosition(aX +1, aY, aZ))))p1=true;
+		  }else if(!(tBlock==Blocks.dirt||tBlock==Blocks.grass)){return false;}
+		  
+		  tBlock = this.getBaseMetaTileEntity().getBlockOffset(aX -1, aY, aZ);
+		  if(aX-1>-6&&(tBlock==Blocks.log||tBlock==Blocks.log2)){
+			 if(!aList1.contains(new ChunkPosition(aX -1, aY, aZ))&&(!aList2.contains(new ChunkPosition(aX -1, aY, aZ))))p2=true;
+		  }else if(!(tBlock==Blocks.dirt||tBlock==Blocks.grass)){return false;}
+		  
+		  tBlock = this.getBaseMetaTileEntity().getBlockOffset(aX , aY+1, aZ);
+		  if(aY+1<1&&(tBlock==Blocks.log||tBlock==Blocks.log2)){
+			 if(!aList1.contains(new ChunkPosition(aX, aY+1, aZ))&&(!aList2.contains(new ChunkPosition(aX, aY+1, aZ))))p3=true;
+		  }else if(!(tBlock==Blocks.dirt||tBlock==Blocks.grass||(aX==0&&aY==-1&&aZ==0&&tBlock==GregTech_API.sBlockMachines))){return false;}
+		  
+		  tBlock = this.getBaseMetaTileEntity().getBlockOffset(aX, aY-1, aZ);
+		  if(aY-1>-6&&(tBlock==Blocks.log||tBlock==Blocks.log2)){
+			 if(!aList1.contains(new ChunkPosition(aX, aY-1, aZ))&&(!aList2.contains(new ChunkPosition(aX, aY-1, aZ))))p4=true;
+		  }else if(tBlock!=Blocks.brick_block){return false;}
+		  
+		  tBlock = this.getBaseMetaTileEntity().getBlockOffset(aX, aY, aZ+1);
+		  if(aZ+1<6&&(tBlock==Blocks.log||tBlock==Blocks.log2)){
+			 if(!aList1.contains(new ChunkPosition(aX, aY, aZ+1))&&(!aList2.contains(new ChunkPosition(aX, aY, aZ+1))))p5=true;
+		  }else if(!(tBlock==Blocks.dirt||tBlock==Blocks.grass)){return false;}
+		  
+		  tBlock = this.getBaseMetaTileEntity().getBlockOffset(aX, aY, aZ-1);
+		  if(aZ-1>-6&&(tBlock==Blocks.log||tBlock==Blocks.log2)){
+			 if(!aList1.contains(new ChunkPosition(aX, aY, aZ-1))&&(!aList2.contains(new ChunkPosition(aX, aY, aZ-1))))p6=true;
+		  }else if(!(tBlock==Blocks.dirt||tBlock==Blocks.grass)){return false;}
+		  aList1.add(new ChunkPosition(aX,aY,aZ));
+		  if(p1)aList2.add(new ChunkPosition(aX+1,aY,aZ));
+		  if(p2)aList2.add(new ChunkPosition(aX-1,aY,aZ));
+		  if(p3)aList2.add(new ChunkPosition(aX,aY+1,aZ));
+		  if(p4)aList2.add(new ChunkPosition(aX,aY-1,aZ));
+		  if(p5)aList2.add(new ChunkPosition(aX,aY,aZ+1));
+		  if(p6)aList2.add(new ChunkPosition(aX,aY,aZ-1));
+		  return true;
+	  }
+	  
+	  public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack)
+	  {
+		mWrench = true;
+		mScrewdriver = true;
+		mSoftHammer = true;
+		mHardHammer = true;
+		mSolderingTool = true;
+		mCrowbar = true;	  
+	    return true;
+	  }
+	  
+	  public int getMaxEfficiency(ItemStack aStack)
+	  {
+	    return 10000;
+	  }
+	  
+	  public int getPollutionPerTick(ItemStack aStack)
+	  {
+	    return 0;
+	  }
+	  
+	  public int getDamageToComponent(ItemStack aStack)
+	  {
+	    return 0;
+	  }
+	  
+	  public int getAmountOfOutputs()
+	  {
+	    return 1;
+	  }
+	  
+	  public boolean explodesOnComponentBreak(ItemStack aStack)
+	  {
+	    return false;
+	  }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
index 632cdcbd6f..7386e74ed8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
@@ -16,7 +16,6 @@ import gregtech.api.util.GT_Utility;
 
 import java.util.ArrayList;
 
-import scala.actors.threadpool.Arrays;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -43,7 +42,14 @@ public class GT_MetaTileEntity_DistillationTower
   
   public String[] getDescription()
   {
-    return new String[] { "Controller Block for the Distillation Tower", "Size: 3x6x3 (Hollow)", "Controller (front bottom)", "1x Input Hatch (bottom)", "5x Output Hatch (one each height level besides botton)","1x Output Bus (Botton)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Clean Stainless Steel Casings for the rest (26 at least!)" };
+    return new String[] { 
+    		"Controller Block for the Distillation Tower", 
+    		"Size: 3x6x3 (Hollow)", "Controller (front bottom)", 
+    		"1x Input Hatch (bottom)", 
+    		"5x Output Hatch (one each height level besides botton)",
+    		"1x Output Bus (Botton)", "1x Energy Hatch (anywhere)", 
+    		"1x Maintenance Hatch (anywhere)", 
+    		"Clean Stainless Steel Casings for the rest (26 at least!)" };
   }
   
   public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
index 9a835e625f..e25cfc08f2 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
@@ -60,11 +60,11 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
 
 	@Override
 	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-		return new GT_GUIContainer_FusionReactor(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "FusionComputer.png");
+		return new GT_GUIContainer_FusionReactor(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "FusionComputer.png", GT_Recipe.GT_Recipe_Map.sFusionRecipes.mNEIName);
 	}
 
 	public abstract MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity);
-
+	
 	public boolean allowCoverOnSide(byte aSide, GT_ItemStack aStack) {
 		
 		return aSide != getBaseMetaTileEntity().getFrontFacing();
@@ -283,7 +283,6 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
 				return false;
 			}
 			if (mRunningOnLoad||tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[] {})) {
-				if(mRunningOnLoad)System.out.println("First Recipe!");
 				this.mLastRecipe = tRecipe;
 				this.mEUt = (this.mLastRecipe.mEUt * overclock(this.mLastRecipe.mSpecialValue));
 				this.mMaxProgresstime = this.mLastRecipe.mDuration / overclock(this.mLastRecipe.mSpecialValue);
@@ -363,7 +362,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
 								mMaxProgresstime = 0;
 								mEfficiencyIncrease = 0;
 								if (mOutputFluids != null && mOutputFluids.length > 0) {
-									GT_Mod.instance.achievements.issueAchivementHatchFluid(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), mOutputFluids[0]);
+									try{GT_Mod.instance.achievements.issueAchivementHatchFluid(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), mOutputFluids[0]);}catch(Exception e){}
 								}
 								this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU();
 								if (aBaseMetaTileEntity.isAllowedToWork())
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java
index 3c23afcbb5..924695b54f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java
@@ -44,7 +44,7 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC
 	public Block getCasing() {
 		return GregTech_API.sBlockCasings1;
 	}
-
+	
 	@Override
 	public IIconContainer getIconOverlay() {
 		return Textures.BlockIcons.OVERLAY_FUSION1;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java
index d101875ba2..cd0790ba91 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java
@@ -44,7 +44,6 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC
 	public Block getCasing() {
 		return GregTech_API.sBlockCasings4;
 	}
-
 	@Override
 	public IIconContainer getIconOverlay() {
 		return Textures.BlockIcons.OVERLAY_FUSION2;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java
index b7334bd449..6aabc38cb8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java
@@ -44,11 +44,9 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC
 	public Block getCasing() {
 		return GregTech_API.sBlockCasings4;
 	}
-
 	@Override
 	public IIconContainer getIconOverlay() {
 		return Textures.BlockIcons.OVERLAY_FUSION3;
 	}
-
 }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
index 3a6a51fa46..446c52f460 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
@@ -30,6 +30,7 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 
 public class GT_MetaTileEntity_HeatExchanger extends GT_MetaTileEntity_MultiBlockBase{
+	
 	  public GT_MetaTileEntity_HeatExchanger(int aID, String aName, String aNameRegional)
 	  {
 	    super(aID, aName, aNameRegional);
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
index df129f8fd7..2657bddbb4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
@@ -94,7 +94,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler
         tFluid.amount = 1000;

         if (depleteInput(tFluid))

         {

-          this.mMaxProgresstime = (tRecipe.mSpecialValue / 2);

+          this.mMaxProgresstime = (runtimeBoost(tRecipe.mSpecialValue / 2));

           this.mEUt = getEUt();

           this.mEfficiencyIncrease = (this.mMaxProgresstime * getEfficiencyIncrease() * 4);

           return true;

@@ -109,7 +109,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler
         tFluid.amount = 1000;

         if (depleteInput(tFluid))

         {

-          this.mMaxProgresstime = Math.max(1, tRecipe.mSpecialValue * 2);

+          this.mMaxProgresstime = Math.max(1, runtimeBoost(tRecipe.mSpecialValue * 2));

           this.mEUt = getEUt();

           this.mEfficiencyIncrease = (this.mMaxProgresstime * getEfficiencyIncrease());

           return true;

@@ -119,7 +119,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler
     ArrayList<ItemStack> tInputList = getStoredInputs();

     if (!tInputList.isEmpty()) {

       for (ItemStack tInput : tInputList) {

-        if ((GT_Utility.getFluidForFilledItem(tInput, true) == null) && ((this.mMaxProgresstime = GT_ModHandler.getFuelValue(tInput) / 80) > 0))

+        if ((GT_Utility.getFluidForFilledItem(tInput, true) == null) && ((this.mMaxProgresstime = runtimeBoost(GT_ModHandler.getFuelValue(tInput) / 80)) > 0))

         {

           this.mEUt = getEUt();

           this.mEfficiencyIncrease = (this.mMaxProgresstime * getEfficiencyIncrease());

@@ -135,14 +135,16 @@ public abstract class GT_MetaTileEntity_LargeBoiler
     return false;

   }

   

+  abstract int runtimeBoost(int mTime);

+  

   public boolean onRunningTick(ItemStack aStack)

   {

     if (this.mEUt > 0)

     {

       int tGeneratedEU = (int)(this.mEUt * 2L * this.mEfficiency / 10000L);

       if (tGeneratedEU > 0) {

-      	long amount = (tGeneratedEU + 160) / 160;

-        if (depleteInput(Materials.Water.getFluid(amount)) || depleteInput(GT_ModHandler.getDistilledWater(amount))) {

+    	  long amount = (tGeneratedEU + 160) / 160;

+    	  if (depleteInput(Materials.Water.getFluid(amount)) || depleteInput(GT_ModHandler.getDistilledWater(amount))) {

           addOutput(GT_ModHandler.getSteam(tGeneratedEU));

         } else {

           explodeMultiblock();

@@ -258,12 +260,8 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
   }

 }

 

-

-

-/* Location:           F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar

-

- * Qualified Name:     gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler

-

- * JD-Core Version:    0.7.0.1

-

- */

+


+/* Location:           F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar


+ * Qualified Name:     gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler


+ * JD-Core Version:    0.7.0.1


+ */
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
index c0c362d2c5..8d88995a61 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
@@ -72,6 +72,11 @@ public class GT_MetaTileEntity_LargeBoiler_Bronze
   {

     return 16;

   }

+

+@Override

+int runtimeBoost(int mTime) {

+	return mTime * 2;

+}

 }

 

 


diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
index c6f16a7d4f..b1cdc312f3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
@@ -72,6 +72,11 @@ public class GT_MetaTileEntity_LargeBoiler_Steel
   {

     return 12;

   }

+  

+  @Override

+  int runtimeBoost(int mTime) {

+  	return mTime * 150 /100;

+  }

 }

 

 


diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java
index 7d11836a19..9f18d77ec7 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java
@@ -1,75 +1,80 @@
-package gregtech.common.tileentities.machines.multi;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import net.minecraft.block.Block;

-

-public class GT_MetaTileEntity_LargeBoiler_Titanium

-  extends GT_MetaTileEntity_LargeBoiler

-{

-  public GT_MetaTileEntity_LargeBoiler_Titanium(int aID, String aName, String aNameRegional)

-  {

-    super(aID, aName, aNameRegional);

-  }

-  

-  public GT_MetaTileEntity_LargeBoiler_Titanium(String aName)

-  {

-    super(aName);

-  }

-  

-  public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

-  {

-    return new GT_MetaTileEntity_LargeBoiler_Titanium(this.mName);

-  }

-  

-  public Block getCasingBlock()

-  {

-    return GregTech_API.sBlockCasings4;

-  }

-  

-  public byte getCasingMeta()

-  {

-    return 2;

-  }

-  

-  public byte getCasingTextureIndex()

-  {

-    return 50;

-  }

-  

-  public Block getPipeBlock()

-  {

-    return GregTech_API.sBlockCasings2;

-  }

-  

-  public byte getPipeMeta()

-  {

-    return 14;

-  }

-  

-  public Block getFireboxBlock()

-  {

-    return GregTech_API.sBlockCasings4;

-  }

-  

-  public byte getFireboxMeta()

-  {

-    return 3;

-  }

-  

-  public byte getFireboxTextureIndex()

-  {

-    return 51;

-  }

-  

-  public int getEUt()

-  {

-    return 800;

-  }

-  

-  public int getEfficiencyIncrease()

-  {

-    return 8;

-  }

+package gregtech.common.tileentities.machines.multi;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.block.Block;
+
+public class GT_MetaTileEntity_LargeBoiler_Titanium
+  extends GT_MetaTileEntity_LargeBoiler
+{
+  public GT_MetaTileEntity_LargeBoiler_Titanium(int aID, String aName, String aNameRegional)
+  {
+    super(aID, aName, aNameRegional);
+  }
+  
+  public GT_MetaTileEntity_LargeBoiler_Titanium(String aName)
+  {
+    super(aName);
+  }
+  
+  public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
+  {
+    return new GT_MetaTileEntity_LargeBoiler_Titanium(this.mName);
+  }
+  
+  public Block getCasingBlock()
+  {
+    return GregTech_API.sBlockCasings4;
+  }
+  
+  public byte getCasingMeta()
+  {
+    return 2;
+  }
+  
+  public byte getCasingTextureIndex()
+  {
+    return 50;
+  }
+  
+  public Block getPipeBlock()
+  {
+    return GregTech_API.sBlockCasings2;
+  }
+  
+  public byte getPipeMeta()
+  {
+    return 14;
+  }
+  
+  public Block getFireboxBlock()
+  {
+    return GregTech_API.sBlockCasings4;
+  }
+  
+  public byte getFireboxMeta()
+  {
+    return 3;
+  }
+  
+  public byte getFireboxTextureIndex()
+  {
+    return 51;
+  }
+  
+  public int getEUt()
+  {
+    return 800;
+  }
+  
+  public int getEfficiencyIncrease()
+  {
+    return 8;
+  }
+  
+  @Override
+  int runtimeBoost(int mTime) {
+  	return mTime * 130 /100;
+  }
 }
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
index 399ba2dcf4..2e583f1cf5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
@@ -72,6 +72,12 @@ public class GT_MetaTileEntity_LargeBoiler_TungstenSteel
   {

     return 4;

   }

+  

+  @Override

+  int runtimeBoost(int mTime) {

+  	return mTime * 120 /100;

+  }

+  

 }

 

 


diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
index d8b765c82a..9bc636a95b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
@@ -157,7 +157,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M
 	        if (mEUt <= 0) {
 	
 //	            this.mEfficiencyIncrease = (-10);
-	        	this.mEfficiency = 0;
+	            this.mEfficiency = 0;
 	            //stopMachine();
 	            return false;
 	        } else {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
index d57aa52db8..bbf4df7c32 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
@@ -75,7 +75,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
                 if(!achievement){
                 	try{GT_Mod.instance.achievements.issueAchievement(this.getBaseMetaTileEntity().getWorld().getPlayerEntityByName(this.getBaseMetaTileEntity().getOwnerName()), "efficientsteam");}catch(Exception e){}
                 	achievement=true;
-                }
+                	}
             }
         }
         
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
index 5b7ea5c362..bab1efcd54 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
@@ -6,7 +6,6 @@ import java.util.Collection;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
-import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -71,7 +70,8 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
 		
     @Override
     int fluidIntoPower(ArrayList<FluidStack> aFluids, int aOptFlow, int aBaseEff) {
-        aOptFlow *= 20;
+
+        aOptFlow *= 40;
         int tEU = 0;
 
         int actualOptimalFlow = 0;
@@ -80,6 +80,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
             FluidStack firstFuelType = new FluidStack(aFluids.get(0), 0); // Identify a SINGLE type of fluid to process.  Doesn't matter which one. Ignore the rest!
             int fuelValue = getFuelValue(firstFuelType);
             actualOptimalFlow = (int) ((aOptFlow + fuelValue -1 )/ fuelValue);
+
             int remainingFlow = (int) (actualOptimalFlow * 1.25f); // Allowed to use up to 125% of optimal flow.  Variable required outside of loop for multi-hatch scenarios.
             int flow = 0;
             int totalFlow = 0;
@@ -105,6 +106,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
             } else {
                 tEU = tEU * aBaseEff / 10000;
             }
+
             return tEU;
 
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
index 7a3f45037a..d49c5a67f8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
@@ -64,8 +64,8 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
 			   water = water - (int)usage;
 			   return  usage;
 		}
-	
-	private boolean achievement = false;
+		
+		private boolean achievement = false;
 		
     @Override
     int fluidIntoPower(ArrayList<FluidStack> aFluids, int aOptFlow, int aBaseEff) {
@@ -77,15 +77,15 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
         for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) { // loop through each hatch; extract inputs and track totals.
         	 String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i));
         	 if (fluidName.equals("fluid.steam") || fluidName.equals("ic2.fluidSteam") || fluidName.equals("fluid.mfr.steam.still.name")) {
-        	                    flow = aFluids.get(i).amount; // Get all (steam) in hatch
+        	 flow = aFluids.get(i).amount; // Get all (steam) in hatch
                 flow = Math.min(flow, Math.min(remainingFlow, (int) (aOptFlow * 1.25f))); // try to use up to 125% of optimal flow w/o exceeding remainingFlow
                 depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount
                 remainingFlow -= flow; // track amount we're allowed to continue depleting from hatches
                 totalFlow += flow; // track total input used
                 if(!achievement){
                 	try{GT_Mod.instance.achievements.issueAchievement(this.getBaseMetaTileEntity().getWorld().getPlayerEntityByName(this.getBaseMetaTileEntity().getOwnerName()), "muchsteam");}catch(Exception e){}
-                	achievement=true;
-                }
+                		achievement=true;
+                	}
             }
         }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
new file mode 100644
index 0000000000..246ba2e716
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
@@ -0,0 +1,241 @@
+package gregtech.common.tileentities.machines.multi;
+
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+
+public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBase {
+
+	public GT_MetaTileEntity_OilCracker(int aID, String aName, String aNameRegional) {
+		super(aID, aName, aNameRegional);
+	}
+
+	public GT_MetaTileEntity_OilCracker(String aName) {
+		super(aName);
+	}
+
+	public String[] getDescription() {
+		return new String[] { 
+				"Controller Block for the Oil Cracking Unit", 
+				"Cracks heavy oil into lighter parts", 
+				"Size: 3 high, 3 deep, 5 wide", 
+				"Controller (front center)",
+				"Made from Clean Stainless Steel Casings (18 at least!)",
+				"On both sides of the Controller each",
+				"a ring of 8 Cupronickel Coils",
+				"2 Blocks left Input Hatch and 8 Casings",
+				"2 Blocks right Output Hatch and 8 Casings",
+				"beween coils: Controller, second input Hatch",
+				"Maintainance Hatch and Energy Hatch"};
+	}
+
+	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+		if (aSide == aFacing) {
+			return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[49],
+					new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER) };
+		}
+		return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[49] };
+	}
+
+	@Override
+	public boolean checkRecipe(ItemStack aStack) {
+	    ArrayList<FluidStack> tInputList = getStoredFluids();
+	    for (FluidStack tInput : tInputList)
+	    {
+	      long tVoltage = getMaxInputVoltage();
+	      byte tTier = (byte)Math.max(1, GT_Utility.getTier(tVoltage));
+	      
+	      GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sCrakingRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], new FluidStack[] { tInput }, new ItemStack[]{});
+	      if (tRecipe != null) {
+	        if (tRecipe.isRecipeInputEqual(true, new FluidStack[] { tInput }, new ItemStack[]{}))
+	        {
+	        	boolean steam=false;boolean hydrogen = false;
+	        	for(FluidStack tInput2: tInputList){
+	        		if(tInput2.getFluid()==GT_ModHandler.getSteam(1).getFluid()){steam=true;tInput2.amount -=64;}
+	        		if(tInput2.getFluid()==Materials.Hydrogen.mGas){hydrogen=true;steam=false;tInput2.amount -=64;}
+	        		
+	        	}
+	        	
+	          this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
+	          this.mEfficiencyIncrease = 10000;
+	          if (tRecipe.mEUt <= 16)
+	          {
+	            this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1));
+	            this.mMaxProgresstime = (tRecipe.mDuration / (1 << tTier - 1));
+	          }
+	          else
+	          {
+	            this.mEUt = tRecipe.mEUt;
+	            this.mMaxProgresstime = tRecipe.mDuration;
+	            while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)])
+	            {
+	              this.mEUt *= 4;
+	              this.mMaxProgresstime /= 2;
+	            }
+	          }
+	          if(steam)this.mEUt = this.mEUt*66/100;
+	          if (this.mEUt > 0) {
+	            this.mEUt = (-this.mEUt);
+	          }
+	          this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+	          this.mOutputFluids = new FluidStack[] { tRecipe.getFluidOutput(0) };
+	          if(hydrogen)this.mOutputFluids[0].amount=this.mOutputFluids[0].amount*130/100;
+	          return true;
+	        }
+	      }
+	    }
+	    return false;
+	  }
+
+	@Override
+	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+		int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
+		int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
+		int amount = 0;
+		if(xDir!=0){
+		for (int i = -1; i < 2; i++) {// xDirection
+			for (int j = -1; j < 2; j++) {// height
+				for (int h = -2; h < 3; h++) {
+					if (!(j == 0 && i == 0 && (h == -1 || h == 0 || h == 1))) {
+						if (h == 1 || h == -1) {
+							IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, j, h + zDir);
+							if (aBaseMetaTileEntity.getBlockOffset(xDir + i, j, h + zDir) != GregTech_API.sBlockCasings1) {
+								return false;
+							}
+							if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, j, h + zDir) != 12) {
+								return false;
+							}
+						}
+						if (h == 2||h==-2) {
+							IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, j, h + zDir);
+							boolean tSide = ((aBaseMetaTileEntity.getBackFacing()==4&&2==h)||(aBaseMetaTileEntity.getBackFacing()==5&&-2==h));
+							if ( tSide ? !addInputToMachineList(tTileEntity, 49) : !addOutputToMachineList(tTileEntity, 49)) {
+								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, j, h + zDir) != GregTech_API.sBlockCasings4) {
+									return false;
+								}
+								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, j, h + zDir) != 1) {
+									return false;
+								}
+								amount++;
+							}
+						}
+						if (h == 0) {
+							IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, j, h + zDir);
+							if ((!addMaintenanceToMachineList(tTileEntity, 49)) && (!addInputToMachineList(tTileEntity, 49))
+									&& (!addEnergyInputToMachineList(tTileEntity, 49))) {
+								if (!((xDir + i) == 0 && j == 0 && (h + zDir) == 0)) {
+									if (aBaseMetaTileEntity.getBlockOffset(xDir + i, j, h + zDir) != GregTech_API.sBlockCasings4) {
+										return false;
+									}
+									if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, j, h + zDir) != 1) {
+										return false;
+									}
+									amount++;
+								}
+							}
+						}
+
+					}
+				}
+			}
+		}
+		}else{
+			for (int i = -1; i < 2; i++) {// zDirection
+				for (int j = -1; j < 2; j++) {// height
+					for (int h = -2; h < 3; h++) {
+						if (!(j == 0 && i == 0 && (h == -1 || h == 0 || h == 1))) {
+							if (h == 1 || h == -1) {
+								IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + h, j, i + zDir);
+								if (aBaseMetaTileEntity.getBlockOffset(xDir + h, j, i + zDir) != GregTech_API.sBlockCasings1) {
+									return false;
+								}
+								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + h, j, i + zDir) != 12) {
+									return false;
+								}
+							}
+							if (h == 2||h==-2) {
+								IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + h, j, i + zDir);
+								boolean tSide = (aBaseMetaTileEntity.getBackFacing()==h||(aBaseMetaTileEntity.getBackFacing()==3&&-2==h));
+								if ( tSide ? !addOutputToMachineList(tTileEntity, 49) : !addInputToMachineList(tTileEntity, 49)) {
+									if (aBaseMetaTileEntity.getBlockOffset(xDir + h, j, i + zDir) != GregTech_API.sBlockCasings4) {
+										return false;
+									}
+									if (aBaseMetaTileEntity.getMetaIDOffset(xDir + h, j, i + zDir) != 1) {
+										return false;
+									}
+									amount++;
+								}
+							}
+							if (h == 0) {
+								IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + h, j, i + zDir);
+								if ((!addMaintenanceToMachineList(tTileEntity, 49)) && (!addInputToMachineList(tTileEntity, 49))
+										&& (!addEnergyInputToMachineList(tTileEntity, 49))) {
+									if (!((xDir + h) == 0 && j == 0 && (i + zDir) == 0)) {
+										if (aBaseMetaTileEntity.getBlockOffset(xDir + h, j, i + zDir) != GregTech_API.sBlockCasings4) {
+											return false;
+										}
+										if (aBaseMetaTileEntity.getMetaIDOffset(xDir + h, j, i + zDir) != 1) {
+											return false;
+										}
+										amount++;
+									}
+								}
+							}
+
+						}
+					}
+				}
+			}	
+		}
+		if(amount<19)return false;
+		return true;
+	}
+
+	@Override
+	public boolean isCorrectMachinePart(ItemStack aStack) {
+		return true;
+	}
+
+	@Override
+	public int getMaxEfficiency(ItemStack aStack) {
+		return 10000;
+	}
+
+	@Override
+	public int getPollutionPerTick(ItemStack aStack) {
+		return 0;
+	}
+
+	@Override
+	public int getDamageToComponent(ItemStack aStack) {
+		return 0;
+	}
+
+	@Override
+	public int getAmountOfOutputs() {
+		return 0;
+	}
+
+	@Override
+	public boolean explodesOnComponentBreak(ItemStack aStack) {
+		return false;
+	}
+
+	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_OilCracker(this.mName);
+	}
+
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
new file mode 100644
index 0000000000..930ee98238
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
@@ -0,0 +1,208 @@
+package gregtech.common.tileentities.machines.multi;
+
+import static gregtech.api.enums.GT_Values.V;
+
+import java.util.ArrayList;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
+
+public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase{
+
+	public GT_MetaTileEntity_OilDrill(int aID, String aName, String aNameRegional)
+	  {
+	    super(aID, aName, aNameRegional);
+	  }
+	  
+	  public GT_MetaTileEntity_OilDrill(String aName)
+	  {
+	    super(aName);
+	  }
+	  
+	  public String[] getDescription()
+	  {
+	    return new String[] { 
+	    		"Controller Block for the Oil Drilling Rig", 
+	    		"Size: 3x7x3", "Controller (front middle at bottom)", 
+	    		"3x3 Base of Solid Steel Casings", 
+	    		"Also part of Base: Energy Input Hatch",
+	    		"Fluid Output Hatch and Maintainance Hatch", 
+	    		"3x Solid Steel Casings on top the Center of the base",
+	    		"Steel Frame Boxes on each side and 3 more on top"};
+	  }
+
+	  public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)
+	  {
+	    if (aSide == aFacing) {
+	      return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[16], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER) };
+	    }
+	    return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[16] };
+	  }
+	private boolean completedCycle = false;
+	
+	@Override
+	public boolean checkRecipe(ItemStack aStack) {
+		if(mInventory[1]==null||(mInventory[1].isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L)) && mInventory[1].stackSize<mInventory[1].getMaxStackSize())){
+			ArrayList<ItemStack> tItems = getStoredInputs();
+			for(ItemStack tStack : tItems){
+				if(tStack.isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L))){
+					if(tStack.stackSize<2){
+						tStack = null;
+					}else{tStack.stackSize--;}
+					
+				}
+				if(mInventory[1]==null){
+					mInventory[1] = GT_ModHandler.getIC2Item("miningPipe", 1L);
+				}else{
+				mInventory[1].stackSize++;}
+			}
+		}
+		FluidStack tFluid = GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getZCoord());
+		if(tFluid==null){
+			return false;
+		}
+		if(getBaseMetaTileEntity().getBlockOffset(ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX, getYOfPumpHead()-1-getBaseMetaTileEntity().getYCoord(), ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ)!=Blocks.bedrock){
+			if(completedCycle){moveOneDown();}
+			tFluid=null;
+			if(mEnergyHatches.size()>0&&mEnergyHatches.get(0).getEUVar()>(512+getMaxInputVoltage()*4))completedCycle=true;
+		}else if(tFluid.amount<5000){
+			return false;
+		}else{tFluid.amount = tFluid.amount/5000;}
+		long tVoltage = getMaxInputVoltage();
+		byte tTier = (byte)Math.max(1, GT_Utility.getTier(tVoltage));
+		this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
+        this.mEfficiencyIncrease = 10000;
+        int tEU = 24;
+        int tDuration = 160;
+        if (tEU <= 16)
+        {
+          this.mEUt = (tEU * (1 << tTier - 1) * (1 << tTier - 1));
+          this.mMaxProgresstime = (tDuration / (1 << tTier - 1));
+        }
+        else
+        {
+          this.mEUt = tEU;
+          this.mMaxProgresstime = tDuration;
+          while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)])
+          {
+            this.mEUt *= 4;
+            this.mMaxProgresstime /= 2;
+          }
+        }
+        if (this.mEUt > 0) {
+          this.mEUt = (-this.mEUt);
+        }
+        this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+        this.mOutputFluids = new FluidStack[] { tFluid };
+		return true;
+	}
+
+	private boolean moveOneDown() {
+		if ((this.mInventory[1] == null) || (this.mInventory[1].stackSize < 1)
+				|| (!GT_Utility.areStacksEqual(this.mInventory[1], GT_ModHandler.getIC2Item("miningPipe", 1L)))) {
+			return false;
+		}
+		int xDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX;int zDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ;
+		int yHead = getYOfPumpHead();
+		if (yHead <= 0) {
+			return false;
+		}
+		if(getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord()+xDir, yHead-1, getBaseMetaTileEntity().getZCoord()+zDir) == Blocks.bedrock){
+			return false;
+		}
+		if (!(getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord()+xDir, yHead - 1, getBaseMetaTileEntity().getZCoord()+zDir,GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))))) {
+			return false;
+		}
+		if (yHead != getBaseMetaTileEntity().getYCoord()) {
+			getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord()+xDir, yHead, getBaseMetaTileEntity().getZCoord()+zDir,GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L)));
+		}
+		getBaseMetaTileEntity().decrStackSize(1, 1);
+		return true;
+	}
+
+	private int getYOfPumpHead() {
+		int xDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX;int zDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ;
+		int y = getBaseMetaTileEntity().getYCoord() - 1;
+		while (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord()+xDir, y, getBaseMetaTileEntity().getZCoord()+zDir) == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L))) {
+			y--;
+		}
+		if (y == getBaseMetaTileEntity().getYCoord() - 1) {
+			if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord()+xDir, y, getBaseMetaTileEntity().getZCoord()+zDir) != GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))) {
+				return y + 1;
+			}
+		} else if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord()+xDir, y, getBaseMetaTileEntity().getZCoord()+zDir) != GT_Utility
+				.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))&&this.mInventory[1] != null&&this.mInventory[1].stackSize>0&&GT_Utility.areStacksEqual(this.mInventory[1], GT_ModHandler.getIC2Item("miningPipe", 1L))) {
+ 			getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord()+xDir, y, getBaseMetaTileEntity().getZCoord()+zDir,
+ 					GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L)));
+			getBaseMetaTileEntity().decrStackSize(0, 1);
+		}
+		return y;
+	}
+	
+	@Override
+	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity,ItemStack aStack) {
+		int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
+	    for (int i = -1; i < 2; i++) {
+	        for (int j = -1; j < 2; j++) {
+	          if ((xDir + i != 0) || (zDir + j != 0))
+	          {
+	            IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 0, zDir + j);
+	            if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16)) && (!addOutputToMachineList(tTileEntity, 16)) && (!addEnergyInputToMachineList(tTileEntity, 16)))
+	            {
+	              if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j) != GregTech_API.sBlockCasings2) {
+	            	  return false;
+	              }
+	              if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 0, zDir + j) != 0) {
+	            	  return false;
+	              }
+	            }
+	          }
+	        }
+	      }
+	    for(int y=1;y<4;y++){
+	    	if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir) != GregTech_API.sBlockCasings2) {
+	    		return false;
+             }
+	    	if (aBaseMetaTileEntity.getBlockOffset(xDir+1, y, zDir) != GregTech_API.sBlockMachines) {
+	    		return false;
+             }
+	    	if (aBaseMetaTileEntity.getBlockOffset(xDir-1, y, zDir) != GregTech_API.sBlockMachines) {
+	    		return false;
+             }
+	    	if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir+1) != GregTech_API.sBlockMachines) {
+	    		return false;
+             }
+	    	if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir-1) != GregTech_API.sBlockMachines) {
+	    		return false;
+             }
+	    	if (aBaseMetaTileEntity.getBlockOffset(xDir, y+3, zDir) != GregTech_API.sBlockMachines) {
+	    		return false;
+             }
+	    }
+		return true;
+	}
+	
+	@Override	public boolean isCorrectMachinePart(ItemStack aStack) {return true;	}
+	@Override	public int getMaxEfficiency(ItemStack aStack) {return 10000;}
+	@Override	public int getPollutionPerTick(ItemStack aStack) {return 0;	}
+	@Override	public int getDamageToComponent(ItemStack aStack) {return 0;}
+	@Override   public int getAmountOfOutputs() {return 0;}
+	@Override	public boolean explodesOnComponentBreak(ItemStack aStack) {return false;}
+
+	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
+	  {
+	    return new GT_MetaTileEntity_OilDrill(this.mName);
+	  }
+
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
index 410eea616c..4e6c1a2e24 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
@@ -115,6 +115,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
 										}else if(tmp.startsWith("arcfurnace")){
 											return GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes;
 										}
+	 										
 				    return null;
 				  }
 				  
@@ -181,14 +182,15 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
 										this.mEUt = 0;
 										this.mOutputItems = null;
 										this.mOutputFluids = null;
-										this.mMaxProgresstime = tRecipe.mDuration;
 										int machines = Math.min(16,mInventory[1].stackSize);
-										this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
-										this.mEfficiencyIncrease = 10000;
 										int i = 0;
 										for(;i<machines;i++){
-											if(!tRecipe.isRecipeInputEqual(true, tFluids, tInputs))break;
-										}
+											if(!tRecipe.isRecipeInputEqual(true, tFluids, tInputs)){if(i==0){return false;}
+												break;}
+											}
+											this.mMaxProgresstime = tRecipe.mDuration;
+											this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
+											this.mEfficiencyIncrease = 10000;
 										      if (tRecipe.mEUt <= 16)
 										       {
 										        this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1));
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
new file mode 100644
index 0000000000..05c7a4a0ef
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
@@ -0,0 +1,171 @@
+package gregtech.common.tileentities.machines.multi;
+
+import java.util.ArrayList;
+
+import net.minecraft.block.BlockDynamicLiquid;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+
+public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlockBase {
+
+	public GT_MetaTileEntity_PyrolyseOven(int aID, String aName, String aNameRegional) {
+		super(aID, aName, aNameRegional);
+	}
+
+	public GT_MetaTileEntity_PyrolyseOven(String aName) {
+		super(aName);
+	}
+
+	public String[] getDescription() {
+		return new String[] { 
+				"Controller Block for the Pyrolyse Oven", 
+				"Industrial Charcoal producer and Oil from Plants", 
+				"Size: 5x4x5, Controller (bottom center)", 
+				"Made from ULV Machine Casings (min 60)",
+				"Bottom 3x3 Kantal Heating Coils",
+				"4 high ULV Casings around the coils",
+				"bottom row of casings are Energy Hatch",
+				"Maintainance Hatch and Output Hatch/Bus",
+				"top 3x3 has Input Hatch/Bus and Muffler Hatch"};
+	}
+
+	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+		if (aSide == aFacing) {
+			return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[0],
+					new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_LARGE_BOILER) };
+		}
+		return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[0] };
+	}
+
+	@Override
+	public boolean checkRecipe(ItemStack aStack) {
+	    ArrayList<ItemStack> tInputList = getStoredInputs();
+	    ArrayList<FluidStack> tFluidInputs = getStoredFluids();
+	    for (ItemStack tInput : tInputList)
+	    {
+	      long tVoltage = getMaxInputVoltage();
+	      byte tTier = (byte)Math.max(1, GT_Utility.getTier(tVoltage));
+	      GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sPyrolyseRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluidInputs.isEmpty() ? null :new FluidStack[]{tFluidInputs.get(0)}, new ItemStack[] { mInventory[1],tInput });
+	      if (tRecipe != null) {
+	        if (tRecipe.isRecipeInputEqual(true, tFluidInputs.isEmpty() ? null :new FluidStack[]{tFluidInputs.get(0)}, new ItemStack[] { tInput, mInventory[1] }))
+	        {
+	          this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
+	          this.mEfficiencyIncrease = 10000;
+	          
+	          this.mEUt = tRecipe.mEUt;
+	          this.mMaxProgresstime = tRecipe.mDuration;
+	            
+	          if (this.mEUt > 0) {
+	            this.mEUt = (-this.mEUt);
+	          }
+	          this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+	          if(tRecipe.mOutputs.length>0)this.mOutputItems = new ItemStack[] { tRecipe.getOutput(0) };
+	          if(tRecipe.mFluidOutputs.length>0)this.mOutputFluids = new FluidStack[] { tRecipe.getFluidOutput(0) };
+	          updateSlots();
+	          return true;
+	        }
+	      }
+	    }
+	    return false;
+	  }
+
+	@Override
+	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+		int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX*2;
+		int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ*2;
+		for (int i = -2; i < 3; i++) {
+			for (int j = -2; j < 3; j++) {
+				for (int h = 0; h < 4; h++) {
+					IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
+					if ((i != -2 && i != 2) && (j != -2 && j != 2)) {// innerer 3x3 ohne höhe
+						if (h == 0) {// innen boden (kantal coils)
+							if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings1) {
+								return false;
+							}
+							if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 13) {
+								return false;
+							}
+						} else if (h == 3) {// innen decke (ulv casings + input + muffler)
+							if ((!addInputToMachineList(tTileEntity, 120)) && (!addMufflerToMachineList(tTileEntity, 120))) {
+								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings1) {
+									return false;
+								}
+								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 0) {
+									return false;
+								}
+							}
+						} else {// innen air
+							if (!aBaseMetaTileEntity.getAir(xDir + i, h, zDir + j)) {
+								return false;
+							}
+						}
+					} else {// Außerer 5x5 ohne höhe
+						if (h == 0) {// außen boden (controller, output, energy, maintainance, rest ulv casings)
+							if ((!addMaintenanceToMachineList(tTileEntity, 120)) && (!addOutputToMachineList(tTileEntity, 120)) && (!addEnergyInputToMachineList(tTileEntity, 120))) {
+								if ((xDir + i != 0) || (zDir + j != 0)){//no controller
+								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings1) {	return false;}
+								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 0) {
+									return false;
+								}}
+							}
+						} else {// außen über boden (ulv casings)
+							if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings1) {
+								return false;
+							}
+							if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 0) {
+								return false;
+							}
+						}
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public boolean isCorrectMachinePart(ItemStack aStack) {
+		return true;
+	}
+
+	@Override
+	public int getMaxEfficiency(ItemStack aStack) {
+		return 10000;
+	}
+
+	@Override
+	public int getPollutionPerTick(ItemStack aStack) {
+		return 20;
+	}
+
+	@Override
+	public int getDamageToComponent(ItemStack aStack) {
+		return 0;
+	}
+
+	@Override
+	public int getAmountOfOutputs() {
+		return 0;
+	}
+
+	@Override
+	public boolean explodesOnComponentBreak(ItemStack aStack) {
+		return false;
+	}
+
+	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_PyrolyseOven(this.mName);
+	}
+
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java
index 6a28464ec7..fd84eab38c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java
@@ -1,132 +1,132 @@
-package gregtech.common.tileentities.machines.steam;

-

-import static gregtech.api.enums.GT_Values.V;

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.enums.Textures.BlockIcons;

-import gregtech.api.gui.GT_GUIContainer_BasicMachine;

-import gregtech.api.interfaces.ITexture;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import gregtech.api.metatileentity.MetaTileEntity;

-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;

-import gregtech.api.objects.GT_RenderedTexture;

-import gregtech.api.util.GT_ModHandler;

-import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Utility;

-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

-

-import java.util.Map;

-import java.util.Random;

-

-import net.minecraft.entity.player.InventoryPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.world.World;

-import net.minecraftforge.fluids.FluidStack;

-

-public class GT_MetaTileEntity_Macerator_Bronze

-  extends GT_MetaTileEntity_BasicMachine_Bronze

-{

-  public GT_MetaTileEntity_Macerator_Bronze(int aID, String aName, String aNameRegional)

-  {

-    super(aID, aName, aNameRegional, "Macerating your Ores", 1, 1, false);

-  }

-  

-  public GT_MetaTileEntity_Macerator_Bronze(String aName, String aDescription, ITexture[][][] aTextures)

-  {

-    super(aName, aDescription, aTextures, 1, 1, false);

-  }

-  

-  public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)

-  {

-    return new GT_GUIContainer_BasicMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "BronzeMacerator.png", "ic2.macerator");

-  }

-  

-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

-  {

-    return new GT_MetaTileEntity_Macerator_Bronze(this.mName, this.mDescription, this.mTextures);

-  }

-  

-  public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick)

-  {

-    super.onPreTick(aBaseMetaTileEntity, aTick);

-    if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive()) && (aBaseMetaTileEntity.getFrontFacing() != 1) && (aBaseMetaTileEntity.getCoverIDAtSide((byte)1) == 0) && (!aBaseMetaTileEntity.getOpacityAtSide((byte)1)))

-    {

-      Random tRandom = aBaseMetaTileEntity.getWorld().rand;

-      aBaseMetaTileEntity.getWorld().spawnParticle("smoke", aBaseMetaTileEntity.getXCoord() + 0.8F - tRandom.nextFloat() * 0.6F, aBaseMetaTileEntity.getYCoord() + 0.9F + tRandom.nextFloat() * 0.2F, aBaseMetaTileEntity.getZCoord() + 0.8F - tRandom.nextFloat() * 0.6F, 0.0D, 0.0D, 0.0D);

-    }

-  }

-  

-  public int checkRecipe()

-  {

-  	GT_Recipe_Map tMap = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;

-  	if (tMap == null) return DID_NOT_FIND_RECIPE;

-  	GT_Recipe tRecipe = tMap.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, V[1], null, null, getAllInputs());

-  	if (tRecipe == null) return DID_NOT_FIND_RECIPE;

-  	if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;

-      if (!canOutput(tRecipe)) {mOutputBlocked++; return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;}

-      if(tRecipe.getOutput(0)!=null) mOutputItems[0] = tRecipe.getOutput(0);

-      this.mEUt = 2;

-      this.mMaxProgresstime = 800;

-      getInputAt(0).stackSize-=tRecipe.mInputs[0].stackSize;

-      return FOUND_AND_SUCCESSFULLY_USED_RECIPE;

-  }

-  

-  public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)

-  {

-    if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {return false;}

-    return GT_ModHandler.getMaceratorOutput(GT_Utility.copyAmount(64L, new Object[] { aStack }), false, null) != null;

-  } 

-  

-  public void startSoundLoop(byte aIndex, double aX, double aY, double aZ)

-  {

-    super.startSoundLoop(aIndex, aX, aY, aZ);

-    if (aIndex == 1) {

-      GT_Utility.doSoundAtClient((String)GregTech_API.sSoundList.get(Integer.valueOf(201)), 10, 1.0F, aX, aY, aZ);

-    }

-  }

-  

-  public void startProcess()

-  {

-    sendLoopStart((byte)1);

-  }

-  

-  public ITexture[] getSideFacingActive(byte aColor)

-  {

-    return new ITexture[] { super.getSideFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE) };

-  }

-  

-  public ITexture[] getSideFacingInactive(byte aColor)

-  {

-    return new ITexture[] { super.getSideFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_STEAM_MACERATOR) };

-  }

-  

-  public ITexture[] getFrontFacingActive(byte aColor)

-  {

-    return new ITexture[] { super.getFrontFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE) };

-  }

-  

-  public ITexture[] getFrontFacingInactive(byte aColor)

-  {

-    return new ITexture[] { super.getFrontFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_MACERATOR) };

-  }

-  

-  public ITexture[] getTopFacingActive(byte aColor)

-  {

-    return new ITexture[] { super.getTopFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR_ACTIVE) };

-  }

-  

-  public ITexture[] getTopFacingInactive(byte aColor)

-  {

-    return new ITexture[] { super.getTopFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR) };

-  }

-  

-  public ITexture[] getBottomFacingActive(byte aColor)

-  {

-    return new ITexture[] { super.getBottomFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE) };

-  }

-  

-  public ITexture[] getBottomFacingInactive(byte aColor)

-  {

-    return new ITexture[] { super.getBottomFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_STEAM_MACERATOR) };

-  }

-}

+package gregtech.common.tileentities.machines.steam;
+
+import static gregtech.api.enums.GT_Values.V;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Textures;
+import gregtech.api.enums.Textures.BlockIcons;
+import gregtech.api.gui.GT_GUIContainer_BasicMachine;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+
+import java.util.Map;
+import java.util.Random;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.FluidStack;
+
+public class GT_MetaTileEntity_Macerator_Bronze
+  extends GT_MetaTileEntity_BasicMachine_Bronze
+{
+  public GT_MetaTileEntity_Macerator_Bronze(int aID, String aName, String aNameRegional)
+  {
+    super(aID, aName, aNameRegional, "Macerating your Ores", 1, 1, false);
+  }
+  
+  public GT_MetaTileEntity_Macerator_Bronze(String aName, String aDescription, ITexture[][][] aTextures)
+  {
+    super(aName, aDescription, aTextures, 1, 1, false);
+  }
+  
+  public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)
+  {
+    return new GT_GUIContainer_BasicMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "BronzeMacerator.png", "ic2.macerator");
+  }
+  
+  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
+  {
+    return new GT_MetaTileEntity_Macerator_Bronze(this.mName, this.mDescription, this.mTextures);
+  }
+  
+  public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick)
+  {
+    super.onPreTick(aBaseMetaTileEntity, aTick);
+    if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive()) && (aBaseMetaTileEntity.getFrontFacing() != 1) && (aBaseMetaTileEntity.getCoverIDAtSide((byte)1) == 0) && (!aBaseMetaTileEntity.getOpacityAtSide((byte)1)))
+    {
+      Random tRandom = aBaseMetaTileEntity.getWorld().rand;
+      aBaseMetaTileEntity.getWorld().spawnParticle("smoke", aBaseMetaTileEntity.getXCoord() + 0.8F - tRandom.nextFloat() * 0.6F, aBaseMetaTileEntity.getYCoord() + 0.9F + tRandom.nextFloat() * 0.2F, aBaseMetaTileEntity.getZCoord() + 0.8F - tRandom.nextFloat() * 0.6F, 0.0D, 0.0D, 0.0D);
+    }
+  }
+  
+  public int checkRecipe()
+  {
+  	GT_Recipe_Map tMap = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
+  	if (tMap == null) return DID_NOT_FIND_RECIPE;
+  	GT_Recipe tRecipe = tMap.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, V[1], null, null, getAllInputs());
+  	if (tRecipe == null) return DID_NOT_FIND_RECIPE;
+  	if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;
+      if (!canOutput(tRecipe)) {mOutputBlocked++; return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;}
+      if(tRecipe.getOutput(0)!=null) mOutputItems[0] = tRecipe.getOutput(0);
+      this.mEUt = 2;
+      this.mMaxProgresstime = 800;
+      getInputAt(0).stackSize-=tRecipe.mInputs[0].stackSize;
+      return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
+  }
+  
+  public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
+  {
+    if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {return false;}
+    return GT_ModHandler.getMaceratorOutput(GT_Utility.copyAmount(64L, new Object[] { aStack }), false, null) != null;
+  } 
+  
+  public void startSoundLoop(byte aIndex, double aX, double aY, double aZ)
+  {
+    super.startSoundLoop(aIndex, aX, aY, aZ);
+    if (aIndex == 1) {
+      GT_Utility.doSoundAtClient((String)GregTech_API.sSoundList.get(Integer.valueOf(201)), 10, 1.0F, aX, aY, aZ);
+    }
+  }
+  
+  public void startProcess()
+  {
+    sendLoopStart((byte)1);
+  }
+  
+  public ITexture[] getSideFacingActive(byte aColor)
+  {
+    return new ITexture[] { super.getSideFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE) };
+  }
+  
+  public ITexture[] getSideFacingInactive(byte aColor)
+  {
+    return new ITexture[] { super.getSideFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_STEAM_MACERATOR) };
+  }
+  
+  public ITexture[] getFrontFacingActive(byte aColor)
+  {
+    return new ITexture[] { super.getFrontFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE) };
+  }
+  
+  public ITexture[] getFrontFacingInactive(byte aColor)
+  {
+    return new ITexture[] { super.getFrontFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_MACERATOR) };
+  }
+  
+  public ITexture[] getTopFacingActive(byte aColor)
+  {
+    return new ITexture[] { super.getTopFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR_ACTIVE) };
+  }
+  
+  public ITexture[] getTopFacingInactive(byte aColor)
+  {
+    return new ITexture[] { super.getTopFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR) };
+  }
+  
+  public ITexture[] getBottomFacingActive(byte aColor)
+  {
+    return new ITexture[] { super.getBottomFacingActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE) };
+  }
+  
+  public ITexture[] getBottomFacingInactive(byte aColor)
+  {
+    return new ITexture[] { super.getBottomFacingInactive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_STEAM_MACERATOR) };
+  }
+}