Merge branch 'unstable' into mergeGTNH

# Conflicts:
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
#	src/main/java/gregtech/api/util/GT_Recipe.java
#	src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
#	src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
#	src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
#	src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
#	src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
#	src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
#	src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java
#	src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java
#	src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java
#	src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java
#	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
#	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
#	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
#	src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java
#	src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java
#	src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java
#	src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java
#	src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java
#	src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java
#	src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java

10 files changed, 175 insertions, 83 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
index 2e6a0ddad5..fa92348c13 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
@@ -140,11 +140,15 @@ public class GT_MetaTileEntity_AssemblyLine
         int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
         int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
         if (xDir != 0) {
-            for(int r = 0; r <= 16; r++){
-                int i = r*xDir;
+            for (int r = 0; r <= 16; r++) {
+                int i = r * xDir;
 
-                if(i!=0&& !(aBaseMetaTileEntity.getBlockOffset(0, 0, i)==GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(0, 0, i)==10)){return false;}
-                if(!aBaseMetaTileEntity.getBlockOffset(0, -1, i).getUnlocalizedName().equals("blockAlloyGlass")){return false;}
+                if (i != 0 && !(aBaseMetaTileEntity.getBlockOffset(0, 0, i) == GregTech_API.sBlockCasings3 && aBaseMetaTileEntity.getMetaIDOffset(0, 0, i) == 10)) {
+                    return false;
+                }
+                if (!aBaseMetaTileEntity.getBlockOffset(0, -1, i).getUnlocalizedName().equals("blockAlloyGlass")) {
+                    return false;
+                }
                 IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(0, -2, i);
                 if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){
                     if (aBaseMetaTileEntity.getBlockOffset(0, -2, i) != GregTech_API.sBlockCasings2) {return false;}
@@ -152,33 +156,52 @@ public class GT_MetaTileEntity_AssemblyLine
                 }
 
                 tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 1, i);
-                if (!addEnergyInputToMachineList(tTileEntity, 16)){
-                    if (aBaseMetaTileEntity.getBlockOffset(xDir, 1, i) != GregTech_API.sBlockCasings2) {return false;}
-                    if (aBaseMetaTileEntity.getMetaIDOffset(xDir, 1, i) != 0) {return false;}
+                if (!addEnergyInputToMachineList(tTileEntity, 16)) {
+                    if (aBaseMetaTileEntity.getBlockOffset(xDir, 1, i) != GregTech_API.sBlockCasings2) {
+                        return false;
+                    }
+                    if (aBaseMetaTileEntity.getMetaIDOffset(xDir, 1, i) != 0) {
+                        return false;
+                    }
+                }
+                if (i != 0 && !(aBaseMetaTileEntity.getBlockOffset(xDir, 0, i) == GregTech_API.sBlockCasings2 && aBaseMetaTileEntity.getMetaIDOffset(xDir, 0, i) == 9)) {
+                    return false;
+                }
+                if (i != 0 && !(aBaseMetaTileEntity.getBlockOffset(xDir, -1, i) == GregTech_API.sBlockCasings2 && aBaseMetaTileEntity.getMetaIDOffset(xDir, -1, i) == 5)) {
+                    return false;
                 }
-                if(i!=0&& !(aBaseMetaTileEntity.getBlockOffset(xDir, 0, i)==GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(xDir, 0, i)==9)){return false;}
-                if(i!=0&& !(aBaseMetaTileEntity.getBlockOffset(xDir,-1, i)==GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(xDir,-1, i)==5)){return false;}
 
 
-                if(!(aBaseMetaTileEntity.getBlockOffset(xDir*2, 0, i)==GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(xDir*2, 0, i)==10)){return false;}
-                if(!aBaseMetaTileEntity.getBlockOffset(xDir*2, -1, i).getUnlocalizedName().equals("blockAlloyGlass")){return false;}
-                tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir*2, -2, i);
-                if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){
-                    if (aBaseMetaTileEntity.getBlockOffset(xDir*2, -2, i) != GregTech_API.sBlockCasings2) {return false;}
-                    if (aBaseMetaTileEntity.getMetaIDOffset(xDir*2, -2, i) != 0) {return false;}
+                if (!(aBaseMetaTileEntity.getBlockOffset(xDir * 2, 0, i) == GregTech_API.sBlockCasings3 && aBaseMetaTileEntity.getMetaIDOffset(xDir * 2, 0, i) == 10)) {
+                    return false;
+                }
+                if (!aBaseMetaTileEntity.getBlockOffset(xDir * 2, -1, i).getUnlocalizedName().equals("blockAlloyGlass")) {
+                    return false;
+                }
+                tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir * 2, -2, i);
+                if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))) {
+                    if (aBaseMetaTileEntity.getBlockOffset(xDir * 2, -2, i) != GregTech_API.sBlockCasings2) {
+                        return false;
+                    }
+                    if (aBaseMetaTileEntity.getMetaIDOffset(xDir * 2, -2, i) != 0) {
+                        return false;
+                    }
                 }
                 tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, -2, i);
