Merge branch 'rift' of github.com:romangraef/NotEnoughUpdates-REPO into rift

2 files changed, 19 insertions, 17 deletions

diff --git a/items/ENIGMA_CLOAK.json b/items/ENIGMA_CLOAK.json
index 83422173..0d16e000 100644
--- a/items/ENIGMA_CLOAK.json
+++ b/items/ENIGMA_CLOAK.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§5Enigma Cloak",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"0854e3e8-06e6-376d-8d07-5fef1705a666\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY4NDMzODg4MzYzMSwKICAicHJvZmlsZUlkIiA6ICIzYTE5NDgyNTYyZTc0MzFkYmNmOGUwOWE4N2VhMmQ5OSIsCiAgInByb2ZpbGVOYW1lIiA6ICJNckxpYW0yNjE0IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzdjZDliOTNjODg4MmRjMmJlZmU5YzEzZDc2NTlhMzM4ZWI3NDU0YjhhMThlNzUzMTBkZjA1MTAxOTRlMmQ3YTEiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ\u003d\u003d\"}]}},display:{Lore:[0:\"§7Find §5Enigma Souls §7across the\",1:\"§7Rift Dimension.\",2:\"\",3:\"§7Each adds §a+§a20ф Rift Time\",4:\"§a§7to this item.\",5:\"\",6:\"§7Every §54 Souls§7, go back to\",7:\"§7§5Enigma §7for more upgrades.\",8:\"\",9:\"§7You found: §d0§5/42 Souls\",10:\"\",11:\"§5§lEPIC CLOAK\",12:\"\",13:\"§7Cost\",14:\"§d100 Motes\",15:\"\",16:\"§7§cYou don\u0027t have enough Motes,\",17:\"§ctry picking them up around the\",18:\"§ccrib or killing mobs in the\",19:\"§cwoods!\"],Name:\"§5Enigma Cloak\"},ExtraAttributes:{id:\"ENIGMA_CLOAK\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"0854e3e8-06e6-376d-8d07-5fef1705a666\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY4NDMzODg4MzYzMSwKICAicHJvZmlsZUlkIiA6ICIzYTE5NDgyNTYyZTc0MzFkYmNmOGUwOWE4N2VhMmQ5OSIsCiAgInByb2ZpbGVOYW1lIiA6ICJNckxpYW0yNjE0IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzdjZDliOTNjODg4MmRjMmJlZmU5YzEzZDc2NTlhMzM4ZWI3NDU0YjhhMThlNzUzMTBkZjA1MTAxOTRlMmQ3YTEiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ\u003d\u003d\"}]}},display:{Lore:[0:\"§7Find §5Enigma Souls §7across the\",1:\"§7Rift Dimension.\",2:\"\",3:\"§7Each adds §a+§a20ф Rift Time\",4:\"§a§7to this item.\",5:\"\",6:\"§7Every §54 Souls§7, go back to\",7:\"§7§5Enigma §7for more upgrades.\",8:\"\",9:\"§7You found: §d§k0§5/42 Souls\",10:\"\",11:\"§5§lEPIC CLOAK\"],Name:\"§5Enigma Cloak\"},ExtraAttributes:{id:\"ENIGMA_CLOAK\"}}",
   "damage": 3,
   "lore": [
     "§7Find §5Enigma Souls §7across the",
@@ -13,17 +13,9 @@
     "§7Every §54 Souls§7, go back to",
     "§7§5Enigma §7for more upgrades.",
     "",
-    "§7You found: §d0§5/42 Souls",
+    "§7You found: §d§k0§5/42 Souls",
     "",
-    "§5§lEPIC CLOAK",
-    "",
-    "§7Cost",
-    "§d100 Motes",
-    "",
-    "§7§cYou don\u0027t have enough Motes,",
-    "§ctry picking them up around the",
-    "§ccrib or killing mobs in the",
-    "§cwoods!"
+    "§5§lEPIC CLOAK"
   ],
   "internalname": "ENIGMA_CLOAK",
   "crafttext": "",
diff --git a/items/RIFT_TROPHY_WYLDLY_SUPREME.json b/items/RIFT_TROPHY_WYLDLY_SUPREME.json
index f8204951..0430e461 100644
--- a/items/RIFT_TROPHY_WYLDLY_SUPREME.json
+++ b/items/RIFT_TROPHY_WYLDLY_SUPREME.json
@@ -1,19 +1,29 @@
 {
   "itemid": "minecraft:leaves",
   "displayname": "§cSupreme Timecharm",
-  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§7Bring this back to §dElise\",1:\"§dXXXIII§7, she\u0027ll know what to do\",2:\"§7with it!\",3:\"\",4:\"§8§l* §8Soulbound §8§l*\",5:\"§c§lSPECIAL RIFT TIMECHARM\"],Name:\"§cSupreme Timecharm\"},ExtraAttributes:{id:\"RIFT_TROPHY_WYLDLY_SUPREME\"}}",
+  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§7Place this timecharm in the\",1:\"§7§dRift Gallery §7to secure it\",2:\"§7forever!\",3:\"\",4:\"§8§l* §8Soulbound §8§l*\",5:\"§c§lSPECIAL RIFT TIMECHARM\"],Name:\"§cSupreme Timecharm\"},ExtraAttributes:{id:\"RIFT_TROPHY_WYLDLY_SUPREME\"}}",
   "damage": 1,
   "lore": [
-    "§7Bring this back to §dElise",
-    "§dXXXIII§7, she\u0027ll know what to do",
-    "§7with it!",
+    "§7Place this timecharm in the",
+    "§7§dRift Gallery §7to secure it",
+    "§7forever!",
     "",
     "§8§l* §8Soulbound §8§l*",
     "§c§lSPECIAL RIFT TIMECHARM"
   ],
+  "recipe": {
+    "A1": "BOTTLED_ODONATA:1",
+    "A2": "LIL_PAD:16",
+    "A3": "BOTTLED_ODONATA:1",
+    "B1": "DEADGEHOG_SPINE:12",
+    "B2": "LEECH_SUPREME_FRAGMENT:4",
+    "B3": "DEADGEHOG_SPINE:12",
+    "C1": "BOTTLED_ODONATA:1",
+    "C2": "LIL_PAD:16",
+    "C3": "BOTTLED_ODONATA:1"
+  },
   "internalname": "RIFT_TROPHY_WYLDLY_SUPREME",
-  "crafttext": "",
-  "clickcommand": "",
+  "clickcommand": "viewrecipe",
   "modver": "2.1.1-PRE",
   "infoType": "WIKI_URL",
   "info": [