diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-04-09 17:58:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 17:58:14 +0200 |
| commit | b0c7254410064d8a2ad1068cd233420169871a72 (patch) | |
| tree | 7bed04330af6de5b9ad069946072a6028e68019d /src/main/java/gregtech/common/tileentities/machines/multi | |
| parent | 9b71ae54da263e6c5d0e808f847f8ba8fe6c891a (diff) | |
| parent | f5f9d29c848705effe4414c2ed39ce118430476c (diff) | |
| download | GT5-Unofficial-b0c7254410064d8a2ad1068cd233420169871a72.tar.gz GT5-Unofficial-b0c7254410064d8a2ad1068cd233420169871a72.tar.bz2 GT5-Unofficial-b0c7254410064d8a2ad1068cd233420169871a72.zip | |
Merge branch 'experimental' into bmf
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multi')
3 files changed, 8 insertions, 2 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 f3d5a8ef45..ed1d43e8a5 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 @@ -242,10 +242,10 @@ public class GT_MetaTileEntity_ElectricBlastFurnace this.mHeatingCapacity = 9001;
break;
case 7:
- this.mHeatingCapacity = 12001;
+ this.mHeatingCapacity = 9901;
break;
case 8:
- this.mHeatingCapacity = 15001;
+ this.mHeatingCapacity = 10801;
break;
default:
return false;
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 4bc5e5ed9a..3797806460 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 @@ -175,6 +175,8 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M } else { this.mMaxProgresstime = 1; this.mEfficiencyIncrease = 10; + // Overvoltage is handled inside the MultiBlockBase when pushing out to dynamos. no need to do it here. + /* if(this.mDynamoHatches.size()>0){ for(GT_MetaTileEntity_Hatch dynamo:mDynamoHatches) if(isValidMetaTileEntity(dynamo) && dynamo.maxEUOutput() < mEUt) { @@ -182,6 +184,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M explodeMultiblock(); } } + */ return 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 b80f01a85e..fb3f58efd5 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 @@ -192,6 +192,8 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar } else { this.mMaxProgresstime = 20; this.mEfficiencyIncrease = 200; + // Overvoltage is handled inside the MultiBlockBase when pushing out to dynamos. no need to do it here. + /* if(this.mDynamoHatches.size()>0){ for(GT_MetaTileEntity_Hatch dynamo:mDynamoHatches) if(isValidMetaTileEntity(dynamo) && dynamo.maxEUOutput() < mEUt) { @@ -199,6 +201,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar explodeMultiblock(); } } + */ return true; } } |