-                if (!addInputToMachineList(tTileEntity, 16)){
-                    if (!addOutputToMachineList(tTileEntity, 16)){
-                    }else{if(r>0){return mEnergyHatches.size()>0;}else{return false;}}
+                if (!addInputToMachineList(tTileEntity, 16) && addOutputToMachineList(tTileEntity, 16)) {
+                    return r > 0 && mEnergyHatches.size() > 0;
                 }
             }
-        }else{
-            for(int r = 0; r <= 16; r++){
-                int i = r*-zDir;
+        } else {
+            for (int r = 0; r <= 16; r++) {
+                int i = r * -zDir;
 
-                if(i!=0 && !(aBaseMetaTileEntity.getBlockOffset(i, 0, 0)==GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(i, 0, 0)==10)){return false;}
-                if(!aBaseMetaTileEntity.getBlockOffset(i, -1, 0).getUnlocalizedName().equals("blockAlloyGlass")){return false;}
+                if (i != 0 && !(aBaseMetaTileEntity.getBlockOffset(i, 0, 0) == GregTech_API.sBlockCasings3 && aBaseMetaTileEntity.getMetaIDOffset(i, 0, 0) == 10)) {
+                    return false;
+                }
+                if (!aBaseMetaTileEntity.getBlockOffset(i, -1, 0).getUnlocalizedName().equals("blockAlloyGlass")) {
+                    return false;
+                }
                 IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, 0);
                 if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){
                     if (aBaseMetaTileEntity.getBlockOffset(i, -2, 0) != GregTech_API.sBlockCasings2) {return false;}
@@ -186,25 +209,40 @@ public class GT_MetaTileEntity_AssemblyLine
                 }
 
                 tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, 1, zDir);
-                if (!addEnergyInputToMachineList(tTileEntity, 16)){
-                    if (aBaseMetaTileEntity.getBlockOffset(i, 1, zDir) != GregTech_API.sBlockCasings2) {return false;}
-                    if (aBaseMetaTileEntity.getMetaIDOffset(i, 1, zDir) != 0) {return false;}
+                if (!addEnergyInputToMachineList(tTileEntity, 16)) {
+                    if (aBaseMetaTileEntity.getBlockOffset(i, 1, zDir) != GregTech_API.sBlockCasings2) {
+                        return false;
+                    }
+                    if (aBaseMetaTileEntity.getMetaIDOffset(i, 1, zDir) != 0) {
+                        return false;
+                    }
+                }
+                if (i != 0 && !(aBaseMetaTileEntity.getBlockOffset(i, 0, zDir) == GregTech_API.sBlockCasings2 && aBaseMetaTileEntity.getMetaIDOffset(i, 0, zDir) == 9)) {
+                    return false;
+                }
+                if (i != 0 && !(aBaseMetaTileEntity.getBlockOffset(i, -1, zDir) == GregTech_API.sBlockCasings2 && aBaseMetaTileEntity.getMetaIDOffset(i, -1, zDir) == 5)) {
+                    return false;
                 }
-                if(i!=0&& !(aBaseMetaTileEntity.getBlockOffset(i, 0, zDir)==GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(i, 0, zDir)==9)){return false;}
-                if(i!=0&& !(aBaseMetaTileEntity.getBlockOffset(i,-1, zDir)==GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(i,-1, zDir)==5)){return false;}
 
 
-                if(!(aBaseMetaTileEntity.getBlockOffset(i, 0, zDir*2)==GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(i, 0, zDir*2)==10)){return false;}
-                if(!aBaseMetaTileEntity.getBlockOffset(i, -1, zDir*2).getUnlocalizedName().equals("blockAlloyGlass")){return false;}
-                tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, zDir*2);
-                if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){
-                    if (aBaseMetaTileEntity.getBlockOffset(i, -2, zDir*2) != GregTech_API.sBlockCasings2) {return false;}
-                    if (aBaseMetaTileEntity.getMetaIDOffset(i, -2, zDir*2) != 0) {return false;}
+                if (!(aBaseMetaTileEntity.getBlockOffset(i, 0, zDir * 2) == GregTech_API.sBlockCasings3 && aBaseMetaTileEntity.getMetaIDOffset(i, 0, zDir * 2) == 10)) {
+                    return false;
+                }
+                if (!aBaseMetaTileEntity.getBlockOffset(i, -1, zDir * 2).getUnlocalizedName().equals("blockAlloyGlass")) {
+                    return false;
+                }
+                tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, zDir * 2);
+                if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))) {
+                    if (aBaseMetaTileEntity.getBlockOffset(i, -2, zDir * 2) != GregTech_API.sBlockCasings2) {
+                        return false;
+                    }
+                    if (aBaseMetaTileEntity.getMetaIDOffset(i, -2, zDir * 2) != 0) {
+                        return false;
+                    }
                 }
                 tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, zDir);
