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

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

diff --git a/items/WITHER_SKELETON;3.json b/items/WITHER_SKELETON;3.json
index 4fa7a973..77a257ca 100644
--- a/items/WITHER_SKELETON;3.json
+++ b/items/WITHER_SKELETON;3.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§f§f§7[Lvl {LVL}] §5Wither Skeleton",
-  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"d928ce5e-e75e-3cdc-aaf1-0c93d49b5c31\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjVlYzk2NDY0NWE4ZWZhYzc2YmUyZjE2MGQ3Yzk5NTYzNjJmMzJiNjUxNzM5MGM1OWMzMDg1MDM0ZjA1MGNmZiJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Mining Pet\",1:\"\",2:\"§7Crit Damage: §a{CRIT_DAMAGE}\",3:\"§7Defense: §a{DEFENSE}\",4:\"§7Strength: §a{STRENGTH}\",5:\"§7Intelligence: §a{INTELLIGENCE}\",6:\"§7Crit Chance: §a{CRIT_CHANCE}\",7:\"\",8:\"§6Stronger Bones\",9:\"§7§7Take §a{0}% §7less damage from\",10:\"§7skeletons\",11:\"\",12:\"§6Wither Blood\",13:\"§7§7Deal §a{1}% §7more damage to\",14:\"§7wither mobs\",15:\"\",16:\"§7§eRight-click to add this pet to\",17:\"§eyour pet menu!\",18:\"\",19:\"§5§lLEGENDARY\"],Name:\"§f§f§7[Lvl {LVL}] §5Wither Skeleton\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"WITHER_SKELETON\\\",\\\"active\\\":false,\\\"exp\\\":69375.77400000505,\\\"tier\\\":\\\"LEGENDARY\\\",\\\"hideInfo\\\":false}\",originTag:\"UNKNOWN\",id:\"WITHER_SKELETON;3\",uuid:\"f7428128-8dca-460a-bc32-9e4d471cc380\",timestamp:\"4/6/20 12:23 PM\"},AttributeModifiers:[]}",
+  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"d928ce5e-e75e-3cdc-aaf1-0c93d49b5c31\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjVlYzk2NDY0NWE4ZWZhYzc2YmUyZjE2MGQ3Yzk5NTYzNjJmMzJiNjUxNzM5MGM1OWMzMDg1MDM0ZjA1MGNmZiJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Mining Pet\",1:\"\",2:\"§7Crit Damage: §a{CRIT_DAMAGE}\",3:\"§7Defense: §a{DEFENSE}\",4:\"§7Strength: §a{STRENGTH}\",5:\"§7Intelligence: §a{INTELLIGENCE}\",6:\"§7Crit Chance: §a{CRIT_CHANCE}\",7:\"\",8:\"§6Stronger Bones\",9:\"§7§7Take §a{0}% §7less damage from\",10:\"§7skeletons\",11:\"\",12:\"§6Wither Blood\",13:\"§7§7Deal §a{1}% §7more damage to\",14:\"§7wither mobs\",15:\"\",16:\"§7§eRight-click to add this pet to\",17:\"§eyour pet menu!\",18:\"\",19:\"§5§lEPIC\"],Name:\"§f§f§7[Lvl {LVL}] §5Wither Skeleton\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"WITHER_SKELETON\\\",\\\"active\\\":false,\\\"exp\\\":69375.77400000505,\\\"tier\\\":\\\"LEGENDARY\\\",\\\"hideInfo\\\":false}\",originTag:\"UNKNOWN\",id:\"WITHER_SKELETON;3\",uuid:\"f7428128-8dca-460a-bc32-9e4d471cc380\",timestamp:\"4/6/20 12:23 PM\"},AttributeModifiers:[]}",
   "damage": 3,
   "lore": [
     "§8Mining Pet",
@@ -23,11 +23,11 @@
     "§7§eRight-click to add this pet to",
     "§eyour pet menu!",
     "",
-    "§5§lLEGENDARY"
+    "§5§lEPIC"
   ],
   "internalname": "WITHER_SKELETON;3",
   "clickcommand": "viewrecipe",
-  "modver": "REL-1.0.0",
+  "modver": "1.5-REL",
   "recipe": {
     "A1": "ENCHANTED_COAL_BLOCK:1",
     "A2": "ENCHANTED_COAL_BLOCK:1",
-- 
cgit