From 5f725cb97153c4f54c720b9420840c49b054bb07 Mon Sep 17 00:00:00 2001 From: TheTemporatlist Date: Fri, 28 Nov 2014 10:53:11 -0500 Subject: [PATCH 1/2] Fixed possible NPE --- src/main/java/tconstruct/client/ArmorControls.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/client/ArmorControls.java b/src/main/java/tconstruct/client/ArmorControls.java index e7f33c46..d0a7a39e 100644 --- a/src/main/java/tconstruct/client/ArmorControls.java +++ b/src/main/java/tconstruct/client/ArmorControls.java @@ -104,7 +104,7 @@ public class ArmorControls { private void checkKeys() { for (KeyBinding key : this.keys) { - if (this.isKeyActive(key.getKeyCode())) { + if (key != null && this.isKeyActive(key.getKeyCode())) { this.keyPressed(key); } } From 746fcdb09d20903e50d624df7f09807eab302dc3 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 3 Dec 2014 21:26:12 +0100 Subject: [PATCH 2/2] Update it_IT.lang --- resources/assets/tinker/lang/it_IT.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/tinker/lang/it_IT.lang b/resources/assets/tinker/lang/it_IT.lang index f1ee2e1c..1661af53 100644 --- a/resources/assets/tinker/lang/it_IT.lang +++ b/resources/assets/tinker/lang/it_IT.lang @@ -221,6 +221,7 @@ item.tconstruct.MetalPattern.fletching.name=Stampo per testa di freccia item.tconstruct.MetalPattern.arrowhead.name=Stampo per impennaggio item.tconstruct.MetalPattern.ingot.name=Stampo per lingotti item.tconstruct.MetalPattern.gem.name=Stampo per gemma +item.tconstruct.MetalPattern.nugget.name=Stampo per pepita item.tconstruct.Materials.PaperStack.name=Pila di carta item.tconstruct.Materials.SlimeCrystal.name=Cristallo di gelatina