diff options
| author | botn365 <42187820+botn365@users.noreply.github.com> | 2020-09-19 19:59:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-19 19:59:30 +0200 |
| commit | bc421ffac169b4ad7af97db3dfd667bc86ef01d4 (patch) | |
| tree | f949794d4473619fa3a9cbdfae846af7e61974f1 /src/main/java/gregtech/api/metatileentity/implementations | |
| parent | 40a6b42cd5e2ad4f6a97fffebf991d56c3ac50fc (diff) | |
| parent | ce56bfde0fd9d9e032fbbd5b431923dbf0d679a4 (diff) | |
| download | GT5-Unofficial-bc421ffac169b4ad7af97db3dfd667bc86ef01d4.tar.gz GT5-Unofficial-bc421ffac169b4ad7af97db3dfd667bc86ef01d4.tar.bz2 GT5-Unofficial-bc421ffac169b4ad7af97db3dfd667bc86ef01d4.zip | |
Merge branch 'experimental' into patch-4
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 6d2110baee..a64073d67e 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -617,7 +617,6 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { while (tempEUt <= V[mTier - 1] * mAmperage) { tempEUt <<= 2;//this actually controls overclocking //xEUt *= 4;//this is effect of everclocking - int oldTime = mMaxProgresstime; mMaxProgresstime >>= ocTimeShift;//this is effect of overclocking if (mMaxProgresstime <1) { |