diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-08-19 23:46:31 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-08-19 23:46:31 +0200 |
| commit | c281488927eb4c5352ab6ea11a7e41e68d5d690a (patch) | |
| tree | c449b799a2cd8d89fef17cf8e8b08c448cbd300c /src/main/java/gregtech/common/tileentities/machines/steam | |
| parent | a749a8536f08973ca0a3e778b37f3d78059b9ff2 (diff) | |
| parent | e8c75a54ee69b1853b413d3aafbb2ffa02128d19 (diff) | |
| download | GT5-Unofficial-c281488927eb4c5352ab6ea11a7e41e68d5d690a.tar.gz GT5-Unofficial-c281488927eb4c5352ab6ea11a7e41e68d5d690a.tar.bz2 GT5-Unofficial-c281488927eb4c5352ab6ea11a7e41e68d5d690a.zip | |
Merge branch 'unstable' into PyrometallurgyUpdate
Conflicts:
src/main/java/gregtech/GT_Mod.java
src/main/java/gregtech/api/enums/Materials.java
src/main/java/gregtech/common/GT_Proxy.java
src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/steam')
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java index 07e2c4722c..2ed8d7a63f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java @@ -59,8 +59,8 @@ public class GT_MetaTileEntity_Macerator_Bronze return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; } if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0); - this.mEUt = 2; - this.mMaxProgresstime = 800; + this.mEUt = tRecipe.mEUt; + this.mMaxProgresstime = (tRecipe.mDuration * 2); getInputAt(0).stackSize -= tRecipe.mInputs[0].stackSize; return FOUND_AND_SUCCESSFULLY_USED_RECIPE; } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java index 65e05c898d..987d3156bf 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java @@ -59,8 +59,8 @@ public class GT_MetaTileEntity_Macerator_Steel return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
}
if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0);
- this.mEUt = 6;
- this.mMaxProgresstime = 400;
+ this.mEUt = (3 * tRecipe.mEUt);
+ this.mMaxProgresstime = tRecipe.mDuration;
getInputAt(0).stackSize -= tRecipe.mInputs[0].stackSize;
return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
}
|