-                if (!addInputToMachineList(tTileEntity, 16)){
-                    if (!addOutputToMachineList(tTileEntity, 16)){
-                    }else{if(r>0){return mEnergyHatches.size()>0;}else{return false;}}
+                if (!addInputToMachineList(tTileEntity, 16) && addOutputToMachineList(tTileEntity, 16)) {
+                    return r > 0 && mEnergyHatches.size() > 0;
                 }
             }
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
index 8751da47f3..9be7fd36d9 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
@@ -51,7 +51,8 @@ public class GT_MetaTileEntity_BronzeBlastFurnace
                 "Controller Block for the Bronze Blast Furnace",

                 "How to get your first Steel",

                 "Size(WxHxD): 3x4x3 (Hollow, with opening on top)",

-                "Bronze Plated Bricks for the rest (32 at least!)"};

+                "Bronze Plated Bricks for the rest (32 at least!)",

+                "Causes 50 Pollution per second"};

     }

 

     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_Charcoal_Pit.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
index efffdf4528..c014724ab8 100644
--- 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
@@ -44,7 +44,8 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock
                 "11x1x11 of Bricks (Bottom layer only)",
                 "11x5x11 of Logs (Above bottom Brick layer)",
                 "Only grass/dirt can touch Log blocks",
-                "No air between logs allowed"};
+                "No air between logs allowed",
+                "Causes 100 Pollution per second"};
     }
 
     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_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
index 39da260e8e..09bbd3c34b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
@@ -16,15 +16,15 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
 public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBase {
-	private int mHeatingCapacity = 0;
+private int mHeatingCapacity = 0;
 
-	public GT_MetaTileEntity_Cleanroom(int aID, String aName, String aNameRegional) {
-		super(aID, aName, aNameRegional);
-	}
+public GT_MetaTileEntity_Cleanroom(int aID, String aName, String aNameRegional) {
+super(aID, aName, aNameRegional);
+}
 
-	public GT_MetaTileEntity_Cleanroom(String aName) {
-		super(aName);
-	}
+public GT_MetaTileEntity_Cleanroom(String aName) {
+super(aName);
+}
 
 	@Override
 	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
@@ -40,8 +40,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 				"Top besides contoller and corners filter casings",
 				"1 Reinforced Door",
 				"1x Energy Hatch, 1x Maintainance Hatch",
-				"up to 10 Machine Hull to transfer Items&Energy inside",
-				""};
+				"up to 10 Machine Hull to transfer Items & Energy inside"};
 	}
 
 	@Override
@@ -158,17 +157,17 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 			mEfficiency = Math.max(0, mEfficiency - 200);
 		}
 
-		return true;
-	}
+return true;
+}
 
 	@Override
 	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
 		if (aSide == 0 || aSide == 1) {
 			return new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.BLOCK_PLASCRETE), new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_TOP_CLEANROOM_ACTIVE : Textures.BlockIcons.OVERLAY_TOP_CLEANROOM)};
 
