merge pets

40 files changed, 328 insertions, 99 deletions

diff --git a/items/BASE_GRIFFIN_UPGRADE_STONE.json b/items/BASE_GRIFFIN_UPGRADE_STONE.json
index 28d36997..cafbaae8 100644
--- a/items/BASE_GRIFFIN_UPGRADE_STONE.json
+++ b/items/BASE_GRIFFIN_UPGRADE_STONE.json
@@ -13,21 +13,21 @@
   ],
   "recipe": {
     "A1": "GRIFFIN_FEATHER:2",
-    "A2": "ENCHNATED_GOLD:4",
+    "A2": "ENCHANTED_GOLD:4",
     "A3": "GRIFFIN_FEATHER:2",
-    "B1": "ENCHNATED_GOLD:4",
+    "B1": "ENCHANTED_GOLD:4",
     "B2": "ENCHANTED_COBBLESTONE:8",
-    "B3": "ENCHNATED_GOLD:4",
+    "B3": "ENCHANTED_GOLD:4",
     "C1": "GRIFFIN_FEATHER:2",
-    "C2": "ENCHNATED_GOLD:4",
+    "C2": "ENCHANTED_GOLD:4",
     "C3": "GRIFFIN_FEATHER:2"
   },
   "internalname": "BASE_GRIFFIN_UPGRADE_STONE",
   "crafttext": "",
   "clickcommand": "viewrecipe",
-  "modver": "1.3-REL",
+  "modver": "2.0.0-REL",
   "infoType": "WIKI_URL",
-  "info":[
+  "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Griffin_Upgrade_Stone"
   ]
 }
\ No newline at end of file
diff --git a/items/BEACON_2.json b/items/BEACON_2.json
index 6930dde5..dbcbd4fc 100644
--- a/items/BEACON_2.json
+++ b/items/BEACON_2.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:beacon",
   "displayname": "§9Beacon II",
-  "nbttag": "{ench:[],overrideMeta:1b,HideFlags:254,display:{Lore:[0:\"§7Tier: §bII\",1:\"\",2:\"§7Can be placed on your private island.\",3:\"\",4:\"§7Grants special buffs to the\",5:\"§7island owners when powered by\",6:\"§7§dPower Crystals §7obtained from\",7:\"§7the forge in the §2Dwarven\",8:\"§2Mines§7\",9:\"\",10:\"§9§lRARE\",11:\"\",12:\"§eItems Required\",13:\"§9Beacon I §7x1\",14:\"§5Refined Mithril §7x5\",15:\"\",16:\"§7Duration: §b20h\"],Name:\"§9Beacon II\"},ExtraAttributes:{id:\"BEACON_2\"},AttributeModifiers:[]}",
+  "nbttag": "{ench:[],overrideMeta:1b,HideFlags:254,display:{Lore:[0:\"§7Tier: §bII\",1:\"\",2:\"§7Can be placed on your private island.\",3:\"\",4:\"§7Grants special buffs to the\",5:\"§7island owners when powered by\",6:\"§7§dPower Crystals §7obtained from\",7:\"§7the forge in the §2Dwarven\",8:\"§2Mines§7\",9:\"\",10:\"§4❣ §cRequires §5Heart of the\",11:\"§5Mountain Tier 2\",12:\"§9§lRARE\",13:\"\",14:\"§eItems Required\",15:\"§9Beacon I §7x1\",16:\"§5Refined Mithril §7x5\",17:\"\",18:\"§7Duration: §b20h\"],Name:\"§9Beacon II\"},ExtraAttributes:{id:\"BEACON_2\"},AttributeModifiers:[]}",
   "damage": 0,
   "lore": [
     "§7Tier: §bII",
@@ -14,6 +14,8 @@
     "§7the forge in the §2Dwarven",
     "§2Mines§7",
     "",
+    "§4❣ §cRequires §5Heart of the",
+    "§5Mountain Tier 2",
     "§9§lRARE",
     "",
     "§eItems Required",
@@ -25,9 +27,9 @@
   "internalname": "BEACON_2",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "1.7.1-REL",
+  "modver": "2.0.0-REL",
   "infoType": "WIKI_URL",
   "info": [
-      "https://hypixel-skyblock.fandom.com/wiki/Beacon"
+    "https://hypixel-skyblock.fandom.com/wiki/Beacon"
   ]
-}
+}
\ No newline at end of file
diff --git a/items/BEACON_3.json b/items/BEACON_3.json
index 37f1b916..dfc8c652 100644
--- a/items/BEACON_3.json
+++ b/items/BEACON_3.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:beacon",
   "displayname": "§5Beacon III",
