diff options
| author | DreamMasterXXL <dream-master@gmx.net> | 2021-09-17 22:52:04 +0200 |
|---|---|---|
| committer | DreamMasterXXL <dream-master@gmx.net> | 2021-09-17 22:52:04 +0200 |
| commit | 06d7905348de8bbf00752afc0f14a0a9c83fbeb8 (patch) | |
| tree | d6031189f8042b3c69392754168bc320dc55a7e3 /src/main/java/gregtech/api | |
| parent | 48c6eed5d56177a8056454eff6112ca295b0f73b (diff) | |
| parent | 53a590f632e6f9c825171f74c2e11ba94da111af (diff) | |
| download | GT5-Unofficial-06d7905348de8bbf00752afc0f14a0a9c83fbeb8.tar.gz GT5-Unofficial-06d7905348de8bbf00752afc0f14a0a9c83fbeb8.tar.bz2 GT5-Unofficial-06d7905348de8bbf00752afc0f14a0a9c83fbeb8.zip | |
Merge branch 'experimental' of github.com:GTNewHorizons/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/java/gregtech/api')
3 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 862985faca..0b47d4681a 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -780,6 +780,7 @@ public enum ItemList implements IItemContainer { Casing_Grate, Casing_Vent, Casing_RadiationProof, + Casing_AdvancedRadiationProof, Casing_Firebox_Bronze, Casing_Firebox_Steel, Casing_Firebox_TungstenSteel, diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index b0f7f7a337..c4c18b8725 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -298,6 +298,7 @@ public class Textures { MACHINE_CASING_VENT, MACHINE_CASING_RADIATIONPROOF, + MACHINE_CASING_ADVANCEDRADIATIONPROOF, MACHINE_CASING_FIREBOX_BRONZE, MACHINE_CASING_FIREBOX_STEEL, MACHINE_CASING_FIREBOX_TUNGSTENSTEEL, diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java index cc2513f5c2..8f54112885 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java @@ -50,7 +50,8 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta @Override public void setExtendedFacing(ExtendedFacing newExtendedFacing) { if (mExtendedFacing != newExtendedFacing) { - stopMachine(); + if(mMachine) + stopMachine(); mExtendedFacing = newExtendedFacing; IGregTechTileEntity base = getBaseMetaTileEntity(); mMachine = false; |