-		}
-		return new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.BLOCK_PLASCRETE)};
-	}
+}
+return new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.BLOCK_PLASCRETE)};
+}
 
 	@Override
 	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
@@ -209,4 +208,4 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 	public boolean explodesOnComponentBreak(ItemStack aStack) {
 		return false;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
index f2902f3631..bff09c29bf 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
@@ -33,6 +33,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
     public GT_MetaTileEntity_DieselEngine(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
+    
     public GT_MetaTileEntity_DieselEngine(String aName) {
         super(aName);
     }
@@ -49,8 +50,11 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
                 "1x Muffler Hatch (top middle back, next to the rear Gear Box)",
                 "1x Dynamo Hatch (back centered)",
                 "Engine Intake Casings not obstructed in front (only air blocks)",
-                "Supply Diesel Fuel and Lubricant to run. Supply Oxygen to boost output (optional).",
-                "2048EU/t default output, 6144EU/t boosted output"};
+                "Supply Diesel Fuel and 1000L of Lubricant per hour to run.",
+                "Supply 40L of Oxygen per second to boost output (optional).",
+                "Default: Produces 2048EU/t at 100% efficiency",
+                "Boosted: Produces 6144EU/t at 150% efficiency",
+                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};
     }
 
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
@@ -218,8 +222,9 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
 
     @Override
     public int getPollutionPerTick(ItemStack aStack) {
-        return 15;
+        return 16;
     }
+    
     @Override
     public boolean explodesOnComponentBreak(ItemStack aStack) {
         return true;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
index ffdee14683..2abf19a658 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
@@ -47,7 +47,11 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
                 "1x Energy Hatch (Any bottom layer casing)",

                 "1x Maintenance Hatch (Any bottom layer casing)",

                 "1x Muffler Hatch (Top middle)",

-                "Heat Proof Machine Casings for the rest"};

+                "Heat Proof Machine Casings for the rest",

+                "Each 900K over the min. Heat Capacity grants 5% speedup (multiplicatively)",

+                "Each 1800K over the min. Heat Capacity allows for one upgraded overclock",

+                "Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%",

+                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};

     }

 

     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_ImplosionCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
index d2b9d09f1a..bd554c5545 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
@@ -41,7 +41,8 @@ public class GT_MetaTileEntity_ImplosionCompressor
                 "1x Maintenance Hatch (Any casing)",

                 "1x Muffler Hatch (Any casing)",

                 "1x Energy Hatch (Any casing)",

-                "Solid Steel Casings for the rest (16 at least!)"};

+                "Solid Steel Casings for the rest (16 at least!)",

+                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};

     }

 

     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_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
