aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/basic
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2015-11-25 02:56:23 +0100
committerBlood-Asp <bloodasphendrik@gmail.com>2015-11-25 02:56:23 +0100
commit063a758961dbfdd0b5bdcf7014c65d01d77ebaa7 (patch)
tree99a4046452b65bc55e41532e7af6cd3b4709c3c3 /src/main/java/gregtech/common/tileentities/machines/basic
parent143176dae38f6bea3e82e50dad8a7d0498e65869 (diff)
downloadGT5-Unofficial-063a758961dbfdd0b5bdcf7014c65d01d77ebaa7.tar.gz
GT5-Unofficial-063a758961dbfdd0b5bdcf7014c65d01d77ebaa7.tar.bz2
GT5-Unofficial-063a758961dbfdd0b5bdcf7014c65d01d77ebaa7.zip
Mass fabricator fix and Charcoal pit oredict support.
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/basic')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
index 030eca8984..fbeda8f014 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
@@ -56,8 +56,8 @@ public class GT_MetaTileEntity_Massfabricator
FluidStack tFluid = getDrainableStack();
if ((tFluid == null) || (tFluid.amount < getCapacity())) {
this.mOutputFluid = Materials.UUMatter.getFluid(1L);
- this.mEUt = ((int) gregtech.api.enums.GT_Values.V[this.mTier]) * 8;
- this.mMaxProgresstime = (sDurationMultiplier / (1 << (this.mTier * 2) - 2));
+ this.mEUt = (((int) gregtech.api.enums.GT_Values.V[1]) * (int)Math.pow(2, this.mTier + 2));
+ this.mMaxProgresstime = (sDurationMultiplier / (1 << this.mTier - 1));
if (((tFluid = getFillableStack()) != null) && (tFluid.amount >= sUUAperUUM) && (tFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L)))) {
tFluid.amount -= sUUAperUUM;
this.mMaxProgresstime /= sUUASpeedBonus;