Merge remote-tracking branch 'remotes/JohannesGaessler/SteamProductionImprovement' into unstable

5 files changed, 11 insertions, 7 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
index 2fd30f1c61..a6b7e7c9fa 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
@@ -43,7 +43,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
 
     @Override
     public String[] getDescription() {
-    	String[] desc = new String[mDescription.length];
+    	String[] desc = new String[mDescription.length + 1];
     	System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
     	desc[mDescription.length] = mInventory.length + " Slots";
     	return desc;
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
index 8e1f052d56..1e1a7c78c5 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
@@ -57,7 +57,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
     		String[] desc = new String[mDescription.length + 3];
     		System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
     		desc[mDescription.length] = "4 Ducttape, 2 Lubricant Cells";
-    		desc[mDescription.length + 1] = "4 Ducttape, 2 Lubricant Cells";
+    		desc[mDescription.length + 1] = "4 Steel Screws, 2 Adv Circuits";
     		desc[mDescription.length + 2] = "For each autorepair";
     		return desc;
     	} else {
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
index 8da8fdf619..ee033fe627 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
@@ -24,7 +24,7 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
     public GT_MetaTileEntity_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aInvSlotCount);
         mTier = (byte) Math.max(0, Math.min(aTier, 9));
-        mDescription = new String[]{aDescription};
+        mDescription = aDescription == null ? new String[0] : new String[]{aDescription};
 
         // must always be the last call!
         if (GT.isClientSide()) mTextures = getTextureSet(aTextures);
@@ -34,7 +34,7 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
     public GT_MetaTileEntity_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String[] aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aInvSlotCount);
         mTier = (byte) Math.max(0, Math.min(aTier, 9));
-        mDescription = aDescription;
+        mDescription =  aDescription == null ? new String[0] : aDescription;
 
         // must always be the last call!
         if (GT.isClientSide()) mTextures = getTextureSet(aTextures);
@@ -44,14 +44,14 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
     public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
         super(aName, aInvSlotCount);
         mTier = (byte) aTier;
-        mDescription = new String[]{aDescription};
+        mDescription = aDescription == null ? new String[0] : new String[]{aDescription};
         mTextures = aTextures;
     }
 
     public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aInvSlotCount);
         mTier = (byte) aTier;
-        mDescription = aDescription;
+        mDescription = aDescription == null ? new String[0] : aDescription;
         mTextures = aTextures;
     }
 
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 b423ef92f8..55c83d1c91 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
@@ -48,7 +48,8 @@ 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).",
+                "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"};
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 5a596bf014..e82fa34fa0 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
@@ -45,6 +45,9 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
                 "1x Maintenance Hatch (Any bottom layer casing)",

                 "1x Muffler Hatch (Top middle)",

                 "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"};

     }