aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2018-12-19 15:45:04 +0100
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2018-12-19 15:45:04 +0100
commitddfae9c6ecf6fb42ba352cca6dd6afd4a17bdb1c (patch)
treea6885c366a4ac24b9efa72b4bd558338940dae65
parent8892a0249d81b578eb12db2c3b26ab7a296a8980 (diff)
downloadGT5-Unofficial-ddfae9c6ecf6fb42ba352cca6dd6afd4a17bdb1c.tar.gz
GT5-Unofficial-ddfae9c6ecf6fb42ba352cca6dd6afd4a17bdb1c.tar.bz2
GT5-Unofficial-ddfae9c6ecf6fb42ba352cca6dd6afd4a17bdb1c.zip
fixed a crash in NEI
- version update - added bartworks logo Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
-rw-r--r--BWLogo.pngbin0 -> 3972 bytes
-rw-r--r--build.properties2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java3
3 files changed, 3 insertions, 2 deletions
diff --git a/BWLogo.png b/BWLogo.png
new file mode 100644
index 0000000000..79d6679842
--- /dev/null
+++ b/BWLogo.png
Binary files differ
diff --git a/build.properties b/build.properties
index bde9b6d663..1d08c15676 100644
--- a/build.properties
+++ b/build.properties
@@ -1,5 +1,5 @@
mc_version=1.7.10
-mod_version=0.1.1
+mod_version=0.1.2
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/common/items/Circuit_Programmer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java
index 42167e7209..a8df28c5aa 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java
@@ -29,7 +29,8 @@ public class Circuit_Programmer extends GT_Generic_Item implements IElectricItem
@Override
public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
super.addInformation(aStack,aPlayer,aList,aF3_H);
- aList.add("Has Circuit inside? "+ (aStack.getTagCompound().getBoolean("HasChip") ? "Yes" : "No"));
+ if (aStack != null && aStack.getTagCompound() != null)
+ aList.add("Has Circuit inside? "+ (aStack.getTagCompound().getBoolean("HasChip") ? "Yes" : "No"));
aList.add("Added by"+ ChatColorHelper.DARKGREEN +" BartWorks");
}