aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbasdxz <tudurap.com@gmail.com>2020-11-15 17:58:58 +0000
committerbasdxz <tudurap.com@gmail.com>2020-11-15 17:58:58 +0000
commit7de43d322f4b2761c0bcfc39675e53983c85fdb4 (patch)
treed159e2eb828a24f560c904ec02f2b69d52033962
parentab706fea9e4192b611788981930a575f6d4205fe (diff)
parent2ebe16d8075bd54a2a8f9a52e2b6b70c1eb17c49 (diff)
downloadGT5-Unofficial-7de43d322f4b2761c0bcfc39675e53983c85fdb4.tar.gz
GT5-Unofficial-7de43d322f4b2761c0bcfc39675e53983c85fdb4.tar.bz2
GT5-Unofficial-7de43d322f4b2761c0bcfc39675e53983c85fdb4.zip
Merge remote-tracking branch 'origin/master' into BassAddons
-rw-r--r--build.properties4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/build.properties b/build.properties
index 3dcac7b71e..02c2b83517 100644
--- a/build.properties
+++ b/build.properties
@@ -6,8 +6,8 @@ ic2.version=2.2.790-experimental
codechickenlib.version=1.1.3.140
codechickencore.version=1.0.7.47
nei.version=1.0.5.120
-gregtech.jenkinsbuild=648
-gregtech.version=5.09.33.52
+gregtech.jenkinsbuild=736
+gregtech.version=5.09.33.55
#cofhcore.version=[1.7.10]3.1.4-329-dev
cofh_core_version=2388751
yamcore.version=0.5.79
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
index 5d88fdfc50..6a6a707399 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
@@ -143,7 +143,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
totalLen++;
offset--;
}
- if (totalLen > 16) {
+ if (totalLen > 17) {
return false;
}
if (!structureCheck_EM(cap, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 2, ++offset)) {
@@ -375,4 +375,4 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
public String[] getStructureDescription(ItemStack stackSize) {
return description;
}
-} \ No newline at end of file
+}