Fixed a few (81) items (#828)

* Fixed a few (21) pets

* Fixed another (1) pet

* Fixed Alert Flare recipe

* Fixed ench coal

* Fixed ench charcoal

* Fixed Farm Armours

* Fixed a few (48) reforge stones

Combinable in Reforge Anvil

* Fixed more (6) items

88 files changed, 459 insertions, 429 deletions

diff --git a/constants/petnums.json b/constants/petnums.json
index 758767f6..36a837f4 100644
--- a/constants/petnums.json
+++ b/constants/petnums.json
@@ -4416,7 +4416,7 @@
         "otherNums": [
           0.3,
           0.5,
-          0.4
+          0.5
         ],
         "statNums": {
           "CRIT_CHANCE": 0.0,
@@ -4428,7 +4428,7 @@
         "otherNums": [
           30,
           50,
-          40
+          50
         ],
         "statNums": {
           "CRIT_CHANCE": 10.0,
diff --git a/constants/reforgestones.json b/constants/reforgestones.json
index 384e0383..5147a703 100644
--- a/constants/reforgestones.json
+++ b/constants/reforgestones.json
@@ -678,6 +678,49 @@
       }
     }
   },
+  "ENTROPY_SUPPRESSOR": {
+    "internalName": "ENTROPY_SUPPRESSOR",
+    "reforgeName": "Coldfused",
+    "reforgeType": "blacksmith/reforge_stone",
+    "itemTypes": "SWORD",
+    "requiredRarities": [
+      "COMMON",
+      "UNCOMMON",
+      "RARE",
+      "EPIC",
+      "LEGENDARY",
+      "MYTHIC"
+    ],
+    "reforgeCosts": {
+      "COMMON": 60000,
+      "UNCOMMON": 125000,
+      "RARE": 250000,
+      "EPIC": 500000,
+      "LEGENDARY": 1000000,
+      "MYTHIC": 20000000
+    },
+    "reforgeAbility": "§8Only if Wisp is equipped §c+75❁ Strength §9+55☠ Crit Damage §7Deal §62x §7to fire pillars, breaking one §7grants §f+30❂ True Defense §7and §c+1.15x §cdamage §7for §a60s§7.",
+    "reforgeStats": {
+      "COMMON": {
+        "magic_find": 2
+      },
+      "UNCOMMON": {
+        "magic_find": 2
+      },
+      "RARE": {
+        "magic_find": 2
+      },
+      "EPIC": {
+        "magic_find": 2
+      },
+      "LEGENDARY": {
+        "magic_find": 2
+      },
+      "MYTHIC": {
+        "magic_find": 2
+      }
+    }
+  },
   "GIANT_TOOTH": {
     "internalName": "GIANT_TOOTH",
     "reforgeName": "Giant",
@@ -947,27 +990,33 @@
     "reforgeStats": {
       "COMMON": {
         "strength": 5,
-        "crit_chance": 5
+        "crit_chance": 5,
+        "fishing_speed": 1
       },
       "UNCOMMON": {
         "strength": 10,
-        "crit_chance": 10
+        "crit_chance": 10,
+        "fishing_speed": 2
       },
       "RARE": {
         "strength": 17,
-        "crit_chance": 17
+        "crit_chance": 17,
+        "fishing_speed": 4
       },
       "EPIC": {
         "strength": 25,
-        "crit_chance": 25
+        "crit_chance": 25,
+        "fishing_speed": 6
       },
       "LEGENDARY": {
         "strength": 35,
-        "crit_chance": 35
+        "crit_chance": 35,
+        "fishing_speed": 8
       },
       "MYTHIC": {
         "strength": 50,
-        "crit_chance": 50
+        "crit_chance": 50,
+        "fishing_speed": 10
       }
     }
   },
@@ -1957,7 +2006,7 @@
       "LEGENDARY": 1000000,
       "MYTHIC": 2000000
     },
