From b6fd4b6bfe35a3268fd03b267bf626026920b8d7 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Fri, 13 Nov 2020 18:41:01 -0500
Subject: Manual Merge bc Conflicts

---
 items/DUNGEON_STONE.json | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'items/DUNGEON_STONE.json')

diff --git a/items/DUNGEON_STONE.json b/items/DUNGEON_STONE.json
index 02e053c6..8931ffaf 100644
--- a/items/DUNGEON_STONE.json
+++ b/items/DUNGEON_STONE.json
@@ -1,11 +1,11 @@
 {
   "internalname": "DUNGEON_STONE",
-  "itemid": 397,
+  "itemid": "minecraft:skull",
   "displayname": "§6Dungeon Orb",
   "clickcommand": "",
   "damage": 3,
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"0a558295-cf73-3d17-8c8f-dc5f16a72180\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWU1OTI0Nzk4YTQ4N2Y5OWJhMDhlNTRhNWIxMzA2OTJjYzU4NjkwMmE4N2UxZGVlMjEzODEzZWY4YzY2In19fQ==\"}]}},display:{Lore:[0:\"§7When entering a Dungeon, this\",1:\"§7stone adapts to its user and\",2:\"§7allows them to use their class\",3:\"§7abilities.\",4:\"\",5:\"§6§lLEGENDARY DUNGEON ITEM\"],Name:\"§6Dungeon Orb\"},ExtraAttributes:{id:\"DUNGEON_STONE\"}}",
-  "modver": "1.0.0",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"0a558295-cf73-3d17-8c8f-dc5f16a72180\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWU1OTI0Nzk4YTQ4N2Y5OWJhMDhlNTRhNWIxMzA2OTJjYzU4NjkwMmE4N2UxZGVlMjEzODEzZWY4YzY2In19fQ\u003d\u003d\"}]}},display:{Lore:[0:\"§7When entering a Dungeon, this\",1:\"§7stone adapts to its user and\",2:\"§7allows them to use their class\",3:\"§7abilities.\",4:\"\",5:\"§6§lLEGENDARY DUNGEON ITEM\"],Name:\"§6Dungeon Orb\"},ExtraAttributes:{id:\"DUNGEON_STONE\"}}",
+  "modver": "1.5-REL",
   "lore": [
     "§7When entering a Dungeon, this",
     "§7stone adapts to its user and",
@@ -13,5 +13,10 @@
     "§7abilities.",
     "",
     "§6§lLEGENDARY DUNGEON ITEM"
+  ],
+  "crafttext": "",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Classes"
   ]
 }
\ No newline at end of file
-- 
cgit