index 1f6514a54b..eb21a22ace 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
@@ -23,6 +23,9 @@ public abstract class GT_MetaTileEntity_LargeBoiler
         extends GT_MetaTileEntity_MultiBlockBase {

     private boolean firstRun = true;

     private int mSuperEfficencyIncrease = 0;

+    private int integratedCircuitConfig = 0; //Steam output is reduced by 1000L per config

+    private int excessFuel = 0; //Eliminate rounding errors for fuels that burn half items

+    private int excessProjectedEU = 0; //Eliminate rounding errors from throttling the boiler

 

     public GT_MetaTileEntity_LargeBoiler(int aID, String aName, String aNameRegional) {

         super(aID, aName, aNameRegional);

@@ -35,7 +38,8 @@ public abstract class GT_MetaTileEntity_LargeBoiler
     public String[] getDescription() {

         return new String[]{

                 "Controller Block for the Large Boiler",

-                "Produces "+(getEUt()*40)*(runtimeBoost(20)/20f)+"L of Steam with 1 Coal in "+runtimeBoost(20)+" ticks",

+                "Produces " + (getEUt() * 40) * (runtimeBoost(20) / 20f) + "L of Steam with 1 Coal at " + getEUt() * 40 + "L/s",

+                "A programmed circuit in the main block throttles the boiler (-1000L/s per config)",

                 "Size(WxHxD): 3x5x3, Controller (Front middle in Fireboxes)",

                 "3x1x3 of Fire Boxes (Bottom layer, Min 3)",

                 "3x4x3 of Casings (Above Fireboxes, hollow, Min 24!)",

@@ -45,7 +49,8 @@ public abstract class GT_MetaTileEntity_LargeBoiler
                 "1x Output Hatch (Any Casing)",

                 "1x Maintenance Hatch (Any Firebox)",

                 "1x Muffler Hatch (Any Firebox)",

-                "Refined liquid fuels have 1/4 efficiency"};

+                "Diesel fuels have 1/4 efficiency",

+                String.format("Takes %.2f seconds to heat up", 500.0 / getEfficiencyIncrease())};

     }

 

     public abstract Block getCasingBlock();

@@ -88,15 +93,27 @@ public abstract class GT_MetaTileEntity_LargeBoiler
     }

 

     public boolean checkRecipe(ItemStack aStack) {

-        this.mSuperEfficencyIncrease=0;

+        //Do we have an integrated circuit with a valid configuration?

+        if (mInventory[1] != null && mInventory[1].getUnlocalizedName().startsWith("gt.integrated_circuit")) {

+            int circuit_config = mInventory[1].getItemDamage();

+            if (circuit_config >= 1 && circuit_config <= 25) {

+                // If so, overwrite the current config

+                this.integratedCircuitConfig = circuit_config;

+            }

+        } else {

+            //If not, set the config to zero

+            this.integratedCircuitConfig = 0;

+        }

+

+        this.mSuperEfficencyIncrease = 0;

         for (GT_Recipe tRecipe : GT_Recipe.GT_Recipe_Map.sDieselFuels.mRecipeList) {

             FluidStack tFluid = GT_Utility.getFluidForFilledItem(tRecipe.getRepresentativeInput(0), true);

-            if ((tFluid != null) && (tRecipe.mSpecialValue > 1)) {

+            if (tFluid != null && tRecipe.mSpecialValue > 1) {

                 tFluid.amount = 1000;

                 if (depleteInput(tFluid)) {

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

-                    this.mEUt = getEUt();

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

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

+                    this.mEUt = adjustEUtForConfig(getEUt());

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

                     return true;

                 }

             }

@@ -106,9 +123,9 @@ public abstract class GT_MetaTileEntity_LargeBoiler
             if (tFluid != null) {

                 tFluid.amount = 1000;

                 if (depleteInput(tFluid)) {

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

-                    this.mEUt = getEUt();

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

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

+                    this.mEUt = adjustEUtForConfig(getEUt());

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

                     return true;

                 }

             }

@@ -116,13 +133,20 @@ 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 = runtimeBoost(GT_ModHandler.getFuelValue(tInput) / 80)) > 0)) {

-                    this.mEUt = getEUt();

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

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

+                    this.excessFuel += GT_ModHandler.getFuelValue(tInput) % 80;

+                    this.mMaxProgresstime += this.excessFuel / 80;

+                    this.excessFuel %= 80;

+                    this.mMaxProgresstime = adjustBurnTimeForConfig(runtimeBoost(this.mMaxProgresstime));

+                    this.mEUt = adjustEUtForConfig(getEUt());

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

                     this.mOutputItems = new ItemStack[]{GT_Utility.getContainerItem(tInput, true)};

                     tInput.stackSize -= 1;

                     updateSlots();

-                    if(this.mEfficiencyIncrease>5000){ this.mEfficiencyIncrease=0;this.mSuperEfficencyIncrease=20;}

+                    if (this.mEfficiencyIncrease > 5000) {

+                        this.mEfficiencyIncrease = 0;

+                        this.mSuperEfficencyIncrease = 20;

+                    }

                     return true;

                 }

             }

