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 --- .../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 8 files changed, 0 insertions(+), 0 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/jewelrycraft2/textures') 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