summaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-04-19 03:30:08 +0100
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-04-19 03:30:08 +0100
commit2a7e0a624f482a28af1c770dbcf2a20f52f94f78 (patch)
tree39b7652b939dd20763e242fbd49eb6d2ad6924da /src/main/resources
parent9dc6f69f701e42b30adf7d1b01488f425eaec265 (diff)
Added Midas Touch
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/jewelrycraft2/lang/en_US.lang1
-rw-r--r--src/main/resources/assets/jewelrycraft2/textures/gui/curses.pngbin3898 -> 8129 bytes
-rw-r--r--src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png (renamed from src/main/resources/assets/jewelrycraft2/textures/items/test/ingot2.png)bin313 -> 313 bytes
-rw-r--r--src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png (renamed from src/main/resources/assets/jewelrycraft2/textures/items/ingot3.png)bin315 -> 315 bytes
-rw-r--r--src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png (renamed from src/main/resources/assets/jewelrycraft2/textures/items/ingot4.png)bin308 -> 308 bytes
-rw-r--r--src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png (renamed from src/main/resources/assets/jewelrycraft2/textures/items/test/ingot5.png)bin301 -> 301 bytes
-rw-r--r--src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png (renamed from src/main/resources/assets/jewelrycraft2/textures/items/ingot6.png)bin314 -> 314 bytes
-rw-r--r--src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png (renamed from src/main/resources/assets/jewelrycraft2/textures/items/ingot7.png)bin307 -> 307 bytes
8 files changed, 1 insertions, 0 deletions
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
--- a/src/main/resources/assets/jewelrycraft2/textures/gui/curses.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/gui/curses.png
Binary files differ
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/test/ingot2.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png
index 8bd47da..8bd47da 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/test/ingot2.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png
Binary files differ
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ingot3.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png
index 47c9cb8..47c9cb8 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/ingot3.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png
Binary files differ
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ingot4.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png
index 78894d0..78894d0 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/ingot4.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png
Binary files differ
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/test/ingot5.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png
index 968b53d..968b53d 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/test/ingot5.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png
Binary files differ
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ingot6.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png
index e025782..e025782 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/ingot6.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png
Binary files differ
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ingot7.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png
index b378e29..b378e29 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/ingot7.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png
Binary files differ