diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-12-02 10:34:21 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-12-02 10:34:21 +0100 |
| commit | 95f6b6364fd312d5e4d3112a3a23eecb255eba5f (patch) | |
| tree | 2cb7eff386ae7250fbcaec0e510542873533f52c /src/main/java/gregtech/common/tileentities | |
| parent | a336830433db2b206c8a109c14606223e5dfc621 (diff) | |
| parent | a4fb56921e866236041ee7cd6dd722b931f15df0 (diff) | |
| download | GT5-Unofficial-95f6b6364fd312d5e4d3112a3a23eecb255eba5f.tar.gz GT5-Unofficial-95f6b6364fd312d5e4d3112a3a23eecb255eba5f.tar.bz2 GT5-Unofficial-95f6b6364fd312d5e4d3112a3a23eecb255eba5f.zip | |
Merge branch 'New-EBF-Coils' into experimental
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
2 files changed, 20 insertions, 6 deletions
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 2940d4c228..f3d5a8ef45 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 @@ -221,26 +221,32 @@ public class GT_MetaTileEntity_ElectricBlastFurnace byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 2, zDir);
switch (tUsedMeta) {
case 0:
- this.mHeatingCapacity = 1800;
+ this.mHeatingCapacity = 1801;
break;
case 1:
- this.mHeatingCapacity = 2700;
+ this.mHeatingCapacity = 2701;
break;
case 2:
- this.mHeatingCapacity = 3600;
+ this.mHeatingCapacity = 3601;
break;
case 3:
- this.mHeatingCapacity = 4500;
+ this.mHeatingCapacity = 4501;
break;
case 4:
- this.mHeatingCapacity = 5400;
+ this.mHeatingCapacity = 5401;
break;
case 5:
- this.mHeatingCapacity = 7200;
+ this.mHeatingCapacity = 7201;
break;
case 6:
this.mHeatingCapacity = 9001;
break;
+ case 7:
+ this.mHeatingCapacity = 12001;
+ break;
+ case 8:
+ this.mHeatingCapacity = 15001;
+ break;
default:
return false;
}
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 81249ab705..c3f1d9c58a 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 @@ -152,6 +152,14 @@ public class GT_MetaTileEntity_MultiFurnace this.mLevel = 16;
this.mCostDiscount = 8;
break;
+ case 7:
+ this.mLevel = 16;
+ this.mCostDiscount = 16;
+ break;
+ case 8:
+ this.mLevel = 16;
+ this.mCostDiscount = 24;
+ break;
default:
return false;
}
|