Manual Merge bc Conflicts

106 files changed, 1107 insertions, 136 deletions

diff --git a/items/ANTIQUE_REMEDIES.json b/items/ANTIQUE_REMEDIES.json
index 9d97998f..c08871d8 100644
--- a/items/ANTIQUE_REMEDIES.json
+++ b/items/ANTIQUE_REMEDIES.json
@@ -22,6 +22,9 @@
   "internalname": "ANTIQUE_REMEDIES",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "1.3-REL",
-  "infoType": ""
+  "modver": "1.5-REL",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Antique_Remedies"
+  ]
 }
\ No newline at end of file
diff --git a/items/AOTE_STONE.json b/items/AOTE_STONE.json
index fbdc8b78..bbc89b21 100644
--- a/items/AOTE_STONE.json
+++ b/items/AOTE_STONE.json
@@ -23,6 +23,9 @@
   "internalname": "AOTE_STONE",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "1.3-REL",
-  "infoType": ""
+  "modver": "1.5-REL",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Warped_Stone"
+  ]
 }
\ No newline at end of file
diff --git a/items/ARTIFACT_POTION_AFFINITY.json b/items/ARTIFACT_POTION_AFFINITY.json
index 91cfb76e..a7b0d903 100644
--- a/items/ARTIFACT_POTION_AFFINITY.json
+++ b/items/ARTIFACT_POTION_AFFINITY.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§9Potion Affinity Artifact",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"63036731-6e1e-3c99-99b7-59d6628fcdaf\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzcyNDY2NjAzYmFlOTA2M2NlN2Q5NDM1MTEwMzQ2OWJlY2EzYzVmZTJiMWU5NzdlNjQyN2RlZjM3Njk5ZWM5In19fQ==\"}]}},display:{Lore:[0:\"§eUnique Effect: Potion Affinity\",1:\"§7Increases the duration of any\",2:\"§7consumed Potion by §a50%§7 when\",3:\"§7held in your inventory.\",4:\"\",5:\"§7§8This item can be reforged!\",6:\"§9§lRARE ACCESSORY\"],Name:\"§9Potion Affinity Artifact\"},ExtraAttributes:{id:\"ARTIFACT_POTION_AFFINITY\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"63036731-6e1e-3c99-99b7-59d6628fcdaf\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzcyNDY2NjAzYmFlOTA2M2NlN2Q5NDM1MTEwMzQ2OWJlY2EzYzVmZTJiMWU5NzdlNjQyN2RlZjM3Njk5ZWM5In19fQ\u003d\u003d\"}]}},display:{Lore:[0:\"§eUnique Effect: Potion Affinity\",1:\"§7Increases the duration of any\",2:\"§7consumed Potion by §a50%§7 when\",3:\"§7held in your inventory.\",4:\"\",5:\"§7§8This item can be reforged!\",6:\"§9§lRARE ACCESSORY\"],Name:\"§9Potion Affinity Artifact\"},ExtraAttributes:{id:\"ARTIFACT_POTION_AFFINITY\"}}",
   "damage": 3,
   "lore": [
     "§eUnique Effect: Potion Affinity",
diff --git a/items/BASKET_OF_SEEDS.json b/items/BASKET_OF_SEEDS.json
new file mode 100644
index 00000000..80f5d92e
--- /dev/null
+++ b/items/BASKET_OF_SEEDS.json
@@ -0,0 +1,25 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§5Basket of Seeds",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"f51f3409-e6be-3151-8289-98b7dc91c656\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2E2YmY5MTZlMjhjY2I4MGI0ZWJmYWNmOTg2ODZhZDZhZjdjNGZiMjU3ZTU3YThjYjc4YzcxZDE5ZGNjYjIifX19\"}]}},display:{Lore:[0:\"\",1:\"§6Item Ability: Seed Storage §e§lLEFT CLICK\",2:\"§7Place seeds in the basket.\",3:\"\",4:\"§6Item Ability: Farmer\u0027s Delight §e§lRIGHT CLICK\",5:\"§7Automatically seed a row of\",6:\"§7farmland.\",7:\"\",8:\"§5§lEPIC\"],Name:\"§5Basket of Seeds\"},ExtraAttributes:{basket_of_seeds_data:[0:\"198 bytes\"],originTag:\"SHOP_PURCHASE\",id:\"BASKET_OF_SEEDS\",uuid:\"b1531129-9bcb-4fee-8e2b-d0fc829f2085\",timestamp:\"11/7/20 8:38 PM\"}}",
+  "damage": 3,
+  "lore": [
+    "",
+    "§6Item Ability: Seed Storage §e§lLEFT CLICK",
+    "§7Place seeds in the basket.",
+    "",
+    "§6Item Ability: Farmer\u0027s Delight §e§lRIGHT CLICK",
+    "§7Automatically seed a row of",
+    "§7farmland.",
+    "",
+    "§5§lEPIC"
+  ],
+  "internalname": "BASKET_OF_SEEDS",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.5-REL",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Basket_Of_Seeds"
+  ]
+}
\ No newline at end of file
diff --git a/items/BAT;4.json b/items/BAT;4.json
index 706c1eb7..3a658123 100644
--- a/items/BAT;4.json
+++ b/items/BAT;4.json
@@ -9,21 +9,23 @@
   "lore": [
     "§8Mining Pet",
     "",
+    "§7Sea Creature Chance: §a{SEA_CREATURE_CHANCE}",
     "§7Intelligence: §a{INTELLIGENCE}",
     "§7Speed: §a{SPEED}",
     "",
-    "§6Fast Hooks",
-    "§7§7Decreases the cooldown of your",
-    "§7grappling hook by §a{0}%",
+    "§6Candy Lover",
+    "§7§7Increases the chance for mobs",
+    "§7to drop Candy by §a{0}%",
     "",
     "§6Nightmare",
     "§7§7§7During night, gain §a{1}",
     "§a§b✎ Intelligence§7, §a{2} §f✦",
     "§fSpeed§7, and night vision",
     "",
-    "§6Candy Lover",
-    "§7§7Increases the chance for mobs",
-    "§7to drop Candy by §a{3}%",
+    "§6Wings of Steel",
+    "§7§7Deals §a{3}% damage to",
+    "§6Spooky §7enemies during the",
+    "§6Spooky Festival",
     "",
     "§7§eRight-click to add this pet to",
     "§eyour pet menu!",
@@ -47,4 +49,4 @@
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Bat_Pet"
   ]
-}
\ No newline at end of file
+}
diff --git a/items/COCO_CHOPPER.json b/items/COCO_CHOPPER.json
new file mode 100644
index 00000000..ed0cabd1
--- /dev/null
+++ b/items/COCO_CHOPPER.json
@@ -0,0 +1,21 @@
+{
+  "itemid": "minecraft:golden_axe",
+  "displayname": "§5Coco Chopper",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Cannot break trees.\",1:\"§7Replants cocoa blocks.\",2:\"\",3:\"§7§8This item can be reforged!\",4:\"§5§lEPIC AXE\"],Name:\"§5Coco Chopper\"},ExtraAttributes:{id:\"COCO_CHOPPER\"}}",
+  "damage": 0,
+  "lore": [
+    "§7Cannot break trees.",
+    "§7Replants cocoa blocks.",
+    "",
+    "§7§8This item can be reforged!",
+    "§5§lEPIC AXE"
+  ],
+  "internalname": "COCO_CHOPPER",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.5-REL",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Coco_Chopper"
+  ]
+}
\ No newline at end of file
diff --git a/items/CONNECT_FOUR.json b/items/CONNECT_FOUR.json
new file mode 100644
index 00000000..1cdf1d17
--- /dev/null
+++ b/items/CONNECT_FOUR.json
@@ -0,0 +1,18 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§aFour in a Row",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"1673c479-346e-3634-b549-8842a94c2199\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDJlNzhmYjIyNDI0MjMyZGMyN2I4MWZiY2I0N2ZkMjRjMWFjZjc2MDk4NzUzZjJkOWMyODU5ODI4N2RiNSJ9fX0\u003d\"}]}},display:{Lore:[0:\"§7Click another player to initiate\",1:\"§7a game of Four in a Row!\",2:\"\",3:\"§7§4❣ §cRequires §aSocial Skill 7\",4:\"§a§lUNCOMMON\"],Name:\"§aFour in a Row\"},ExtraAttributes:{id:\"CONNECT_FOUR\"}}",
+  "damage": 3,
+  "lore": [
+    "§7Click another player to initiate",
+    "§7a game of Four in a Row!",
+    "",
+    "§7§4❣ §cRequires §aSocial Skill 7",
+    "§a§lUNCOMMON"
+  ],
+  "internalname": "CONNECT_FOUR",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.5-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/DANGER_1_PORTAL.json b/items/DANGER_1_PORTAL.json
index dbd777ad..7f8566b2 100644
--- a/