-    "reforgeAbility": "Any healing on others is increased by §a10% §7while in dungeons.",
+    "reforgeAbility": "§7Grants §a+10☄ Mending §7while in Dungeons, which increases your healing on others..",
     "reforgeStats": {
       "COMMON": {
         "health": 10,
diff --git a/items/ALERT_FLARE.json b/items/ALERT_FLARE.json
index 7846cae9..0eab61c0 100644
--- a/items/ALERT_FLARE.json
+++ b/items/ALERT_FLARE.json
@@ -29,7 +29,7 @@
     "B2": "MOLTEN_POWDER:64",
     "B3": "",
     "C1": "INFERNO_VERTEX:8",
-    "C2": "ENCHANTED_FIREWORK_ROCKET:1",
+    "C2": "ALERT_FLARE:1",
     "C3": ""
   },
   "internalname": "ALERT_FLARE",
diff --git a/items/AMBER_MATERIAL.json b/items/AMBER_MATERIAL.json
index b5eb71ab..66908cec 100644
--- a/items/AMBER_MATERIAL.json
+++ b/items/AMBER_MATERIAL.json
@@ -1,15 +1,14 @@
 {
   "itemid": "minecraft:skull",
-  "displayname": "§f§f§5Amber Material",
-  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"f38e2ada-056c-3df5-ac6c-6f03e2914c7e\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYWFjZTZiYjNhYTRjY2FjMDMxMTY4MjAyZjZkNDUzMjU5N2JjYWM2MzUxMDU5YWJkOWQxMGIyODYxMDQ5M2FlYiJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Reforge Stone\",1:\"\",2:\"§7Can be used in a Reforge Anvil\",3:\"§7or with the Dungeon Blacksmith\",4:\"§7to apply the §9Ambered §7reforge\",5:\"§7to a pickaxe.\",6:\"\",7:\"§7§8§oPut a bunch of Amber\",8:\"§8§otogether and it\u0027ll make more\",9:\"§8§oAmber - Throin the Forger.\",10:\"\",11:\"§7Requires §aMining Skill Level\",12:\"§aXXX§7!\",13:\"\",14:\"§5§lEPIC REFORGE STONE\",15:\"\",16:\"§eItems Required\",17:\"§9⸕ §9Fine Amber Gemstone §7x12\",18:\"§9Golden Plate §7x1\",19:\"\",20:\"§7Duration: §b7h\"],Name:\"§f§f§5Amber Material\"},ExtraAttributes:{id:\"AMBER_MATERIAL\"},AttributeModifiers:[]}",
+  "displayname": "§5Amber Material",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"f38e2ada-056c-3df5-ac6c-6f03e2914c7e\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYWFjZTZiYjNhYTRjY2FjMDMxMTY4MjAyZjZkNDUzMjU5N2JjYWM2MzUxMDU5YWJkOWQxMGIyODYxMDQ5M2FlYiJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Reforge Stone\",1:\"§7§8Combinable in Reforge Anvil\",2:\"\",3:\"§7Applies the §9Ambered §7reforge\",4:\"§7when combined with a pickaxe§7.\",5:\"\",6:\"§7§8§oPut a bunch of Amber\",7:\"§8§otogether and it\u0027ll make more\",8:\"§8§oAmber - Throin the Forger.\",9:\"\",10:\"§7Requires §aMining Skill Level\",11:\"§aXXX§7!\",12:\"\",13:\"§5§lEPIC REFORGE STONE\",14:\"\",15:\"§eItems Required\",16:\"§9⸕ §9Fine Amber Gemstone §7x12\",17:\"§9Golden Plate §7x1\",18:\"\",19:\"§7Duration: §b7h\"],Name:\"§5Amber Material\"},ExtraAttributes:{id:\"AMBER_MATERIAL\"}}",
   "damage": 3,
   "lore": [
     "§8Reforge Stone",
+    "§7§8Combinable in Reforge Anvil",
     "",
-    "§7Can be used in a Reforge Anvil",
-    "§7or with the Dungeon Blacksmith",
-    "§7to apply the §9Ambered §7reforge",
-    "§7to a pickaxe.",
+    "§7Applies the §9Ambered §7reforge",
+    "§7when combined with a pickaxe§7.",
     "",
     "§7§8§oPut a bunch of Amber",
     "§8§otogether and it\u0027ll make more",
@@ -29,7 +28,7 @@
   "internalname": "AMBER_MATERIAL",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Amber_Material"
diff --git a/items/AOTE_STONE.json b/items/AOTE_STONE.json
index 4340c37c..deb1bccf 100644
--- a/items/AOTE_STONE.json
+++ b/items/AOTE_STONE.json
@@ -1,15 +1,15 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§9Warped Stone",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"3e177aa5-3b13-3bc1-a40b-28d3b4561b9b\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY1MjE0NjU0MzEyMywKICAicHJvZmlsZUlkIiA6ICJjOWRlZTM4MDUzYjg0YzI5YjZlZjA5YjJlMDM5OTc0ZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJTQVJfRGVjZW1iZXI1IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzU0ZDQ4YWM3ZTY1YjkxNDY3OTA0ZjJmNGQxNTQ1NTY3NzZmZmE5Y2QyZDUyNmIxMmEwNDk5YmI1OWNjNjU2YzciLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ\u003d\u003d\"}]}},display:{Lore:[0:\"§8Reforge Stone\",1:\"\",2:\"§7Can be used in a Reforge Anvil\",3:\"§7or with the Dungeon Blacksmith\",4:\"§7to apply the §9Warped §7reforge\",5:\"§7to a melee weapon.\",6:\"\",7:\"§7§8§oIf you look deep inside, you\",8:\"§8§orisk finding yourself somewhere\",9:\"§8§oelse.\",10:\"\",11:\"§7Requires §aMining Skill Level\",12:\"§aXXVI§7!\",13:\"\",14:\"§9§lRARE REFORGE STONE\"],Name:\"§9Warped Stone\"},ExtraAttributes:{id:\"AOTE_STONE\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"3e177aa5-3b13-3bc1-a40b-28d3b4561b9b\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY1MjE0NjU0MzEyMywKICAicHJvZmlsZUlkIiA6ICJjOWRlZTM4MDUzYjg0YzI5YjZlZjA5YjJlMDM5OTc0ZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJTQVJfRGVjZW1iZXI1IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzU0ZDQ4YWM3ZTY1YjkxNDY3OTA0ZjJmNGQxNTQ1NTY3NzZmZmE5Y2QyZDUyNmIxMmEwNDk5YmI1OWNjNjU2YzciLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ\u003d\u003d\"}]}},display:{Lore:[0:\"§8Reforge Stone\",1:\"§7§8Combinable in Reforge Anvil\",2:\"\",3:\"§7Applies the §9Warped §7reforge\",4:\"§7when combined with a melee\",5:\"§7weapon§7.\",6:\"\",7:\"§7§8§oIf you look deep inside, you\",8:\"§8§orisk finding yourself somewhere\",9:\"§8§oelse.\",10:\"\",11:\"§7Requires §aMining Skill Level\",12:\"§aXXVI§7!\",13:\"\",14:\"§9§lRARE REFORGE STONE\"],Name:\"§9Warped Stone\"},ExtraAttributes:{id:\"AOTE_STONE\"}}",
   "damage": 3,
   "lore": [
     "§8Reforge Stone",
+    "§7§8Combinable in Reforge Anvil",
     "",
-    "§7Can be used in a Reforge Anvil",
-    "§7or with the Dungeon Blacksmith",
-    "§7to apply the §9Warped §7reforge",
-    "§7to a melee weapon.",
+    "§7Applies the §9Warped §7reforge",
+    "§7when combined with a melee",
+    "§7weapon§7.",
     "",
     "§7§8§oIf you look deep inside, you",
     "§8§orisk finding yourself somewhere",
diff --git a/items/BLAZE_WAX.json b/items/BLAZE_WAX.json
index 0e7b7320..089baecd 100644
--- a/items/BLAZE_WAX.json
+++ b/items/BLAZE_WAX.json
@@ -1,15 +1,14 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§9Blaze Wax",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"ed8a2d8a-a704-3837-b87a-ac335082c409\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0ODQ3Mzc4MDA4NSwKICAicHJvZmlsZUlkIiA6ICI1YjY2YzNkZWZhYTI0NWMzYTcwNjM3OTA3NTQ0Yjg3MCIsCiAgInByb2ZpbGVOYW1lIiA6ICJSZWFuX1JhaWNvMDgxNiIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9mN2JlYzM3NmVjYmVjNTRkYzY3OTVjYmNhNDkxOGUxMmIxNTNkZDM0YTA4MjdhYmM5YmE3YmU2M2FmODdjMDc4IgogICAgfQogIH0KfQ\"}]}},display:{Lore:[0:\"§8Reforge Stone\",1:\"\",2:\"§7Can be used in a Reforge Anvil\",3:\"§7or with the Dungeon Blacksmith\",4:\"§7to apply the §9Waxed §7reforge\",5:\"§7to equipment.\",6:\"\",7:\"§7§8§oUsed by some Master\",8:\"§8§oBlacksmiths to infuse equipments\",9:\"§8§owith an immense power. It\u0027s also\",10:\"§8§oa great replacement for butter.\",11:\"\",12:\"§7Requires §aMining Skill Level\",13:\"§aXXIV§7!\",14:\"\",15:\"§9§lRARE REFORGE STONE\"],Name:\"§9Blaze Wax\"},ExtraAttributes:{id:\"BLAZE_WAX\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"ed8a2d8a-a704-3837-b87a-ac335082c409\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0ODQ3Mzc4MDA4NSwKICAicHJvZmlsZUlkIiA6ICI1YjY2YzNkZWZhYTI0NWMzYTcwNjM3OTA3NTQ0Yjg3MCIsCiAgInByb2ZpbGVOYW1lIiA6ICJSZWFuX1JhaWNvMDgxNiIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9mN2JlYzM3NmVjYmVjNTRkYzY3OTVjYmNhNDkxOGUxMmIxNTNkZDM0YTA4MjdhYmM5YmE3YmU2M2FmODdjMDc4IgogICAgfQogIH0KfQ\"}]}},display:{Lore:[0:\"§8Reforge Stone\",1:\"§7§8Combinable in Reforge Anvil\",2:\"\",3:\"§7Applies the §9Waxed §7reforge\",4:\"§7when combined with equipment§7.\",5:\"\",6:\"§7§8§oUsed by some Master\",7:\"§8§oBlacksmiths to infuse equipments\",8:\"§8§owith an immense power. It\u0027s also\",9:\"§8§oa great replacement for butter.\",10:\"\",11:\"§7Requires §aMining Skill Level\",12:\"§aXXIV§7!\",13:\"\",14:\"§9§lRARE REFORGE STONE\"],Name:\"§9Blaze Wax\"},ExtraAttributes:{id:\"BLAZE_WAX\"}}",
   "damage": 3,
   "lore": [
     "§8Reforge Stone",
+    "§7§8Combinable in Reforge Anvil",
     "",
-    "§7Can be used in a Reforge Anvil",
-    "§7or with the Dungeon Blacksmith",
-    "§7to apply the §9Waxed §7reforge",
-    "§7to equipment.",
+    "§7Applies the §9Waxed §7reforge",
+    "§7when combined with equipment§7.",
     "",
     "§7§8§oUsed by some Master",
     "§8§oBlacksmiths to infuse equipments",
diff --git a/items/BLESSED_FRUIT.json b/items/BLESSED_FRUIT.json
index 74938281..d758fb6d 100644
--- a/items/BLESSED_FRUIT.json
+++ b/items/BLESSED_FRUIT.json
@@ -1,15 +1,15 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§5Blessed Fruit",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"e87de432-be37-397f-a408-27d18aed4338\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZX