aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorDreamMasterXXL <dream-master@gmx.net>2020-04-18 11:24:25 +0200
committerDreamMasterXXL <dream-master@gmx.net>2020-04-18 11:24:25 +0200
commit5486033493ca5ed7842a036862702a6119649b7f (patch)
tree23aafc104cbaeb0aab2993cccf72ffc80d02caf8 /src/main/java/gregtech/common
parentdbe99c7d577a16093f13905fc7cd5802fc029c95 (diff)
parente90daaecbee9de5f42aafec9cc9895506bf60932 (diff)
downloadGT5-Unofficial-5486033493ca5ed7842a036862702a6119649b7f.tar.gz
GT5-Unofficial-5486033493ca5ed7842a036862702a6119649b7f.tar.bz2
GT5-Unofficial-5486033493ca5ed7842a036862702a6119649b7f.zip
Merge branch 'experimental' into Growthmedium
# Conflicts: # build.properties
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java
index c0eb143f25..eeeef95dc3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java
@@ -25,7 +25,7 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn
public static final int INPUT_SLOTS = 3, OUTPUT_SLOTS = 3;
public int mMaxProgresstime = 0;
- public int mUpdate = 5;
+ public volatile int mUpdate = 5;
public int mProgresstime = 0;
public boolean mMachine = false;