diff options
| author | Alkalus <draknyte1@hotmail.com> | 2018-04-08 16:12:44 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-08 16:12:44 +1000 |
| commit | c94c14f2fe9c7434ddc1b22a93d45e8b4aee5eb7 (patch) | |
| tree | 53bb1b97c8302abf5204d980239a1ef18af18b99 /src/Java/gtPlusPlus/xmod/gregtech/api | |
| parent | 2cf95a2b3e82ceb3a8eec69e33262cf36b797ae6 (diff) | |
| parent | 31996894fd1dd04ef4850dbc470664c5766bffb8 (diff) | |
| download | GT5-Unofficial-c94c14f2fe9c7434ddc1b22a93d45e8b4aee5eb7.tar.gz GT5-Unofficial-c94c14f2fe9c7434ddc1b22a93d45e8b4aee5eb7.tar.bz2 GT5-Unofficial-c94c14f2fe9c7434ddc1b22a93d45e8b4aee5eb7.zip | |
Merge branch 'master' into power-substation-structure
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 2b9860ef1c..e951735f5e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -311,7 +311,9 @@ public enum GregtechItemList implements GregtechItemContainer { //Buffer Dynamos Hatch_Buffer_Dynamo_ULV, Hatch_Buffer_Dynamo_LV, Hatch_Buffer_Dynamo_MV, Hatch_Buffer_Dynamo_HV, Hatch_Buffer_Dynamo_EV, - Hatch_Buffer_Dynamo_IV, Hatch_Buffer_Dynamo_LuV, Hatch_Buffer_Dynamo_ZPM, Hatch_Buffer_Dynamo_UV, Hatch_Buffer_Dynamo_MAX, + Hatch_Buffer_Dynamo_IV, Hatch_Buffer_Dynamo_LuV, Hatch_Buffer_Dynamo_ZPM, Hatch_Buffer_Dynamo_UV, Hatch_Buffer_Dynamo_MAX, + + Amazon_Warehouse_Controller, Casing_AmazonWarehouse, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index c2d3331128..ea73a836b4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -244,12 +244,14 @@ GT_MetaTileEntity_MultiBlockBase { long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); + Logger.WARNING("Running checkRecipeGeneric(0)"); GT_Recipe tRecipe = this.getRecipeMap().findRecipe( getBaseMetaTileEntity(), mLastRecipe, false, gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs); + Logger.WARNING("Running checkRecipeGeneric(1)"); // Remember last recipe - an optimization for findRecipe() this.mLastRecipe = tRecipe; |