aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/multi
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2015-12-10 01:12:42 +0100
committerDream-Master <dream-master@gmx.net>2015-12-10 01:12:42 +0100
commit55ed43f4ce02da937bc6104bbcea08c8d0377796 (patch)
tree1b939ae3538d675c8d89a0a2bfcd40961ee6f0de /src/main/java/gregtech/common/tileentities/machines/multi
parent2cab6b81666d27f4212b5dfbb2919969cfe52e31 (diff)
downloadGT5-Unofficial-55ed43f4ce02da937bc6104bbcea08c8d0377796.tar.gz
GT5-Unofficial-55ed43f4ce02da937bc6104bbcea08c8d0377796.tar.bz2
GT5-Unofficial-55ed43f4ce02da937bc6104bbcea08c8d0377796.zip
Added all fixes from Blood Asp we need. Just stay at Forestry 3.6.12.3
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multi')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java2
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