-  "nbttag": "{ench:[],overrideMeta:1b,HideFlags:254,display:{Lore:[0:\"§7Tier: §bIII\",1:\"\",2:\"§7Can be placed on your private island.\",3:\"\",4:\"§7Grants special buffs to the\",5:\"§7island owners when powered by\",6:\"§7§dPower Crystals §7obtained from\",7:\"§7the forge in the §2Dwarven\",8:\"§2Mines§7\",9:\"\",10:\"§5§lEPIC\",11:\"\",12:\"§eItems Required\",13:\"§9Beacon II §7x1\",14:\"§5Refined Mithril §7x10\",15:\"\",16:\"§7Duration: §b1d 6h\"],Name:\"§5Beacon III\"},ExtraAttributes:{id:\"BEACON_3\"},AttributeModifiers:[]}",
+  "nbttag": "{ench:[],overrideMeta:1b,HideFlags:254,display:{Lore:[0:\"§7Tier: §bIII\",1:\"\",2:\"§7Can be placed on your private island.\",3:\"\",4:\"§7Grants special buffs to the\",5:\"§7island owners when powered by\",6:\"§7§dPower Crystals §7obtained from\",7:\"§7the forge in the §2Dwarven\",8:\"§2Mines§7\",9:\"\",10:\"§4❣ §cRequires §5Heart of the\",11:\"§5Mountain Tier 3\",12:\"§5§lEPIC\",13:\"\",14:\"§eItems Required\",15:\"§9Beacon II §7x1\",16:\"§5Refined Mithril §7x10\",17:\"\",18:\"§7Duration: §b1d 6h\"],Name:\"§5Beacon III\"},ExtraAttributes:{id:\"BEACON_3\"},AttributeModifiers:[]}",
   "damage": 0,
   "lore": [
     "§7Tier: §bIII",
@@ -14,6 +14,8 @@
     "§7the forge in the §2Dwarven",
     "§2Mines§7",
     "",
+    "§4❣ §cRequires §5Heart of the",
+    "§5Mountain Tier 3",
     "§5§lEPIC",
     "",
     "§eItems Required",
@@ -25,9 +27,9 @@
   "internalname": "BEACON_3",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "1.7.1-REL",
+  "modver": "2.0.0-REL",
   "infoType": "WIKI_URL",
   "info": [
-      "https://hypixel-skyblock.fandom.com/wiki/Beacon"
+    "https://hypixel-skyblock.fandom.com/wiki/Beacon"
   ]
-}
+}
\ No newline at end of file
diff --git a/items/BEACON_4.json b/items/BEACON_4.json
index 20c39ff3..f4948be8 100644
--- a/items/BEACON_4.json
+++ b/items/BEACON_4.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:beacon",
   "displayname": "§5Beacon IV",
-  "nbttag": "{ench:[],overrideMeta:1b,HideFlags:254,display:{Lore:[0:\"§7Tier: §bIV\",1:\"\",2:\"§7Can be placed on your private island.\",3:\"\",4:\"§7Grants special buffs to the\",5:\"§7island owners when powered by\",6:\"§7§dPower Crystals §7obtained from\",7:\"§7the forge in the §2Dwarven\",8:\"§2Mines§7\",9:\"\",10:\"§5§lEPIC\",11:\"\",12:\"§eItems Required\",13:\"§5Beacon III §7x1\",14:\"§5Refined Mithril §7x20\",15:\"§9Plasma §7x1\",16:\"\",17:\"§7Duration: §b1d 16h\"],Name:\"§5Beacon IV\"},ExtraAttributes:{id:\"BEACON_4\"},AttributeModifiers:[]}",
+  "nbttag": "{ench:[],overrideMeta:1b,HideFlags:254,display:{Lore:[0:\"§7Tier: §bIV\",1:\"\",2:\"§7Can be placed on your private island.\",3:\"\",4:\"§7Grants special buffs to the\",5:\"§7island owners when powered by\",6:\"§7§dPower Crystals §7obtained from\",7:\"§7the forge in the §2Dwarven\",8:\"§2Mines§7\",9:\"\",10:\"§4❣ §cRequires §5Heart of the\",11:\"§5Mountain Tier 4\",12:\"§5§lEPIC\",13:\"\",14:\"§eItems Required\",15:\"§5Beacon III §7x1\",16:\"§5Refined Mithril §7x20\",17:\"§9Plasma §7x1\",18:\"\",19:\"§7Duration: §b1d 16h\"],Name:\"§5Beacon IV\"},ExtraAttributes:{id:\"BEACON_4\"},AttributeModifiers:[]}",
   "damage": 0,
   "lore": [
     "§7Tier: §bIV",
@@ -14,6 +14,8 @@
     "§7the forge in the §2Dwarven",
     "§2Mines§7",
     "",
+    "§4❣ §cRequires §5Heart of the",
+    "§5Mountain Tier 4",
     "§5§lEPIC",
     "",
     "§eItems Required",
@@ -26,9 +28,9 @@
   "internalname": "BEACON_4",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "1.7.1-REL",
+  "modver": "2.0.0-REL",
   "infoType": "WIKI_URL",
   "info": [
-      "https://hypixel-skyblock.fandom.com/wiki/Beacon"
+    "https://hypixel-skyblock.fandom.com/wiki/Beacon"
   ]
-}
+}
\ No newline at end of file
diff --git a/items/BEACON_5.json b/items/BEACON_5.json
index d4ec9845..487c2039 100644
--- a/items/BEACON_5.json
+++ b/items/BEACON_5.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:beacon",
   "displayname": "§f§f§5Beacon V",
-  "nbttag": "{ench:[],overrideMeta:1b,HideFlags:254,display:{Lore:[0:\"§7Tier: §bV\",1:\"\",2:\"§7Can be placed on your private island.\",3:\"\",4:\"§7Grants special buffs to the\",5:\"§7island owners when powered by\",6:\"§7§dPower Crystals §7obtained from\",7:\"§7the forge in the §2Dwarven\",8:\"§2Mines§7\",9:\"\",10:\"§5EPIC\",11:\"\",12:\"§eItems Required\",13:\"§5Beacon IV §7x1\",14:\"§5Refined Mithril §7x40\",15:\"§9Plasma §7x5\",16:\"\",17:\"§7Duration: §b2d 2h\"],Name:\"§f§f§5Beacon V\"},ExtraAttributes:{id:\"BEACON_5\",uuid:\"15dc2535-fad2-417f-a27e-9a38857a50a7\"},AttributeModifiers:[]}",
+  "nbttag": "{ench:[],overrideMeta:1b,HideFlags:254,display:{Lore:[0:\"§7Tier: §bV\",1:\"\",2:\"§7Can be placed on your private island.\",3:\"\",4:\"§7Grants special buffs to the\",5:\"§7island owners when powered by\",6:\"§7§dPower Crystals §7obtained from\",7:\"§7the forge in the §2Dwarven\",8:\"§2Mines§7\",9:\"\",10:\"§4❣ §cRequires §5Heart of the\",11:\"§5Mountain Tier 5\",12:\"§5EPIC\",13:\"\",14:\"§eItems Required\",15:\"§5Beacon IV §7x1\",16:\"§5Refined Mithril §7x40\",17:\"§9Plasma §7x5\",18:\"\",19:\"§7Duration: §b2d 2h\"],Name:\"§f§f§5Beacon V\"},ExtraAttributes:{originTag:\"UNKNOWN\",id:\"BEACON_5\",uuid:\"15dc2535-fad2-417f-a27e-9a38857a50a7\",timestamp:\"1/27/21 10:06 AM\"},AttributeModifiers:[]}",
   "damage": 0,
   "lore": [
     "§7Tier: §bV",
@@ -14,6 +14,8 @@
     "§7the forge in the §2Dwarven",
     "§2Mines§7",
     "",
+    "§4❣ §cRequires §5Heart of the",
+    "§5Mountain Tier 5",
     "§5EPIC",
     "",
     "§eItems Required",
diff --git a/items/DIVER_BOOTS.json b/items/DIVER_BOOTS.json
index 8367a5d8..ebcab625 100644
--- a/items/DIVER_BOOTS.json
+++ b/items/DIVER_BOOTS.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:golden_boots",
   "displayname": "§6Diver's Boots",
-  "nbttag": "{Unbreakable:1,HideFlags:254,display:{Lore:[0:\"§7Sea Creature Chance: §c+2%\",1:\"\",2:\"§7Health: §a+60 HP\",3:\"§7Defense: §a+110\",4:\"\",5:\"§6Full Set Bonus: One with the Fish\",6:\"§7While touching water you move\",7:\"§7§9incredibly fast§7 and can\",8:\"§7breathe §9permanently (sneak to\",9:\"§9slow down).\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§6§lLEGENDARY BOOTS\"],Name:\"§6Diver's Boots\"},ExtraAttributes:{id:\"DIVER_BOOTS\",uuid:\"6da70a11-5590-4dd9-8b2e-89317cad138c\"}}",
+  "nbttag": "{Unbreakable:1,HideFlags:254,display:{Lore:[0:\"§7Sea Creature Chance: §c+2%\",1:\"\",2:\"§7Health: §a+60 HP\",3:\"§7Defense: §a+110\",4:\"\",5:\"§6Full Set Bonus: One with the Fish\",6:\"§7While touching water you move\",7:\"§7§9incredibly fast§7 and can\",8:\"§7breathe §9permanently (sneak to\",9:\"§9slow down).\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§6§lLEGENDARY BOOTS\"],Name:\"§6Diver's Boots\"},ExtraAttributes:{originTag:\"QUICK_CRAFTING\",id:\"DIVER_BOOTS\",uuid:\"6da70a11-5590-4dd9-8b2e-89317cad138c\"}}",
   "damage": 0,
   "lore": [
     "§7Sea Creature Chance: §c+2%",
@@ -16,6 +16,7 @@
     "§9slow down).",
     "",
     "§7§8This item can be reforged!",
+    "§4❣ §cRequires §aFishing Skill 20",
     "§6§lLEGENDARY BOOTS"
   ],
   "recipe": {
diff --git a/items/DIVER_CHESTPLATE.json b/items/DIVER_CHESTPLATE.json
index 20afcc27..d2529f9c 100644
--- a/items/DIVER_CHESTPLATE.json
+++ b/items/DIVER_CHESTPLATE.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:golden_chestplate",
   "displayname": "§6Diver's Shirt",
-  "nbttag": "{Unbreakable:1,HideFlags:254,display:{Lore:[0:\"§7Sea Creature Chance: §c+2%\",1:\"\",2:\"§7Health: §a+100 HP\",3:\"§7Defense: §a+200\",4:\"\",5:\"§6Full Set Bonus: One with the Fish\",6:\"§7While touching water you move\",7:\"§7§9incredibly fast§7 and can\",8:\"§7breathe §9permanently (sneak to\",9:\"§9slow down).\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§6§lLEGENDARY CHESTPLATE\"],Name:\"§6Diver's Shirt\"},ExtraAttributes:{id:\"DIVER_CHESTPLATE\",uuid:\"7913aa7b-46b3-4bae-906a-f4f09961b97b\"}}",
+  "nbttag": "{Unbreakable:1,HideFlags:254,display:{Lore:[0:\"§7Sea Creature Chance: §c+2%\",1:\"\",2:\"§7Health: §a+100 HP\",3:\"§7Defense: §a+200\",4:\"\",5:\"§6Full Set Bonus: One with the Fish\",6:\"§7While touching water you move\",7:\"§7§9incredibly fast§7 and can\",8:\"§7breathe §9permanently (sneak to\",9:\"§9slow down).\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§6§lLEGENDARY CHESTPLATE\"],Name:\"§6Diver's Shirt\"},ExtraAttributes:{originTag:\"CRAFTING_GRID_COLLECT\",id:\"DIVER_CHESTPLATE\",uuid:\"7913aa7b-46b3-4bae-906a-f4f09961b97b\"}}",
   "damage": 0,
   "lore": [
     "§7Sea Creature Chance: §c+2%",
@@ -16,6 +16,7 @@
     "§9slow down).",
     "",
     "§7§8This item can be reforged!",
+    "§4❣ §cRequires §aFishing Skill 20",
     "§6§lLEGENDARY CHESTPLATE"
   ],
   "recipe": {
diff --git a/items/DIVER_HELMET.json b/items/DIVER_HELMET.json
index 1ed1b2bc..d00290ea 100644
--- a/items/DIVER_HELMET.json
+++ b/items/DIVER_HELMET.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
-  "displayname": "§6Diver's Mask",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"b718a978-c064-3bbf-9faf-66641e2cc58a\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTc4MzBjMWQ4Mjg0NWM5MWI4MzQyOWY5ZGM1OTczMTc4NDE1MzhlMTRkNGZiZWQ2MWFlMWEzYjBlYjdjY2QifX19\"}]}},display:{Lore:[0:\"§7Sea Creature Chance: §c+2%\",1:\"\",2:\"§7Health: §a+65 HP\",3:\"§7Defense: §a+120\",4:\"\",5:\"§6Full Set Bonus: One with the Fish\",6:\"§7While touching water you move\",7:\"§7§9incredibly fast§7 and can\",8:\"§7breathe §9permanently (sneak to\",9:\"§9slow down).\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§6§lLEGENDARY HELMET\"],Name:\"§6Diver's Mask\"},ExtraAttributes:{id:\"DIVER_HELMET\"}}",
+  "displayname": "§6Diver\u0027s Mask",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"b718a978-c064-3bbf-9faf-66641e2cc58a\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTc4MzBjMWQ4Mjg0NWM5MWI4MzQyOWY5ZGM1OTczMTc4NDE1MzhlMTRkNGZiZWQ2MWFlMWEzYjBlYjdjY2QifX19\"}]}},display:{Lore:[0:\"§7Sea Creature Chance: §c+2%\",1:\"\",2:\"§7Health: §a+65 HP\",3:\"§7Defense: §a+120\",4:\"\",5:\"§6Full Set Bonus: One with the Fish\",6:\"§7While touching water you move\",7:\"§7§9incredibly fast§7 and can\",8:\"§7breathe §9permanently (sneak to\",9:\"§9slow down).\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§4❣ §cRequires §aFishing Skill 20\",13:\"§6§lLEGENDARY HELMET\"],Name:\"§6Diver\u0027s Mask\"},ExtraAttributes:{id:\"DIVER_HELMET\"}}",
   "damage": 3,
   "lore": [
     "§7Sea Creature Chance: §c+2%",
@@ -16,6 +16,7 @@
     "§9slow down).",
     "",
     "§7§8This item can be reforged!",
+    "§4❣ §cRequires §aFishing Skill 20",
     "§6§lLEGENDARY HELMET"
   ],
   "recipe": {
@@ -31,9 +32,10 @@
   },
   "internalname": "DIVER_HELMET",
   "clickcommand": "viewrecipe",
-  "modver": "1.0.0",
+  "modver": "2.0.0-REL",
   "infoType": "WIKI_URL",
   "info": [
-    "https://hypixel-skyblock.fandom.com/wiki/Diver's_Armor"
-  ]
+    "https://hypixel-skyblock.fandom.com/wiki/Diver\u0027s_Armor"
+  ],
+  "crafttext": ""
 }
\ No newline at end of file
diff --git a/items/DIVER_LEGGINGS.json b/items/DIVER_LEGGINGS.json
index 9a5ae784..66182a35 100644
--- a/items/DIVER_LEGGINGS.json
+++ b/items/DIVER_LEGGINGS.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:golden_leggings",
   "displayname": "§6Diver's Trunks",
-  "nbttag": "{Unbreakable:1,HideFlags:254,display:{Lore:[0:\"§7Sea Creature Chance: §c+2%\",1:\"\",2:\"§7Health: §a+75 HP\",3:\"§7Defense: §a+170\",4:\"\",5:\"§6Full Set Bonus: One with the Fish\",6:\"§7While touching water you move\",7:\"§7§9incredibly fast§7 and can\",8:\"§7breathe §9permanently (sneak to\",9:\"§9slow down).\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§6§lLEGENDARY LEGGINGS\"],Name:\"§6Diver's Trunks\"},ExtraAttributes:{id:\"DIVER_LEGGINGS\",uuid:\"e94d1259-0f94-4c2f-9a95-2510eb3d61f6\"}}",
+  "nbttag": "{Unbreakable:1,HideFlags:254,display:{Lore:[0:\"§7Sea Creature Chance: §c+2%\",1:\"\",2:\"§7Health: §a+75 HP\",3:\"§7Defense: §a+170\",4:\"\",5:\"§6Full Set Bonus: One with the Fish\",6:\"§7While touching water you move\",7:\"§7§9incredibly fast§7 and can\",8:\"§7breathe §9permanently (sneak to\",9:\"§9slow down).\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§6§lLEGENDARY LEGGINGS\"],Name:\"§6Diver's Trunks\"},ExtraAttributes:{originTag:\"QUICK_CRAFTING\",id:\"DIVER_LEGGINGS\",uuid:\"e94d1259-0f94-4c2f-9a95-2510eb3d61f6\"}}",
   "damage": 0,
   "lore": [
     "§7Sea Creature Chance: §c+2%",
@@ -16,6 +16,7 @@
     "§9slow down).",
     "",
     "§7§8This item can be reforged!",
+    "§4❣ §cRequires §aFishing Skill 20",
     "§6§lLEGENDARY LEGGINGS"
   ],
   "recipe": {
diff --git a/items/FISHING_CRYSTAL.json b/items/FISHING_CRYSTAL.json
index e94f80ff..c4df06c7 100644
--- a/items/FISHING_CRYSTAL.json
+++ b/items/FISHING_CRYSTAL.json
@@ -16,6 +16,6 @@
   "infoType": "WIKI_URL",
   "crafttext": "",
   "info": [
-    "https://hypixel-skyblock.fandom.com/wiki/Farm_Crystal"
+    "https://hypixel-skyblock.fandom.com/wiki/Floating_Crystals"
   ]
-}
\ No newline at end of file
+}
diff --git a/items/GAME_ANNIHILATOR.json b/items/GAME_ANNIHILATOR.json
new file mode 100644
index 00000000..6f25a36f
--- /dev/null
+++ b/items/GAME_ANNIHILATOR.json
@@ -0,0 +1,19 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§cGame Annihilator",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"473bf270-99e1-3feb-b816-ef7e6ae4cb82\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGRhMzMyYWJkZTMzM2ExNWE2YzZmY2ZlY2E4M2YwMTU5ZWE5NGI2OGU4ZjI3NGJhZmMwNDg5MmI2ZGJmYyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§7This item was given to a player\",1:\"§7who reported enough game\",2:\"§7breaking bugs to make the\",3:\"§7SkyBlock developers cry.\",4:\"\",5:\"§c§lSPECIAL\"],Name:\"§cGame Annihilator\"},ExtraAttributes:{id:\"GAME_ANNIHILATOR\"}}",
+  "damage": 3,
+  "lore": [
+    "§7This item was given to a player",
+    "§7who reported enough game",
+    "§7breaking bugs to make the",
+    "§7SkyBlock developers cry.",
+    "",
+    "§c§lSPECIAL"
+  ],
+  "internalname": "GAME_ANNIHILATOR",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "2.0.0-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/GRIFFIN_UPGRADE_STONE_EPIC.json b/items/GRIFFIN_UPGRADE_STONE_EPIC.json
index 60838d43..2f6eaf98 100644
--- a/items/GRIFFIN_UPGRADE_STONE_EPIC.json
+++ b/items/GRIFFIN_UPGRADE_STONE_EPIC.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§5Griffin Upgrade Stone",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"b10bdcbb-28c8-3d44-a679-66f226e32f30\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGUxMzk1MjAyNWEyMzI0YTY2NmY3ZWRmNjUzNTgzMjVhYzYzYmFhMzc5OTAyZTM5MGZjMjcyMDE0NjMxOTNlNyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Consumed on use\",1:\"\",2:\"§7Upgrades a griffin pet to the\",3:\"§7rarity of this stone. Pet\",4:\"§7requires immediately precedent\",5:\"§7rarity.\",6:\"\",7:\"§7§eRight click on your griffin to\",8:\"§eupgrade it!\",9:\"\",10:\"§5§lEPIC\"],Name:\"§5Griffin Upgrade Stone\"},ExtraAttributes:{id:\"GRIFFIN_UPGRADE_STONE_EPIC\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"b10bdcbb-28c8-3d44-a679-66f226e32f30\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGUxMzk1MjAyNWEyMzI0YTY2NmY3ZWRmNjUzNTgzMjVhYzYzYmFhMzc5OTAyZTM5MGZjMjcyMDE0NjMxOTNlNyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Consumed on use\",1:\"\",2:\"§7Upgrades a griffin pet to\",3:\"§5§lEPIC§7. Pet requires\",4:\"§7immediately precedent rarity.\",5:\"\",6:\"§7§eRight click on your griffin to\",7:\"§eupgrade it!\",8:\"\",9:\"§5§lEPIC\"],Name:\"§5Griffin Upgrade Stone\"},ExtraAttributes:{id:\"GRIFFIN_UPGRADE_STONE_EPIC\"}}",
   "damage": 3,
   "lore": [
     "§8Consumed on use",
@@ -17,21 +17,21 @@
   ],
   "recipe": {
     "A1": "GRIFFIN_FEATHER:16",
-    "A2": "ENCHNATED_GOLD_BLOCK:6",
+    "A2": "ENCHANTED_GOLD_BLOCK:6",
     "A3": "GRIFFIN_FEATHER:16",
     "B1": "ENCHANTED_ANCIENT_CLAW:2",
     "B2": "GRIFFIN_UPGRADE_STONE_RARE:1",
     "B3": "ENCHANTED_ANCIENT_CLAW:2",
     "C1": "GRIFFIN_FEATHER:16",
-    "C2": "ENCHNATED_GOLD_BLOCK:6",
+    "C2": "ENCHANTED_GOLD_BLOCK:6",
     "C3": "GRIFFIN_FEATHER:16"
   },
   "internalname": "GRIFFIN_UPGRADE_STONE_EPIC",
   "crafttext": "",
   "clickcommand": "viewrecipe",
-  "modver": "1.3-REL",
+  "modver": "2.0.0-REL",
   "infoType": "WIKI_URL",
-  "info":[
+  "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Griffin_Upgrade_Stone"
   ]
-}
+}
\ No newline at end of file
diff --git a/items/GRIFFIN_UPGRADE_STONE_LEGENDARY.json b/items/GRIFFIN_UPGRADE_STONE_LEGENDARY.json
index 8016b8a7..67d0a2bc 100644
--- a/items/GRIFFIN_UPGRADE_STONE_LEGENDARY.json
+++ b/items/GRIFFIN_UPGRADE_STONE_LEGENDARY.json
@@ -1,12 +1,12 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§6Griffin Upgrade Stone",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"b10bdcbb-28c8-3d44-a679-66f226e32f30\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGUxMzk1MjAyNWEyMzI0YTY2NmY3ZWRmNjUzNTgzMjVhYzYzYmFhMzc5OTAyZTM5MGZjMjcyMDE0NjMxOTNlNyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Consumed on use\",1:\"\",2:\"§7Upgrades a griffin pet to the\",3:\"§7rarity of this stone. Pet\",4:\"§7requires immediately precedent\",5:\"§7rarity.\",6:\"\",7:\"§7§eRight click on your griffin to\",8:\"§eupgrade it!\",9:\"\",10:\"§6§lLEGENDARY\"],Name:\"§6Griffin Upgrade Stone\"},ExtraAttributes:{id:\"GRIFFIN_UPGRADE_STONE_LEGENDARY\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"b10bdcbb-28c8-3d44-a679-66f226e32f30\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGUxMzk1MjAyNWEyMzI0YTY2NmY3ZWRmNjUzNTgzMjVhYzYzYmFhMzc5OTAyZTM5MGZjMjcyMDE0NjMxOTNlNyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Consumed on use\",1:\"\",2:\"§7Upgrades a griffin pet to\",3:\"§6§lLEGENDARY§7. Pet requires\",4:\"§7immediately precedent rarity.\",5:\"\",6:\"§7§eRight click on your griffin to\",7:\"§eupgrade it!\",8:\"\",9:\"§6§lLEGENDARY\"],Name:\"§6Griffin Upgrade Stone\"},ExtraAttributes:{id:\"GRIFFIN_UPGRADE_STONE_LEGENDARY\"}}",
   "damage": 3,
   "lore": [
     "§8Consumed on use",
     "",
-"§7Upgrades a griffin pet to",
+    "§7Upgrades a griffin pet to",
     "§6§lLEGENDARY§7. Pet requires",
     "§7immediately precedent rarity.",
     "",
@@ -19,9 +19,9 @@
     "A1": "GRIFFIN_FEATHER:32",
     "A2": "ENCHANTED_ANCIENT_CLAW:8",
     "A3": "GRIFFIN_FEATHER:32",
-    "B1": "ENCHNATED_GOLD_BLOCK:64",
+    "B1": "ENCHANTED_GOLD_BLOCK:64",
     "B2": "GRIFFIN_UPGRADE_STONE_EPIC:1",
-    "B3": "ENCHNATED_GOLD_BLOCK:64",
+    "B3": "ENCHANTED_GOLD_BLOCK:64",
     "C1": "GRIFFIN_FEATHER:32",
     "C2": "ENCHANTED_ANCIENT_CLAW:8",
     "C3": "GRIFFIN_FEATHER:32"
@@ -29,9 +29,9 @@
   "internalname": "GRIFFIN_UPGRADE_STONE_LEGENDARY",
   "crafttext": "",
   "clickcommand": "viewrecipe",
-  "modver": "1.3-REL",
+  "modver": "2.0.0-REL",
   "infoType": "WIKI_URL",
-  "info":[
+  "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Griffin_Upgrade_Stone"
   ]
-}
+}
\ No newline at end of file
diff --git a/items/GRIFFIN_UPGRADE_STONE_RARE.json b/items/GRIFFIN_UPGRADE_STONE_RARE.json
index 99bf7234..c0a53ec3 100644
--- a/items/GRIFFIN_UPGRADE_STONE_RARE.json
+++ b/items/GRIFFIN_UPGRADE_STONE_RARE.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§9Griffin Upgrade Stone",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"b10bdcbb-28c8-3d44-a679-66f226e32f30\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGUxMzk1MjAyNWEyMzI0YTY2NmY3ZWRmNjUzNTgzMjVhYzYzYmFhMzc5OTAyZTM5MGZjMjcyMDE0NjMxOTNlNyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Consumed on use\",1:\"\",2:\"§7Upgrades a griffin pet to the\",3:\"§7rarity of this stone. Pet\",4:\"§7requires immediately precedent\",5:\"§7rarity.\",6:\"\",7:\"§7§eRight click on your griffin to\",8:\"§eupgrade it!\",9:\"\",10:\"§9§lRARE\"],Name:\"§9Griffin Upgrade Stone\"},ExtraAttributes:{id:\"GRIFFIN_UPGRADE_STONE_RARE\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"b10bdcbb-28c8-3d44-a679-66f226e32f30\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGUxMzk1MjAyNWEyMzI0YTY2NmY3ZWRmNjUzNTgzMjVhYzYzYmFhMzc5OTAyZTM5MGZjMjcyMDE0NjMxOTNlNyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Consumed on use\",1:\"\",2:\"§7Upgrades a griffin pet to\",3:\"§9§lRARE§7. Pet requires\",4:\"§7immediately precedent rarity.\",5:\"\",6:\"§7§eRight click on your griffin to\",7:\"§eupgrade it!\",8:\"\",9:\"§9§lRARE\"],Name:\"§9Griffin Upgrade Stone\"},ExtraAttributes:{id:\"GRIFFIN_UPGRADE_STONE_RARE\"}}",
   "damage": 3,
   "lore": [
     "§8Consumed on use",
@@ -17,21 +17,21 @@
   ],
   "recipe": {
     "A1": "GRIFFIN_FEATHER:4",
-    "A2": "ENCHNATED_GOLD_BLOCK:2",
+    "A2": "ENCHANTED_GOLD_BLOCK:2",
     "A3": "GRIFFIN_FEATHER:4",
     "B1": "ANCIENT_CLAW:32",
     "B2": "GRIFFIN_UPGRADE_STONE_UNCOMMON:1",
     "B3": "ANCIENT_CLAW:32",
     "C1": "GRIFFIN_FEATHER:4",
-    "C2": "ENCHNATED_GOLD_BLOCK:2",
+    "C2": "ENCHANTED_GOLD_BLOCK:2",
     "C3": "GRIFFIN_FEATHER:4"
   },
   "internalname": "GRIFFIN_UPGRADE_STONE_RARE",
   "crafttext": "",
   "clickcommand": "viewrecipe",
