diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-01-12 07:33:38 +0100 |
|---|---|---|
| committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-01-12 07:33:38 +0100 |
| commit | 52a935e46e0e9f9a5249efdeff8ee6514d5c144e (patch) | |
| tree | 897b8a589179e6d7d81061a568a2183bf01aa2c8 | |
| parent | 299823db1caa4c3343b3f601f9a63bbd3baee060 (diff) | |
| download | GT5-Unofficial-52a935e46e0e9f9a5249efdeff8ee6514d5c144e.tar.gz GT5-Unofficial-52a935e46e0e9f9a5249efdeff8ee6514d5c144e.tar.bz2 GT5-Unofficial-52a935e46e0e9f9a5249efdeff8ee6514d5c144e.zip | |
version splittage
+the mod version now consists of 3 subversions
+fixed another NPE
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | build.properties | 4 | ||||
| -rw-r--r-- | src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_CircuitProgrammer.java | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index 0c65172e39..e9ae2df168 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ configFile.withReader { } -version = config.mod_version +version = config.majorUpdate+"."+config.minorUpdate+"."+config.buildNumber group= "com.github.bartimaeusnek.bartworks" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "bartworks"+ "[" + config.mc_version + "]" diff --git a/build.properties b/build.properties index 6427c44557..5a578408d1 100644 --- a/build.properties +++ b/build.properties @@ -21,7 +21,9 @@ # mc_version=1.7.10 -mod_version=0.3.11 +majorUpdate=0 +minorUpdate=3 +buildNumber=12 ic2.version=2.2.828-experimental gregtech.version=5.09.32.36 gregtech.jenkinsbuild=143 diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_CircuitProgrammer.java b/src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_CircuitProgrammer.java index 9f0254bd62..f52d3e8b63 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_CircuitProgrammer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_CircuitProgrammer.java @@ -83,7 +83,7 @@ public class GT_Container_CircuitProgrammer extends Container { Slot chipslot = (Slot) this.inventorySlots.get(0); if (SlotNR > 24) { Slot slot = (Slot) this.inventorySlots.get(SlotNR); - if (slot != null && slot.getStack().getItem().equals(GT_Utility.getIntegratedCircuit(0).getItem())) { + if (slot != null && slot.getStack() != null && slot.getStack().getItem().equals(GT_Utility.getIntegratedCircuit(0).getItem())) { if (chipslot.getStack() == null) { chipslot.putStack(slot.getStack()); slot.decrStackSize(1); |