diff options
| author | Jason Mitchell <mitchej+github@gmail.com> | 2019-12-22 09:55:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-22 09:55:16 -0800 |
| commit | 177a2633777f055d4bd183c357abd22447b80f46 (patch) | |
| tree | cfecd058e9d96b4bfccd2c13d9ef97b9b6b6bc8e | |
| parent | 06076d93e6caa9c3b7eb853dcaff016b6b075099 (diff) | |
| parent | 7584a69d4833546fe9e510f6e73b14ffc642f47d (diff) | |
| download | GT5-Unofficial-177a2633777f055d4bd183c357abd22447b80f46.tar.gz GT5-Unofficial-177a2633777f055d4bd183c357abd22447b80f46.tar.bz2 GT5-Unofficial-177a2633777f055d4bd183c357abd22447b80f46.zip | |
Merge pull request #223 from GTNewHorizons/calcification_output_visibility
Calcification output visibility
| -rw-r--r-- | build.properties | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build.properties b/build.properties index 142a2ac932..79e2bf507a 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614-1.7.10 -gt.version=5.09.33.25 +gt.version=5.09.33.26 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java index 398bf4869c..d7fd69edb2 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java @@ -115,7 +115,7 @@ public class GT_MetaTileEntity_Boiler_Solar // Calcification start time is 43200*25/20=54,000s or 15 hours of game time. static final int CALCIFICATION_TIME = 43200; - int getCalcificationOutput() { // Returns how much output the boiler can do. + public int getCalcificationOutput() { // Returns how much output the boiler can do. if (this.mTemperature < 100 ) { return 0; } @@ -127,6 +127,10 @@ public class GT_MetaTileEntity_Boiler_Solar } } + public int getBasicOutput() { + return this.basicOutput; + } + public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) { if (this.mTemperature <= 20) { |