@@ -136,7 +160,8 @@ public abstract class GT_MetaTileEntity_LargeBoiler
 

     public boolean onRunningTick(ItemStack aStack) {

         if (this.mEUt > 0) {

-        	if(this.mSuperEfficencyIncrease>0)this.mEfficiency = Math.min(10000, this.mEfficiency + this.mSuperEfficencyIncrease);

+            if (this.mSuperEfficencyIncrease > 0)

+                this.mEfficiency = Math.min(10000, this.mEfficiency + this.mSuperEfficencyIncrease);

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

             if (tGeneratedEU > 0) {

                 long amount = (tGeneratedEU + 160) / 160;

@@ -155,12 +180,11 @@ public abstract class GT_MetaTileEntity_LargeBoiler
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {

         if (mProgresstime > 0 && firstRun) {

             firstRun = false;

-            GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "extremepressure");

+            GT_Mod.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "extremepressure");

         }

         super.onPostTick(aBaseMetaTileEntity, aTick);

     }

 

-

     public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {

         int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;

         int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;

@@ -169,7 +193,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler
         int tFireboxAmount = 0;

         for (int i = -1; i < 2; i++) {

             for (int j = -1; j < 2; j++) {

-                if ((i != 0) || (j != 0)) {

+                if (i != 0 || j != 0) {

                     for (int k = 1; k <= 4; k++) {

                         if (!addOutputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, k, zDir + j), getCasingTextureIndex())) {

                             if (aBaseMetaTileEntity.getBlockOffset(xDir + i, k, zDir + j) != getCasingBlock()) {

@@ -204,9 +228,9 @@ public abstract class GT_MetaTileEntity_LargeBoiler
         }

         for (int i = -1; i < 2; i++) {

             for (int j = -1; j < 2; j++) {

-                if ((xDir + i != 0) || (zDir + j != 0)) {

+                if (xDir + i != 0 || zDir + j != 0) {

                     IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 0, zDir + j);

-                    if ((!addMaintenanceToMachineList(tTileEntity, getFireboxTextureIndex())) && (!addInputToMachineList(tTileEntity, getFireboxTextureIndex())) && (!addMufflerToMachineList(tTileEntity, getFireboxTextureIndex()))) {

+                    if (!addMaintenanceToMachineList(tTileEntity, getFireboxTextureIndex()) && !addInputToMachineList(tTileEntity, getFireboxTextureIndex()) && !addMufflerToMachineList(tTileEntity, getFireboxTextureIndex())) {

                         if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j) != getFireboxBlock()) {

                             return false;

                         }

@@ -218,7 +242,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler
                 }

             }

         }

-        return (tCasingAmount >= 24) && (tFireboxAmount >= 3);

+        return tCasingAmount >= 24 && tFireboxAmount >= 3;

     }

 

     public int getMaxEfficiency(ItemStack aStack) {

@@ -226,7 +250,8 @@ public abstract class GT_MetaTileEntity_LargeBoiler
     }

 

     public int getPollutionPerTick(ItemStack aStack) {

-        return 20;

+        int adjustedEUOutput = Math.max(25, getEUt() - 25 * integratedCircuitConfig);

+        return Math.max(1, 12 * adjustedEUOutput / getEUt());

     }

 

     public int getDamageToComponent(ItemStack aStack) {

@@ -236,4 +261,21 @@ public abstract class GT_MetaTileEntity_LargeBoiler
     public boolean explodesOnComponentBreak(ItemStack aStack) {

         return false;

     }

+

+    private int adjustEUtForConfig(int rawEUt) {

+        int adjustedSteamOutput = rawEUt - 25 * integratedCircuitConfig;

+        return Math.max(adjustedSteamOutput, 25);

+    }

+

+    private int adjustBurnTimeForConfig(int rawBurnTime) {

+        if (mEfficiency < 10000) {

+            return rawBurnTime;

+        }

+        int adjustedEUt = Math.max(25, getEUt() - 25 * integratedCircuitConfig);

+        int adjustedBurnTime = rawBurnTime * getEUt() / adjustedEUt;

+        this.excessProjectedEU += getEUt() * rawBurnTime - adjustedEUt * adjustedBurnTime;

+        adjustedBurnTime += this.excessProjectedEU / adjustedEUt;

+        this.excessProjectedEU %= adjustedEUt;

+        return adjustedBurnTime;

+    }

 }

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
index e7fbeda316..9ae4ba1437 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
@@ -48,7 +48,8 @@ public class GT_MetaTileEntity_MultiFurnace
                 "1x Maintenance Hatch (One of bottom)",

                 "1x Muffler Hatch (Top middle)",

                 "1x Energy Hatch (One of bottom)",

-                "Heat Proof Machine Casings for the rest",};

+                "Heat Proof Machine Casings for the rest",

+                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};

     }

 

     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_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
index 51285182d5..7a6da0e95a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java