Merge branch 'master' into prereleaseprerelease

10 files changed, 129 insertions, 32 deletions

diff --git a/constants/misc.json b/constants/misc.json
index d5197600..0dea9dfc 100644
--- a/constants/misc.json
+++ b/constants/misc.json
@@ -1685,5 +1685,19 @@
       "§7https://discord.gg/moulberry"
     ]
   },
-  "featureslist": "https://gist.github.com/jani270/d33e249d40b0333b87ba5c5e70fca398"
+  "featureslist": "https://gist.github.com/jani270/d33e249d40b0333b87ba5c5e70fca398",
+  "minionXp": {
+    "1": 1,
+    "2": 1,
+    "3": 1,
+    "4": 1,
+    "5": 1,
+    "6": 1,
+    "7": 2,
+    "8": 3,
+    "9": 4,
+    "10": 6,
+    "11": 12,
+    "12": 24
+  }
 }
\ No newline at end of file
diff --git a/items/CRYSTALLIZED_HEART.json b/items/CRYSTALLIZED_HEART.json
index 9fa12df8..6d2366a7 100644
--- a/items/CRYSTALLIZED_HEART.json
+++ b/items/CRYSTALLIZED_HEART.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
-  "displayname": "§9Crystallized Heart",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"05fbf845-8fce-392c-a86d-8d9f4484bcad\",Properties:{textures:[0:{Value:\"eyJ0aW1lc3RhbXAiOjE1NjgzNTg1OTU4OTEsInByb2ZpbGVJZCI6IjQxZDNhYmMyZDc0OTQwMGM5MDkwZDU0MzRkMDM4MzFiIiwicHJvZmlsZU5hbWUiOiJNZWdha2xvb24iLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzg3ZGZiN2MxZWU0ZGUzMWY1NDkzMWVhYzVjNjU3YzE0NWU0ZmE3ZmEwOWUzZjUyYjE3ODhhNjgyYjY1YWM3NSJ9fX0=\"}]}},display:{Lore:[0:\"§7Health: §a+50\",1:\"§7Defense: §a+10\",2:\"§7Intelligence: §a+50\",3:\"\",4:\"§6Ability: Healing Boost\",5:\"§7Doubles all healing effects,\",6:\"§7including your natural\",7:\"§7regeneration and healing you\",8:\"§7deal to others, while wearing.\",9:\"\",10:\"§7§8This item can be reforged!\",11:\"§7§4☠ §cRequires §5Zombie Slayer 3\",12:\"§9§lRARE HELMET\"],Name:\"§9Crystallized Heart\"},ExtraAttributes:{id:\"CRYSTALLIZED_HEART\"}}",
+  "displayname": "§f§f§9Crystallized Heart",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"05fbf845-8fce-392c-a86d-8d9f4484bcad\",Properties:{textures:[0:{Value:\"eyJ0aW1lc3RhbXAiOjE1NjgzNTg1OTU4OTEsInByb2ZpbGVJZCI6IjQxZDNhYmMyZDc0OTQwMGM5MDkwZDU0MzRkMDM4MzFiIiwicHJvZmlsZU5hbWUiOiJNZWdha2xvb24iLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzg3ZGZiN2MxZWU0ZGUzMWY1NDkzMWVhYzVjNjU3YzE0NWU0ZmE3ZmEwOWUzZjUyYjE3ODhhNjgyYjY1YWM3NSJ9fX0\u003d\"}]}},display:{Lore:[0:\"§7Health: §a+50\",1:\"§7Defense: §a+10\",2:\"§7Intelligence: §a+50\",3:\"\",4:\"§6Ability: Healing Boost\",5:\"§7Doubles your §a☄ Mending §7and\",6:\"§7§4♨ Vitality §7while wearing.\",7:\"\",8:\"§7§8This item can be reforged!\",9:\"§7§4☠ §cRequires §5Zombie Slayer 3§c.\",10:\"§9§lRARE HELMET\"],Name:\"§f§f§9Crystallized Heart\"},ExtraAttributes:{id:\"CRYSTALLIZED_HEART\"}}",
   "damage": 3,
   "lore": [
     "§7Health: §a+50",
@@ -9,13 +9,11 @@
     "§7Intelligence: §a+50",
     "",
     "§6Ability: Healing Boost",
-    "§7Doubles all healing effects,",
-    "§7including your natural",
-    "§7regeneration and healing you",
-    "§7deal to others, while wearing.",
+    "§7Doubles your §a☄ Mending §7and",
+    "§7§4♨ Vitality §7while wearing.",
     "",
     "§7§8This item can be reforged!",
-    "§7§4☠ §cRequires §5Zombie Slayer 3",
+    "§7§4☠ §cRequires §5Zombie Slayer 3§c.",
     "§9§lRARE HELMET"
   ],
   "recipe": {
diff --git a/items/LEGGINGS_OF_THE_PACK.json b/items/LEGGINGS_OF_THE_PACK.json
index 1df81460..2e0867db 100644
--- a/items/LEGGINGS_OF_THE_PACK.json
+++ b/items/LEGGINGS_OF_THE_PACK.json
@@ -21,9 +21,9 @@
     "§5§lEPIC LEGGINGS"
   ],
   "recipe": {
-    "A1": "GOLDEN_TOOTH:1",
+    "A1": "ENCHANTED_MUTTON:32",
     "A2": "GOLDEN_TOOTH:1",
-    "A3": "GOLDEN_TOOTH:1",
+    "A3": "ENCHANTED_MUTTON:32",
     "B1": "ENCHANTED_MUTTON:32",
     "B2": "",
     "B3": "ENCHANTED_MUTTON:32",
diff --git a/items/PELT_BELT.json b/items/PELT_BELT.json
new file mode 100644
index 00000000..ecfa8238
--- /dev/null
+++ b/items/PELT_BELT.json
@@ -0,0 +1,23 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§5Pelt Belt",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"601aadb8-d316-3ab8-8d4d-b172761421f8\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY2NzM4NTU1MjgyNiwKICAicHJvZmlsZUlkIiA6ICJhZjQwMzQxMTk1YTg0ZDcwODFkNWNmNDE3MDM5ODJmNSIsCiAgInByb2ZpbGVOYW1lIiA6ICJBdHJ4dSIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS85ZjM1MTBjMDg2YmNmZGJiNmNkNWM3YTk5ZDMzNGYzZTNkMmJiNThiZDEwOWIyOGRiZDE4MWEzODQ3MWE3OTk2IiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0\u003d\"}]}},display:{Lore:[0:\"§7Speed: §a+30\",1:\"§7Farming Wisdom: §a+1\",2:\"\",3:\"§7§7Gain §f+30✦ Speed §7while in\",4:\"§7the §eMushroom Desert§7.\",5:\"§7§7Earn §5+1 pelt §7from tracker\",6:\"§7quests.\",7:\"\",8:\"§7§8This item can be reforged!\",9:\"§5§lEPIC BELT\"],Name:\"§5Pelt Belt\"},ExtraAttributes:{id:\"PELT_BELT\"}}",
+  "damage": 3,
+  "lore": [
+    "§7Speed: §a+30",
+    "§7Farming Wisdom: §a+1",
+    "",
+    "§7§7Gain §f+30✦ Speed §7while in",
+    "§7the §eMushroom Desert§7.",
+    "§7§7Earn §5+1 pelt §7from tracker",
+    "§7quests.",
+    "",
+    "§7§8This item can be reforged!",
+    "§5§lEPIC BELT"
+  ],
+  "internalname": "PELT_BELT",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "2.1.0-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/REVIVED_HEART.json b/items/REVIVED_HEART.json
index 30530955..ee123d5b 100644
--- a/items/REVIVED_HEART.json
+++ b/items/REVIVED_HEART.json
@@ -1,10 +1,10 @@
 {
   "internalname": "REVIVED_HEART",
   "itemid": "minecraft:skull",
-  "displayname": "§5Revived Heart",
+  "displayname": "§f§f§5Revived Heart",
   "clickcommand": "viewrecipe",
   "damage": 3,
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"030b6aeb-6fba-3a86-8d9f-fa84f842e865\",Properties:{textures:[0:{Value:\"eyJ0aW1lc3RhbXAiOjE1NjgzNjYyODI2NDIsInByb2ZpbGVJZCI6IjQxZDNhYmMyZDc0OTQwMGM5MDkwZDU0MzRkMDM4MzFiIiwicHJvZmlsZU5hbWUiOiJNZWdha2xvb24iLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzRhNjFiNGY4YjA3MGU0YmMzMGE4NmIyMjkwZGI2ZTU3ZTI2ODFjNDRlMDI1MGQxOTA2YTg5YWRiOGZjNDU1YjEifX19\"}]}},display:{Lore:[0:\"§7Health: §a+100\",1:\"§7Defense: §a+35\",2:\"§7Intelligence: §a+100\",3:\" §8[§7❤§8]\",4:\"\",5:\"§6Ability: Healing Boost\",6:\"§7Doubles all healing effects,\",7:\"§7including your natural\",8:\"§7regeneration and healing you\",9:\"§7deal to others, while wearing.\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§7§4☠ §cRequires §5Zombie Slayer 6\",13:\"§5§lEPIC HELMET\"],Name:\"§5Revived Heart\"},ExtraAttributes:{id:\"REVIVED_HEART\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"030b6aeb-6fba-3a86-8d9f-fa84f842e865\",Properties:{textures:[0:{Value:\"eyJ0aW1lc3RhbXAiOjE1NjgzNjYyODI2NDIsInByb2ZpbGVJZCI6IjQxZDNhYmMyZDc0OTQwMGM5MDkwZDU0MzRkMDM4MzFiIiwicHJvZmlsZU5hbWUiOiJNZWdha2xvb24iLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzRhNjFiNGY4YjA3MGU0YmMzMGE4NmIyMjkwZGI2ZTU3ZTI2ODFjNDRlMDI1MGQxOTA2YTg5YWRiOGZjNDU1YjEifX19\"}]}},display:{Lore:[0:\"§7Health: §a+100\",1:\"§7Defense: §a+35\",2:\"§7Intelligence: §a+100\",3:\" §8[§7❤§8]\",4:\"\",5:\"§6Ability: Healing Boost\",6:\"§7Doubles your §a☄ Mending §7and\",7:\"§7§4♨ Vitality §7while wearing.\",8:\"\",9:\"§7§8This item can be reforged!\",10:\"§7§4☠ §cRequires §5Zombie Slayer 6§c.\",11:\"§5§lEPIC HELMET\"],Name:\"§f§f§5Revived Heart\"},ExtraAttributes:{id:\"REVIVED_HEART\"}}",
   "modver": "2.1.0-REL",
   "lore": [
     "§7Health: §a+100",
@@ -13,13 +13,11 @@
     " §8[§7❤§8]",
     "",
     "§6Ability: Healing Boost",
-    "§7Doubles all healing effects,",
-    "§7including your natural",
-    "§7regeneration and healing you",
-    "§7deal to others, while wearing.",
+    "§7Doubles your §a☄ Mending §7and",
+    "§7§4♨ Vitality §7while wearing.",
     "",
     "§7§8This item can be reforged!",
-    "§7§4☠ §cRequires §5Zombie Slayer 6",
+    "§7§4☠ §cRequires §5Zombie Slayer 6§c.",
     "§5§lEPIC HELMET"
   ],
   "recipe": {
diff --git a/items/TALBOTS_THEODOLITE.json b/items/TALBOTS_THEODOLITE.json
new file mode 100644
index 00000000..3d541fea
--- /dev/null
+++ b/items/TALBOTS_THEODOLITE.json
@@ -0,0 +1,21 @@
+{
+  "itemid": "minecraft:repeater",
+  "displayname": "§9Talbot\u0027s Theodolite",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§6Ability: Track §e§lRIGHT CLICK\",1:\"§7Indicates the approximate height\",2:\"§7difference and angle between you\",3:\"§7and your tracked mob.\",4:\"§8Mana Cost: §398\",5:\"§8Cooldown: §a10s\",6:\"\",7:\"§9§lRARE\"],Name:\"§9Talbot\u0027s Theodolite\"},ExtraAttributes:{id:\"TALBOTS_THEODOLITE\"}}",
+  "damage": 0,
+  "lore": [
+    "§6Ability: Track §e§lRIGHT CLICK",
+    "§7Indicates the approximate height",
+    "§7difference and angle between you",
+    "§7and your tracked mob.",
+    "§8Mana Cost: §398",
+    "§8Cooldown: §a10s",
+    "",
+    "§9§lRARE"
+  ],
+  "internalname": "TALBOTS_THEODOLITE",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "2.1.0-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/TRAPPER_CREST.json b/items/TRAPPER_CREST.json
new file mode 100644
index 00000000..92d5e9fc
--- /dev/null
+++ b/items/TRAPPER_CREST.json
@@ -0,0 +1,24 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§fTrapper Crest",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"282d3f2e-7c1b-3400-b60f-ba939aaaad12\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvM2FlMGRhMjBjODU5OGU5MWYzMjJiNmU4YTdiMGVlMmM4MWYxYjYxZTc0Mzg2YzQzN2U3NWY0NDZmZmNjYzVlIn19fQ\u003d\u003d\"}]}},display:{Lore:[0:\"§7Upgrades to §A§LUNCOMMON §7if\",1:\"§7you collect §5500 pelts §7while\",2:\"§7§eFinnegan §7is in office.\",3:\"\",4:\"§7Collected: §50 pelts\",5:\"\",6:\"§7Increases the odds of finding\",7:\"§7§5§lENDANGERED §7or §6§lELUSIVE\",8:\"§6§l§7mobs by §a10%§7.\",9:\"\",10:\"§f§lCOMMON ACCESSORY\"],Name:\"§fTrapper Crest\"},ExtraAttributes:{id:\"TRAPPER_CREST\"}}",
+  "damage": 3,
+  "lore": [
+    "§7Upgrades to §A§LUNCOMMON §7if",
+    "§7you collect §5500 pelts §7while",
+    "§7§eFinnegan §7is in office.",
+    "",
+    "§7Collected: §50 pelts",
+    "",
+    "§7Increases the odds of finding",
+    "§7§5§lENDANGERED §7or §6§lELUSIVE",
+    "§6§l§7mobs by §a10%§7.",
+    "",
+    "§f§lCOMMON ACCESSORY"
+  ],
+  "internalname": "TRAPPER_CREST",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "2.1.0-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/TRAPPER_DEN_TRAVEL_SCROLL.json b/items/TRAPPER_DEN_TRAVEL_SCROLL.json
new file mode 100644
index 00000000..8453c058
--- /dev/null
+++ b/items/TRAPPER_DEN_TRAVEL_SCROLL.json
@@ -0,0 +1,21 @@
+{
+  "itemid": "minecraft:map",
+  "displayname": "§9Travel Scroll to the Trapper\u0027s Den",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Consume this item to add its\",1:\"§7destination to your fast travel\",2:\"§7options.\",3:\"\",4:\"§7Island: §aMushroom Desert\",5:\"§7Teleport: §eTrapper\u0027s Den\",6:\"\",7:\"§9§lRARE TRAVEL SCROLL\"],Name:\"§9Travel Scroll to the Trapper\u0027s Den\"},ExtraAttributes:{id:\"TRAPPER_DEN_TRAVEL_SCROLL\"}}",
+  "damage": 0,
+  "lore": [
+    "§7Consume this item to add its",
+    "§7destination to your fast travel",
+    "§7options.",
+    "",
+    "§7Island: §aMushroom Desert",
+    "§7Teleport: §eTrapper\u0027s Den",
+    "",
+    "§9§lRARE TRAVEL SCROLL"
+  ],
+  "internalname": "TRAPPER_DEN_TRAVEL_SCROLL",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "2.1.0-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/VACCINE_ARTIFACT.json b/items/VACCINE_ARTIFACT.json
index 9e067f25..7c6a6fec 100644
--- a/items/VACCINE_ARTIFACT.json
+++ b/items/VACCINE_ARTIFACT.json
@@ -10,15 +10,15 @@
     "§9§lRARE ACCESSORY"
   ],
   "recipe": {
-    "A1": "POSION_SAMPLE:1",
-    "A2": "POSION_SAMPLE:1",
-    "A3": "POSION_SAMPLE:1",
-    "B1": "POSION_SAMPLE:1",
+    "A1": "POISON_SAMPLE:1",
+    "A2": "POISON_SAMPLE:1",
+    "A3": "POISON_SAMPLE:1",
+    "B1": "POISON_SAMPLE:1",
     "B2": "VACCINE_RING:1",
-    "B3": "POSION_SAMPLE:1",
-    "C1": "POSION_SAMPLE:1",
-    "C2": "POSION_SAMPLE:1",
-    "C3": "POSION_SAMPLE:1"
+    "B3": "POISON_SAMPLE:1",
+    "C1": "POISON_SAMPLE:1",
+    "C2": "POISON_SAMPLE:1",
+    "C3": "POISON_SAMPLE:1"
   },
   "internalname": "VACCINE_ARTIFACT",
   "crafttext": "",
diff --git a/items/ZOMBIE_HEART.json b/items/ZOMBIE_HEART.json
index b6fb7dd4..9eb062a3 100644
--- a/items/ZOMBIE_HEART.json
+++ b/items/ZOMBIE_HEART.json
@@ -1,16 +1,14 @@
 {
   "itemid": "minecraft:skull",
-  "displayname": "§9Zombie's Heart",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"9784bb22-d55f-3b77-bf68-544c287b12c3\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzFkN2M4MTZmYzhjNjM2ZDdmNTBhOTNhMGJhN2FhZWZmMDZjOTZhNTYxNjQ1ZTllYjFiZWYzOTE2NTVjNTMxIn19fQ==\"}]}},display:{Lore:[0:\"§7Health: §a+50\",1:\"\",2:\"§6Ability: Healing Boost\",3:\"§7Doubles all healing effects,\",4:\"§7including your natural\",5:\"§7regeneration and healing you\",6:\"§7deal to others, while wearing.\",7:\"\",8:\"§7§8This item can be reforged!\",9:\"§9§lRARE HELMET\"],Name:\"§9Zombie's Heart\"},ExtraAttributes:{id:\"ZOMBIE_HEART\"}}",
+  "displayname": "§f§f§9Zombie\u0027s Heart",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"9784bb22-d55f-3b77-bf68-544c287b12c3\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzFkN2M4MTZmYzhjNjM2ZDdmNTBhOTNhMGJhN2FhZWZmMDZjOTZhNTYxNjQ1ZTllYjFiZWYzOTE2NTVjNTMxIn19fQ\u003d\u003d\"}]}},display:{Lore:[0:\"§7Health: §a+50\",1:\"\",2:\"§6Ability: Healing Boost\",3:\"§7Doubles your §a☄ Mending §7and\",4:\"§7§4♨ Vitality §7while wearing.\",5:\"\",6:\"§7§8This item can be reforged!\",7:\"§9§lRARE HELMET\"],Name:\"§f§f§9Zombie\u0027s Heart\"},ExtraAttributes:{id:\"ZOMBIE_HEART\"}}",
   "damage": 3,
   "lore": [
     "§7Health: §a+50",
     "",
     "§6Ability: Healing Boost",
-    "§7Doubles all healing effects,",
-    "§7including your natural",
-    "§7regeneration and healing you",
-    "§7deal to others, while wearing.",
+    "§7Doubles your §a☄ Mending §7and",
+    "§7§4♨ Vitality §7while wearing.",
     "",
     "§7§8This item can be reforged!",
     "§9§lRARE HELMET"
@@ -33,6 +31,6 @@
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Zombie%27s_Heart",
-    "https://wiki.hypixel.net/Zombie's_Heart"
+    "https://wiki.hypixel.net/Zombie\u0027s_Heart"
   ]
 }
\ No newline at end of file