From f531879f51d75d0447feb635d2d65c5f127b3c99 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 24 Aug 2015 13:23:03 -0400 Subject: [PATCH] Source Release: corrected image error while merging, update some classes for consistency with the private source --- assets/icons.png | Bin 2102 -> 4283 bytes .../items/KindofMisc.java | 1 + .../items/armor/ClothArmor.java | 1 - .../items/armor/LeatherArmor.java | 1 - .../items/armor/MailArmor.java | 1 - .../items/armor/PlateArmor.java | 1 - .../items/armor/ScaleArmor.java | 1 - .../items/wands/WandOfCorruption.java | 1 + 8 files changed, 2 insertions(+), 5 deletions(-) diff --git a/assets/icons.png b/assets/icons.png index b134ae1f0df88c9b1ab568c8c0bbe3a97b0d76cf..a644686846213af196bda6fe6ed0dea7a32a7b06 100644 GIT binary patch delta 4270 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 y{syl