-  "modver": "1.3-REL",
+  "modver": "2.0.0-REL",
   "infoType": "WIKI_URL",
-  "info":[
+  "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Griffin_Upgrade_Stone"
   ]
-}
+}
\ No newline at end of file
diff --git a/items/GRIFFIN_UPGRADE_STONE_UNCOMMON.json b/items/GRIFFIN_UPGRADE_STONE_UNCOMMON.json
index c7dca7ec..6d4ba711 100644
--- a/items/GRIFFIN_UPGRADE_STONE_UNCOMMON.json
+++ b/items/GRIFFIN_UPGRADE_STONE_UNCOMMON.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§aGriffin Upgrade Stone",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"b10bdcbb-28c8-3d44-a679-66f226e32f30\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGUxMzk1MjAyNWEyMzI0YTY2NmY3ZWRmNjUzNTgzMjVhYzYzYmFhMzc5OTAyZTM5MGZjMjcyMDE0NjMxOTNlNyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Consumed on use\",1:\"\",2:\"§7Upgrades a griffin pet to the\",3:\"§7rarity of this stone. Pet\",4:\"§7requires immediately precedent\",5:\"§7rarity.\",6:\"\",7:\"§7§eRight click on your griffin to\",8:\"§eupgrade it!\",9:\"\",10:\"§a§lUNCOMMON\"],Name:\"§aGriffin Upgrade Stone\"},ExtraAttributes:{id:\"GRIFFIN_UPGRADE_STONE_UNCOMMON\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"b10bdcbb-28c8-3d44-a679-66f226e32f30\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGUxMzk1MjAyNWEyMzI0YTY2NmY3ZWRmNjUzNTgzMjVhYzYzYmFhMzc5OTAyZTM5MGZjMjcyMDE0NjMxOTNlNyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Consumed on use\",1:\"\",2:\"§7Upgrades a griffin pet to\",3:\"§a§lUNCOMMON§7. Pet requires\",4:\"§7immediately precedent rarity.\",5:\"\",6:\"§7§eRight click on your griffin to\",7:\"§eupgrade it!\",8:\"\",9:\"§a§lUNCOMMON\"],Name:\"§aGriffin Upgrade Stone\"},ExtraAttributes:{id:\"GRIFFIN_UPGRADE_STONE_UNCOMMON\"}}",
   "damage": 3,
   "lore": [
     "§8Consumed on use",
@@ -17,21 +17,21 @@
   ],
   "recipe": {
     "A1": "GRIFFIN_FEATHER:2",
-    "A2": "ENCHNATED_GOLD:24",
+    "A2": "ENCHANTED_GOLD:24",
     "A3": "GRIFFIN_FEATHER:2",
     "B1": "ANCIENT_CLAW:16",
     "B2": "BASE_GRIFFIN_UPGRADE_STONE:1",
     "B3": "ANCIENT_CLAW:16",
     "C1": "GRIFFIN_FEATHER:2",
-    "C2": "ENCHNATED_GOLD:24",
+    "C2": "ENCHANTED_GOLD:24",
     "C3": "GRIFFIN_FEATHER:2"
   },
   "internalname": "GRIFFIN_UPGRADE_STONE_UNCOMMON",
   "craf