From 40487f07fa5ef31fde99713c0b842d34a0ba3622 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Sun, 31 May 2015 01:44:17 +0100 Subject: - Fixed an issue with the Liquids tab - Changed Entity registration so it only uses 'registerModEntity' to fix potential issues - Added crystal blocks - Changed Jewelry Tab to not override TiCon tabs (sorry TiCon, your system is good, but not for me) - The player renders in the Jewelry GUI (makes it easier for you to see how the jewelry render) - The Pentagram now has an actual effect - The Pentagram now renders beneath your feet when you look down and no longer does it in your inventory; it is also a lot smaller - Working on Structures - Created my own WeightedRandomItem (why isn't this in vanilla?) - Updated the curse API so now people can specify when a curse can be activated (I believe the world is all you need :p) - Some curses can no longer aquired in hardcore (such as Rotten Heart, Midas Touch etc) which would make it impossible to work with and require a total restart of the game (as the only way to get rid of them is by dying to replace them) Hooraaay for proper changelogs! --- .../resources/assets/jewelrycraft2/lang/en_US.lang | 37 +++++++++++---------- .../assets/jewelrycraft2/textures/gui/hearts.png | Bin 18141 -> 18400 bytes .../jewelrycraft2/textures/items/structureGen.png | Bin 0 -> 317 bytes 3 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/structureGen.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 fdd3773..e1d9fe4 100644 --- a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang +++ b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang @@ -19,6 +19,7 @@ item.jewelrycraft2.bucket.name=Bucket of Molten item.jewelrycraft2.jewelryModifier.name=Jewelry Modifier (Creative Only) item.jewelrycraft2.goldObject.name=Golden Object +item.jewelrycraft2.structureGen.name=Structure Generator (Creative Only) item.jewelrycraft2.goldObject.info.standard=Shiny, but useless :( item.jewelrycraft2.goldObject.info.food=It's made of solid gold! How are you suppose to eat this? @@ -41,22 +42,22 @@ tile.jewelrycraft2.shadowEye.name=Cursed Eye tile.jewelrycraft2.handPedestal.name=Hand Pedestal tile.jewelrycraft2.midasTouchBlock.name=Golden Creature -tile.jewelrycraft2.blockCrystal.0.name=Black Crystal -tile.jewelrycraft2.blockCrystal.1.name=Red Crystal -tile.jewelrycraft2.blockCrystal.2.name=Green Crystal -tile.jewelrycraft2.blockCrystal.3.name=Brown Crystal -tile.jewelrycraft2.blockCrystal.4.name=Blue Crystal -tile.jewelrycraft2.blockCrystal.5.name=Purple Crystal -tile.jewelrycraft2.blockCrystal.6.name=Cyan Crystal -tile.jewelrycraft2.blockCrystal.7.name=Light Gray Crystal -tile.jewelrycraft2.blockCrystal.8.name=Gray Crystal -tile.jewelrycraft2.blockCrystal.9.name=Pink Crystal -tile.jewelrycraft2.blockCrystal.10.name=Lime Crystal -tile.jewelrycraft2.blockCrystal.11.name=Yellow Crystal -tile.jewelrycraft2.blockCrystal.12.name=Light Blue Crystal -tile.jewelrycraft2.blockCrystal.13.name=Magenta Crystal -tile.jewelrycraft2.blockCrystal.14.name=Orange Crystal -tile.jewelrycraft2.blockCrystal.15.name=White Crystal +tile.jewelrycraft2.blockCrystal.0.name=Squidium Black Crystal +tile.jewelrycraft2.blockCrystal.1.name=Pokefennum Red Crystal +tile.jewelrycraft2.blockCrystal.2.name=Onyxium Green Crystal +tile.jewelrycraft2.blockCrystal.3.name=XCompium Brown Crystal +tile.jewelrycraft2.blockCrystal.4.name=Laurium Blue Crystal +tile.jewelrycraft2.blockCrystal.5.name=Jadium Purple Crystal +tile.jewelrycraft2.blockCrystal.6.name=Ecutruinium Cyan Crystal +tile.jewelrycraft2.blockCrystal.7.name=Fiskium Light Gray Crystal +tile.jewelrycraft2.blockCrystal.8.name=Pigmented Gray Crystal +tile.jewelrycraft2.blockCrystal.9.name=Aureylium Pink Crystal +tile.jewelrycraft2.blockCrystal.10.name=Soarynum Lime Crystal +tile.jewelrycraft2.blockCrystal.11.name=Blorphium Yellow Crystal +tile.jewelrycraft2.blockCrystal.12.name=Direium Light Blue Crystal +tile.jewelrycraft2.blockCrystal.13.name=Vazkiium Magenta Crystal +tile.jewelrycraft2.blockCrystal.14.name=Sipsium Orange Crystal +tile.jewelrycraft2.blockCrystal.15.name=Pahium White Crystal itemGroup.jewelrycraft2=Jewelrycraft 2 itemGroup.Liquids=Liquids @@ -146,4 +147,6 @@ guide.jewelrycraft2.tab.misc=Gems, Ores and Ingots guide.jewelrycraft2.tab.items=Items guide.jewelrycraft2.tab.modifiers=Modifiers guide.jewelrycraft2.tab.oretoingot=Ores to Ingots -guide.jewelrycraft2.tab.ritual=Ritual \ No newline at end of file +guide.jewelrycraft2.tab.ritual=Ritual + +bucket.unknown=Bucket of Unknown Content \ No newline at end of file diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png b/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png index 3371ea5..3ac201f 100644 Binary files a/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png and b/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/structureGen.png b/src/main/resources/assets/jewelrycraft2/textures/items/structureGen.png new file mode 100644 index 0000000..83fbcbc Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/structureGen.png differ -- cgit v1.2.3