From 2a7e0a624f482a28af1c770dbcf2a20f52f94f78 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Sun, 19 Apr 2015 03:30:08 +0100 Subject: Added Midas Touch --- .../resources/assets/jewelrycraft2/lang/en_US.lang | 1 + .../assets/jewelrycraft2/textures/gui/curses.png | Bin 3898 -> 8129 bytes .../assets/jewelrycraft2/textures/items/ingot3.png | Bin 315 -> 0 bytes .../assets/jewelrycraft2/textures/items/ingot4.png | Bin 308 -> 0 bytes .../assets/jewelrycraft2/textures/items/ingot6.png | Bin 314 -> 0 bytes .../assets/jewelrycraft2/textures/items/ingot7.png | Bin 307 -> 0 bytes .../jewelrycraft2/textures/items/test/ingot2.png | Bin 313 -> 0 bytes .../jewelrycraft2/textures/items/test/ingot5.png | Bin 301 -> 0 bytes .../jewelrycraft2/textures/items/unused/ingot2.png | Bin 0 -> 313 bytes .../jewelrycraft2/textures/items/unused/ingot3.png | Bin 0 -> 315 bytes .../jewelrycraft2/textures/items/unused/ingot4.png | Bin 0 -> 308 bytes .../jewelrycraft2/textures/items/unused/ingot5.png | Bin 0 -> 301 bytes .../jewelrycraft2/textures/items/unused/ingot6.png | Bin 0 -> 314 bytes .../jewelrycraft2/textures/items/unused/ingot7.png | Bin 0 -> 307 bytes 14 files changed, 1 insertion(+) delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/ingot3.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/ingot4.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/ingot6.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/ingot7.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/test/ingot2.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/test/ingot5.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang index 05a9bf9..681d740 100644 --- a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang +++ b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang @@ -47,6 +47,7 @@ tile.jewelrycraft2.moltenMetal.name=Molten tile.jewelrycraft2.shadowHand.name=Shadow Hand tile.jewelrycraft2.shadowEye.name=Cursed Eye tile.jewelrycraft2.handPedestal.name=Hand Pedestal +tile.jewelrycraft2.midasTouchBlock.name=Golden Creature itemGroup.jewelrycraft2=Jewelrycraft 2 itemGroup.Liquids=Liquids diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/curses.png b/src/main/resources/assets/jewelrycraft2/textures/gui/curses.png index d12c83d..27a9592 100644 Binary files a/src/main/resources/assets/jewelrycraft2/textures/gui/curses.png and b/src/main/resources/assets/jewelrycraft2/textures/gui/curses.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ingot3.png b/src/main/resources/assets/jewelrycraft2/textures/items/ingot3.png deleted file mode 100644 index 47c9cb8..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/ingot3.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ingot4.png b/src/main/resources/assets/jewelrycraft2/textures/items/ingot4.png deleted file mode 100644 index 78894d0..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/ingot4.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ingot6.png b/src/main/resources/assets/jewelrycraft2/textures/items/ingot6.png deleted file mode 100644 index e025782..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/ingot6.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ingot7.png b/src/main/resources/assets/jewelrycraft2/textures/items/ingot7.png deleted file mode 100644 index b378e29..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/ingot7.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/test/ingot2.png b/src/main/resources/assets/jewelrycraft2/textures/items/test/ingot2.png deleted file mode 100644 index 8bd47da..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/test/ingot2.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/test/ingot5.png b/src/main/resources/assets/jewelrycraft2/textures/items/test/ingot5.png deleted file mode 100644 index 968b53d..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/test/ingot5.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png new file mode 100644 index 0000000..8bd47da Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png new file mode 100644 index 0000000..47c9cb8 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png new file mode 100644 index 0000000..78894d0 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png new file mode 100644 index 0000000..968b53d Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png new file mode 100644 index 0000000..e025782 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png new file mode 100644 index 0000000..b378e29 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png differ -- cgit v1.2.3