From 5fce447142b3c0f4a214ca7eb208d9e5c25e6377 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Sun, 23 Mar 2014 19:01:47 +0200 Subject: Added necklaces, Altar Block, new stuff, better Shadow Ingot texture --- resources/assets/jewelrycraft/Changelog.txt | 2 ++ resources/assets/jewelrycraft/lang/en_US.lang | 4 +++- .../jewelrycraft/textures/blocks/altar_bottom.png | Bin 0 -> 391 bytes .../assets/jewelrycraft/textures/blocks/altar_side.png | Bin 0 -> 3220 bytes .../assets/jewelrycraft/textures/blocks/altar_top.png | Bin 0 -> 3125 bytes .../jewelrycraft/textures/blocks/oreShadow.png.mcmeta | 5 ----- .../assets/jewelrycraft/textures/items/ingotShadow.png | Bin 703 -> 467 bytes resources/assets/jewelrycraft/textures/items/jewel.png | Bin 244 -> 0 bytes .../jewelrycraft/textures/items/jewelNecklace.png | Bin 0 -> 241 bytes .../assets/jewelrycraft/textures/items/jewelRing.png | Bin 0 -> 244 bytes 10 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 resources/assets/jewelrycraft/textures/blocks/altar_bottom.png create mode 100644 resources/assets/jewelrycraft/textures/blocks/altar_side.png create mode 100644 resources/assets/jewelrycraft/textures/blocks/altar_top.png delete mode 100644 resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta delete mode 100644 resources/assets/jewelrycraft/textures/items/jewel.png create mode 100644 resources/assets/jewelrycraft/textures/items/jewelNecklace.png create mode 100644 resources/assets/jewelrycraft/textures/items/jewelRing.png (limited to 'resources') diff --git a/resources/assets/jewelrycraft/Changelog.txt b/resources/assets/jewelrycraft/Changelog.txt index c295992..3035388 100644 --- a/resources/assets/jewelrycraft/Changelog.txt +++ b/resources/assets/jewelrycraft/Changelog.txt @@ -11,6 +11,8 @@ - Removed animation from the Shadow Ore - Made Shadow Ore more common - Balanced Villager trades +- Fixed Displayer text rendering in front of everything +- Added the Jewel Altar TODO - Make it so you can smelt ores in the smelter diff --git a/resources/assets/jewelrycraft/lang/en_US.lang b/resources/assets/jewelrycraft/lang/en_US.lang index 4209988..41bffe7 100644 --- a/resources/assets/jewelrycraft/lang/en_US.lang +++ b/resources/assets/jewelrycraft/lang/en_US.lang @@ -7,6 +7,7 @@ item.Jewelrycraft.mold.clayIngot.name=Clay Ingot Mold item.Jewelrycraft.mold.clayRing.name=Clay Ring Mold item.Jewelrycraft.mold.clayNecklace.name=Clay Necklace Mold item.Jewelrycraft.ring.name=Ring +item.Jewelrycraft.necklace.name=Necklace item.Jewelrycraft.crystal.name=Crystal tile.Jewelrycraft.oreShadow.name=Shadow Ore tile.Jewelrycraft.blockShadow.name=Shadow Block @@ -15,6 +16,7 @@ tile.Jewelrycraft.smelter.name=Smelter tile.Jewelrycraft.molder.name=Molder tile.Jewelrycraft.displayer.name=Storage Displayer tile.Jewelrycraft.jewelCraftingTable.name=Jeweler's Crafting Table +tile.Jewelrycraft.altar.name=Jewel Altar itemGroup.JewelryCraft=Jewelrycraft itemGroup.Rings=Jewelrycraft Rings chatmessage.Jewelrycraft.molder.addedmold=Added %s to molder. @@ -34,7 +36,7 @@ chatmessage.Jewelrycraft.smelter.nowsmeltingingot=Smelter is now smelting a %s. chatmessage.Jewelrycraft.smelter.metalismelting=%s is being melted. chatmessage.Jewelrycraft.smelter.empty=The Smelter is empty. chatmessage.Jewelrycraft.table.hasenditem=First take out the crafted jewel before inserting new stuff. -chatmessage.Jewelrycraft.table.missingjewelryandmodifierorjewel=You need a ring and a modifier or a jewel. +chatmessage.Jewelrycraft.table.missingjewelryandmodifierorjewel=You need a jewelry piece and a modifier or a jewel. chatmessage.Jewelrycraft.table.missingjewelry=You're missing a piece of jewelry. chatmessage.Jewelrycraft.table.missingmodifierorjewel=You need a modifier or a jewel. chatmessage.Jewelrycraft.table.iscrafting=The %s is being modified. diff --git a/resources/assets/jewelrycraft/textures/blocks/altar_bottom.png b/resources/assets/jewelrycraft/textures/blocks/altar_bottom.png new file mode 100644 index 0000000..7ca4c6a Binary files /dev/null and b/resources/assets/jewelrycraft/textures/blocks/altar_bottom.png differ diff --git a/resources/assets/jewelrycraft/textures/blocks/altar_side.png b/resources/assets/jewelrycraft/textures/blocks/altar_side.png new file mode 100644 index 0000000..3a69977 Binary files /dev/null and b/resources/assets/jewelrycraft/textures/blocks/altar_side.png differ diff --git a/resources/assets/jewelrycraft/textures/blocks/altar_top.png b/resources/assets/jewelrycraft/textures/blocks/altar_top.png new file mode 100644 index 0000000..39210c3 Binary files /dev/null and b/resources/assets/jewelrycraft/textures/blocks/altar_top.png differ diff --git a/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta deleted file mode 100644 index bf4c01e..0000000 --- a/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -} \ No newline at end of file diff --git a/resources/assets/jewelrycraft/textures/items/ingotShadow.png b/resources/assets/jewelrycraft/textures/items/ingotShadow.png index 82b57c7..e3b3aed 100644 Binary files a/resources/assets/jewelrycraft/textures/items/ingotShadow.png and b/resources/assets/jewelrycraft/textures/items/ingotShadow.png differ diff --git a/resources/assets/jewelrycraft/textures/items/jewel.png b/resources/assets/jewelrycraft/textures/items/jewel.png deleted file mode 100644 index 4875772..0000000 Binary files a/resources/assets/jewelrycraft/textures/items/jewel.png and /dev/null differ diff --git a/resources/assets/jewelrycraft/textures/items/jewelNecklace.png b/resources/assets/jewelrycraft/textures/items/jewelNecklace.png new file mode 100644 index 0000000..41244d4 Binary files /dev/null and b/resources/assets/jewelrycraft/textures/items/jewelNecklace.png differ diff --git a/resources/assets/jewelrycraft/textures/items/jewelRing.png b/resources/assets/jewelrycraft/textures/items/jewelRing.png new file mode 100644 index 0000000..4875772 Binary files /dev/null and b/resources/assets/jewelrycraft/textures/items/jewelRing.png differ -- cgit v1.2.3