diff options
| author | Alkalus <draknyte1@hotmail.com> | 2016-11-02 16:59:01 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 16:59:01 +1000 |
| commit | 3bd9cddd494682db29f8897f5f573ccd1dca1c2c (patch) | |
| tree | 40fb17d2633d8d5b60f0794deaa4356335de29dd /src/Java/gtPlusPlus/xmod/gregtech/api | |
| parent | cfde0e80a2b7083c8c9ec5664b5e9d0fa446ed9c (diff) | |
| parent | 5944aec4eda2db647e34b9c46bbab0512b56b6a4 (diff) | |
| download | GT5-Unofficial-3bd9cddd494682db29f8897f5f573ccd1dca1c2c.tar.gz GT5-Unofficial-3bd9cddd494682db29f8897f5f573ccd1dca1c2c.tar.bz2 GT5-Unofficial-3bd9cddd494682db29f8897f5f573ccd1dca1c2c.zip | |
Merge pull request #33 from draknyte1/laptopMerge
Things I fixed during my workspace clone.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')
2 files changed, 11 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 dbf2e9f877..605317bb09 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -131,7 +131,16 @@ public enum GregtechItemList implements GregtechItemContainer { Geothermal_Engine_EV, Geothermal_Engine_IV, Geothermal_Engine_LuV, //Tesseracts - GT4_Tesseract_Generator, GT4_Tesseract_Terminal; + GT4_Tesseract_Generator, GT4_Tesseract_Terminal, + + //Casings Tier 2 [17-32] + Casing_StructuralGlass, + Casing_PlaceHolder1, Casing_PlaceHolder2, Casing_PlaceHolder3, + Casing_PlaceHolder4, Casing_PlaceHolder5, Casing_PlaceHolder6, + Casing_PlaceHolder7, Casing_PlaceHolder8, Casing_PlaceHolder9, + Casing_PlaceHolder10, Casing_PlaceHolder11, Casing_PlaceHolder12, + Casing_PlaceHolder13, Casing_PlaceHolder14, Casing_PlaceHolder15, + ; public static final GregtechItemList[] DYE_ONLY_ITEMS = { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java index 2c43293e87..05661df905 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java @@ -258,6 +258,7 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered bOutput = aNBT.getBoolean("bOutput"); bRedstoneIfFull = aNBT.getBoolean("bRedstoneIfFull"); mTargetStackSize = aNBT.getInteger("mTargetStackSize"); + if (aNBT.hasKey("ownerUUID")) ownerUUID = UUID.fromString(aNBT.getString("ownerUUID")); } |