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

(limited to 'items/FARMING_2_PORTAL.json')

diff --git a/items/FARMING_2_PORTAL.json b/items/FARMING_2_PORTAL.json
index 7ec72071..6a40ddb8 100644
--- a/items/FARMING_2_PORTAL.json
+++ b/items/FARMING_2_PORTAL.json
@@ -27,7 +27,10 @@
   },
   "internalname": "FARMING_2_PORTAL",
   "clickcommand": "viewrecipe",
-  "modver": "1.0.0",
+  "modver": "1.5-REL",
   "crafttext": "Requires: Cocoa Beans III",
-  "infoType": ""
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Portals"
+  ]
 }
\ No newline at end of file
-- 
cgit