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/DANGER_3_PORTAL.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'items/DANGER_3_PORTAL.json')

diff --git a/items/DANGER_3_PORTAL.json b/items/DANGER_3_PORTAL.json
index e10abacc..5fc4fca7 100644
--- a/items/DANGER_3_PORTAL.json
+++ b/items/DANGER_3_PORTAL.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§aPortal to The End",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"eeeaaaf6-3e0f-35d4-b3f7-4eddf21036fb\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDY5OTRkNzFiODc1ZjA4N2U2NGRlYTliNGEwYTVjYjlmNGViOWFiMGU4ZDkwNjBkZmRlN2Y2ODAzYmFhMTc3OSJ9fX0=\"}]}},display:{Lore:[0:\"§7Placing the item on your private\",1:\"§7island will create a portal to\",2:\"§7The End§7 for you to use\",3:\"§7whenever you want!\",4:\"\",5:\"§7§8The portal will spawn facing\",6:\"§8you on the block you click on.\",7:\"\",8:\"§a§lUNCOMMON\"],Name:\"§aPortal to The End\"},ExtraAttributes:{id:\"DANGER_3_PORTAL\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"eeeaaaf6-3e0f-35d4-b3f7-4eddf21036fb\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDY5OTRkNzFiODc1ZjA4N2U2NGRlYTliNGEwYTVjYjlmNGViOWFiMGU4ZDkwNjBkZmRlN2Y2ODAzYmFhMTc3OSJ9fX0\u003d\"}]}},display:{Lore:[0:\"§7Placing the item on your private\",1:\"§7island will create a portal to\",2:\"§7The End§7 for you to use\",3:\"§7whenever you want!\",4:\"\",5:\"§7§8The portal will spawn facing\",6:\"§8you on the block you click on.\",7:\"\",8:\"§a§lUNCOMMON\"],Name:\"§aPortal to The End\"},ExtraAttributes:{id:\"DANGER_3_PORTAL\"}}",
   "damage": 3,
   "lore": [
     "§7Placing the item on your private",
@@ -27,6 +27,10 @@
   },
   "internalname": "DANGER_3_PORTAL",
   "clickcommand": "viewrecipe",
-  "modver": "1.0.0",
-  "crafttext": "Requires: End Stone III"
+  "modver": "1.5-REL",
+  "crafttext": "Requires: End Stone III",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Portals"
+  ]
 }
\ No newline at end of file
-- 
cgit