From 208b1f1e0d5faf601b53818b04f6699b2e6cb6bc Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Tue, 5 May 2015 22:07:10 +0100 Subject: - Working on a GUI showing what curses you get with a description on them - Added a search bar in the Liquids Tab for easier searching - Fixed an issue with golden objects giving errors due to missing default texture - Improved the Infamy Mask to have less parts, thus causing less lag - Improved ingots and ore detection - Fixed certain ores when smelted outputting a different ingot - Necklaces and Rings now render as well - Updated the guide at the Guide item to have the proper link to the mod as well as mention the right people who helped with it - Added a list of the ores that work in the guide - Added a new tab to the guide regarding the ores and the ingots they create - Changed the stun effect caused by rings with feathers as modifiers to be a potion effect instead --- src/main/resources/assets/jewelrycraft2/lang/en_US.lang | 12 +++++++----- .../assets/jewelrycraft2/textures/entities/Mask.png | Bin 331 -> 585 bytes .../assets/jewelrycraft2/textures/entities/Necklace.png | Bin 0 -> 421 bytes .../assets/jewelrycraft2/textures/entities/Ring.png | Bin 0 -> 237 bytes .../assets/jewelrycraft2/textures/gui/potions.png | Bin 0 -> 1692 bytes .../assets/jewelrycraft2/textures/items/blockMold.png | Bin 1328 -> 0 bytes .../jewelrycraft2/textures/items/clayBlockMold.png | Bin 464 -> 0 bytes .../jewelrycraft2/textures/items/unused/blockMold.png | Bin 0 -> 1328 bytes .../textures/items/unused/clayBlockMold.png | Bin 0 -> 464 bytes 9 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/gui/potions.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/blockMold.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/clayBlockMold.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png (limited to 'src/main/resources/assets') diff --git a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang index 4851fa5..76ec908 100644 --- a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang +++ b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang @@ -57,22 +57,22 @@ chatmessage.jewelrycraft2.molder.metaliscooling=Molten metal is cooling... chatmessage.jewelrycraft2.molder.moldisempty=Mold is currently empty. chatmessage.jewelrycraft2.molder.moldismissing=Molder does not contain a mold. chatmessage.jewelrycraft2.molder.hasmoltenmetal=You can't remove the mold. It contains molten metal! -chatmessage.jewelrycraft2.smelter.alreadyhasingot=The Smelter already contains a %s -chatmessage.jewelrycraft2.smelter.hasmolteningot=The Smelter contains a molten %s +chatmessage.jewelrycraft2.smelter.alreadyhasingot=The Smelter already contains %s +chatmessage.jewelrycraft2.smelter.hasmolteningot=The Smelter contains molten %s chatmessage.jewelrycraft2.smelter.itemneedstobeingot=The item needs to be an ingot! chatmessage.jewelrycraft2.smelter.itemrenamedtoingot=Nice try, but renaming it to an ingot doesn't make it an ingot :p You can't fool me player! chatmessage.jewelrycraft2.smelter.molderhasmoltenmetal=The Molder already has molten metal in it! chatmessage.jewelrycraft2.smelter.molderhasnomold=The Molder doesn't have a mold in it! You might as well pour this stuff on the ground, eh? chatmessage.jewelrycraft2.smelter.modlerhasitem=The Molder contains an item in it. Now you wouldn't want it to be destroyed, would you? chatmessage.jewelrycraft2.smelter.molderismissing=You need a Molder in front of this block in order to pour the molten metal! -chatmessage.jewelrycraft2.smelter.nowsmeltingingot=Smelter is now smelting a %s. +chatmessage.jewelrycraft2.smelter.nowsmeltingingot=Smelter is now smelting a(n) %s. chatmessage.jewelrycraft2.smelter.metalismelting=%s is being melted. chatmessage.jewelrycraft2.smelter.empty=The Smelter is empty. chatmessage.jewelrycraft2.table.hasenditem=First take out the crafted jewel before inserting new stuff. chatmessage.jewelrycraft2.table.missinggem=You need a gem. chatmessage.jewelrycraft2.table.missingjewelry=You're missing a piece of jewelry. chatmessage.jewelrycraft2.table.iscrafting=The %s is being modified. -chatmessage.jewelrycraft2.table.jewelrymodifiedfull=This piece of jewelry is already modified at maxium. You can't modify it anymore! +chatmessage.jewelrycraft2.table.jewelrymodifiedfull=This piece of jewelry is already modified at maximum. You can't modify it anymore! chatmessage.jewelrycraft2.table.jewelrycontainsmodifier=The piece of jewelry already contains a modifier. chatmessage.jewelrycraft2.table.jewelrycontainsjewel=The piece of jewelry already contains a jewel. @@ -81,4 +81,6 @@ death.attack.shadows=%1$s was consumed by the shadows death.attack.blackHeart=%1$s was killed by %2$s's curse entity.jewelrycraft2.Heart.name=Heart -entity.jewelrycraft2.Half-Heart.name=Half-Heart \ No newline at end of file +entity.jewelrycraft2.Half-Heart.name=Half-Heart + +jewelrycraft2.potion.stun=Stun \ No newline at end of file diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png index 0daa053..0ebdf14 100644 Binary files a/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png and b/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png new file mode 100644 index 0000000..fae7bcf Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png new file mode 100644 index 0000000..48233a7 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/potions.png b/src/main/resources/assets/jewelrycraft2/textures/gui/potions.png new file mode 100644 index 0000000..21a4b11 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/gui/potions.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/blockMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/blockMold.png deleted file mode 100644 index e1c2d7b..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/blockMold.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/clayBlockMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/clayBlockMold.png deleted file mode 100644 index 0dd9029..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/clayBlockMold.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png new file mode 100644 index 0000000..e1c2d7b Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png new file mode 100644 index 0000000..0dd9029 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png differ -- cgit v1.2.3