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/AOTE_STONE.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'items/AOTE_STONE.json')

diff --git a/items/AOTE_STONE.json b/items/AOTE_STONE.json
index fbdc8b78..bbc89b21 100644
--- a/items/AOTE_STONE.json
+++ b/items/AOTE_STONE.json
@@ -23,6 +23,9 @@
   "internalname": "AOTE_STONE",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "1.3-REL",
-  "infoType": ""
+  "modver": "1.5-REL",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Warped_Stone"
+  ]
 }
\ No newline at end of file
-- 
cgit