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

(limited to 'items/GHOUL;3.json')

diff --git a/items/GHOUL;3.json b/items/GHOUL;3.json
index b4e05cea..03144c1d 100644
--- a/items/GHOUL;3.json
+++ b/items/GHOUL;3.json
@@ -6,6 +6,7 @@
   "lore": [
     "§8Combat Pet",
     "",
+    "§7Ferocity: §a{FEROCITY}",
     "§7Intelligence: §a{INTELLIGENCE}",
     "§7Health: §a{HEALTH}",
     "",
@@ -23,10 +24,10 @@
   ],
   "internalname": "GHOUL;3",
   "clickcommand": "",
-  "modver": "REL-1.0.0",
+  "modver": "1.5-REL",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Ghoul_Pet"
   ],
   "crafttext": ""
-}
\ No newline at end of file
+}
-- 
cgit