diff --git a/build.gradle b/build.gradle
index fe799456b..dad62d983 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ group = "de.ellpeck.actuallyadditions"
 archivesBaseName = "ActuallyAdditions"
 
 minecraft {
-    version = "1.9.4-12.17.0.1909-1.9.4"
+    version = "1.9.4-12.17.0.1936-1.9.4"
     runDir = "idea"
 
     mappings = "snapshot_20160519"
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java
index d297251bc..97ca8781d 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java
@@ -16,6 +16,8 @@ import net.minecraft.item.ItemArmor.ArmorMaterial;
 import net.minecraft.util.SoundEvent;
 import net.minecraftforge.common.util.EnumHelper;
 
+import java.util.Locale;
+
 public class InitArmorMaterials{
 
     public static ArmorMaterial armorMaterialEmerald;
@@ -45,8 +47,6 @@ public class InitArmorMaterials{
     }
 
     private static ArmorMaterial addArmorMaterial(String name, String textureName, int durability, int[] reductionAmounts, int enchantability, SoundEvent soundOnEquip){
-        //TODO Fuck forge because this broke
-        //return EnumHelper.addArmorMaterial((ModUtil.MOD_ID+"_"+name).toUpperCase(Locale.ROOT), textureName, durability, reductionAmounts, enchantability, soundOnEquip);
-        return EnumHelper.addEnum(ArmorMaterial.class, name, new Class[]{String.class, int.class, int[].class, int.class, SoundEvent.class, float.class}, textureName, durability, reductionAmounts, enchantability, soundOnEquip, 0F);
+        return EnumHelper.addArmorMaterial((ModUtil.MOD_ID+"_"+name).toUpperCase(Locale.ROOT), textureName, durability, reductionAmounts, enchantability, soundOnEquip, 0F);
     }
 }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java
index fef3fd90e..34698494b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java
@@ -28,14 +28,14 @@ public class Util{
     @SuppressWarnings("deprecation")
     public static final int BUCKET = FluidContainerRegistry.BUCKET_VOLUME;
 
-    public static final EnumRarity CRYSTAL_RED_RARITY = addRarity(ModUtil.MOD_ID+"crystalRed", TextFormatting.DARK_RED, ModUtil.NAME+" Red Crystal");
-    public static final EnumRarity CRYSTAL_BLUE_RARITY = addRarity(ModUtil.MOD_ID+"crystalBlue", TextFormatting.DARK_BLUE, ModUtil.NAME+" Blue Crystal");
-    public static final EnumRarity CRYSTAL_LIGHT_BLUE_RARITY = addRarity(ModUtil.MOD_ID+"crystalLightBlue", TextFormatting.BLUE, ModUtil.NAME+" Light Blue Crystal");
-    public static final EnumRarity CRYSTAL_BLACK_RARITY = addRarity(ModUtil.MOD_ID+"crystalBlack", TextFormatting.DARK_GRAY, ModUtil.NAME+" Black Crystal");
-    public static final EnumRarity CRYSTAL_GREEN_RARITY = addRarity(ModUtil.MOD_ID+"crystalGreen", TextFormatting.DARK_GREEN, ModUtil.NAME+" Green Crystal");
-    public static final EnumRarity CRYSTAL_WHITE_RARITY = addRarity(ModUtil.MOD_ID+"crystalWhite", TextFormatting.GRAY, ModUtil.NAME+" White Crystal");
+    public static final EnumRarity CRYSTAL_RED_RARITY = addRarity("crystalRed", TextFormatting.DARK_RED, ModUtil.NAME+" Red Crystal");
+    public static final EnumRarity CRYSTAL_BLUE_RARITY = addRarity("crystalBlue", TextFormatting.DARK_BLUE, ModUtil.NAME+" Blue Crystal");
+    public static final EnumRarity CRYSTAL_LIGHT_BLUE_RARITY = addRarity("crystalLightBlue", TextFormatting.BLUE, ModUtil.NAME+" Light Blue Crystal");
+    public static final EnumRarity CRYSTAL_BLACK_RARITY = addRarity("crystalBlack", TextFormatting.DARK_GRAY, ModUtil.NAME+" Black Crystal");
+    public static final EnumRarity CRYSTAL_GREEN_RARITY = addRarity("crystalGreen", TextFormatting.DARK_GREEN, ModUtil.NAME+" Green Crystal");
+    public static final EnumRarity CRYSTAL_WHITE_RARITY = addRarity("crystalWhite", TextFormatting.GRAY, ModUtil.NAME+" White Crystal");
 
-    public static final EnumRarity FALLBACK_RARITY = EnumHelper.addRarity(ModUtil.MOD_ID+".fallback", TextFormatting.STRIKETHROUGH, ModUtil.NAME+" Fallback");
+    public static final EnumRarity FALLBACK_RARITY = addRarity("fallback", TextFormatting.STRIKETHROUGH, ModUtil.NAME+" Fallback");
 
     public static void registerEvent(Object o){
         MinecraftForge.EVENT_BUS.register(o);
diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/additionalbanners_apple.png b/src/main/resources/assets/minecraft/textures/entity/shield/additionalbanners_apple.png
new file mode 100644
index 000000000..070039380
Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/shield/additionalbanners_apple.png differ