aboutsummaryrefslogtreecommitdiff
path: root/main/java/gregtech/api
diff options
context:
space:
mode:
authorBlood-Asp <Blood@Asp>2015-05-11 16:09:03 +0200
committerBlood-Asp <Blood@Asp>2015-05-11 16:09:03 +0200
commit277e3ddfd28fcee2d1c9774870daf1c3e21a6c0f (patch)
tree83b3ae57e0846f96b7d3f308c3533c326def4496 /main/java/gregtech/api
parent1d802999d843e54dfef3ea294e420fd9d8557aa5 (diff)
downloadGT5-Unofficial-277e3ddfd28fcee2d1c9774870daf1c3e21a6c0f.tar.gz
GT5-Unofficial-277e3ddfd28fcee2d1c9774870daf1c3e21a6c0f.tar.bz2
GT5-Unofficial-277e3ddfd28fcee2d1c9774870daf1c3e21a6c0f.zip
update 5.08.12
- Added config to enable TCon in unification. - Added Teleporter. - Added Needs Maintainance Cover. - Changed Ultimate Battery Textures. - Changed Pump area (8(2^tier) -> 10(1.6^tier).
Diffstat (limited to 'main/java/gregtech/api')
-rw-r--r--main/java/gregtech/api/enums/ItemList.java2
-rw-r--r--main/java/gregtech/api/gui/GT_Container.java1
-rw-r--r--main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java1
3 files changed, 3 insertions, 1 deletions
diff --git a/main/java/gregtech/api/enums/ItemList.java b/main/java/gregtech/api/enums/ItemList.java
index 6a24834939..7581e73d7b 100644
--- a/main/java/gregtech/api/enums/ItemList.java
+++ b/main/java/gregtech/api/enums/ItemList.java
@@ -645,7 +645,7 @@ public enum ItemList implements IItemContainer {
Energy_LapotronicOrb2,
ZPM2, Quantum_Tank_LV,Quantum_Tank_MV,Quantum_Tank_HV,Quantum_Tank_EV,Quantum_Tank_IV, Quantum_Chest_LV, Quantum_Chest_MV, Quantum_Chest_HV, Quantum_Chest_EV, Quantum_Chest_IV,
- NULL, Cover_RedstoneTransmitterExternal,Cover_RedstoneTransmitterInternal,Cover_RedstoneReceiverExternal,Cover_RedstoneReceiverInternal, LargeTurbine, Ingot_Heavy1,Ingot_Heavy2,Ingot_Heavy3, Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV, Teleporter;
+ NULL, Cover_RedstoneTransmitterExternal,Cover_RedstoneTransmitterInternal,Cover_RedstoneReceiverExternal,Cover_RedstoneReceiverInternal, LargeTurbine, Ingot_Heavy1,Ingot_Heavy2,Ingot_Heavy3, Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV, Teleporter, Cover_NeedsMaintainance;
public static final ItemList[]
DYE_ONLY_ITEMS = {Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15}
diff --git a/main/java/gregtech/api/gui/GT_Container.java b/main/java/gregtech/api/gui/GT_Container.java
index 6585f79de2..dc5e59d7d4 100644
--- a/main/java/gregtech/api/gui/GT_Container.java
+++ b/main/java/gregtech/api/gui/GT_Container.java
@@ -25,6 +25,7 @@ public class GT_Container extends Container {
public InventoryPlayer mPlayerInventory;
public GT_Container (InventoryPlayer aPlayerInventory, IGregTechTileEntity aTileEntityInventory) {
+
mTileEntity = aTileEntityInventory;
mPlayerInventory = aPlayerInventory;
}
diff --git a/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java b/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
index 2c062c5d12..d4fc27aaf9 100644
--- a/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
+++ b/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
@@ -19,6 +19,7 @@ public class GT_ContainerMetaTile_Machine extends GT_Container {
public GT_ContainerMetaTile_Machine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
super(aInventoryPlayer, aTileEntity);
+
mTileEntity = aTileEntity;
if (mTileEntity != null && mTileEntity.getMetaTileEntity() != null) {