diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-12-09 00:52:00 +0100 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-12-09 00:52:00 +0100 |
| commit | d415df7ea26c0424abf8df9797fb1c4467c62d12 (patch) | |
| tree | 412dc40b356adf727637c7a9633fa039e7ae19f5 /src/main/java/gregtech/common/tileentities/machines | |
| parent | 46f4473de67d66676f3ecc36c6e441db3d1eebfe (diff) | |
| download | GT5-Unofficial-d415df7ea26c0424abf8df9797fb1c4467c62d12.tar.gz GT5-Unofficial-d415df7ea26c0424abf8df9797fb1c4467c62d12.tar.bz2 GT5-Unofficial-d415df7ea26c0424abf8df9797fb1c4467c62d12.zip | |
merge of GT5.09 fixes into 5.08 branch
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index c49fe6fe05..10d045d515 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -244,7 +244,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity if (tierOverclock() == 2) { return mStartEnergy < 160000000 ? 2 : 1; } - return mStartEnergy < 160000000 ? 4 : mStartEnergy > 320000000 ? 2 : 1; + return mStartEnergy < 160000000 ? 4 : mStartEnergy < 320000000 ? 2 : 1; } @Override |