Merge branch 'master' into prerelease

3 files changed, 62 insertions, 3 deletions

diff --git a/items/PET_SKIN_TIGER_NEON.json b/items/PET_SKIN_TIGER_NEON.json
new file mode 100644
index 00000000..f0f97898
--- /dev/null
+++ b/items/PET_SKIN_TIGER_NEON.json
@@ -0,0 +1,33 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§dNeon Tiger Skin",
+  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"132ecfff-1cd3-34bd-b0b7-0e7f40def149\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY2NzUxMDQ2NjU4NywKICAicHJvZmlsZUlkIiA6ICI4YzExNzIxYWM5ZjE0Mjc4OWEwZDgyMmRmYzNhMWE5YSIsCiAgInByb2ZpbGVOYW1lIiA6ICJEb2d5Q1pTS18iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODA1ZGUzMjgwNmVhODY4Y2I2ZTIyMjY1NjkzNjkzMmYxMDZmYjRmNDQwMThhZmRiZjc4ZTQ1NjZkNWUwYTM0YiIKICAgIH0KICB9Cn0\"}]}},display:{Lore:[0:\"§8Consumed on use\",1:\"\",2:\"§7§7Pet skins change the look and\",3:\"§7particle trail of your pet but\",4:\"§7only one skin can be active at a\",5:\"§7time!\",6:\"\",7:\"§7§7This skin can only be applied\",8:\"§7to Tiger pets.\",9:\"\",10:\"§7§aThis skin is animated!\",11:\"\",12:\"§7§eRight click on your pet to\",13:\"§eapply this skin!\",14:\"\",15:\"§d§lMYTHIC COSMETIC\"],Name:\"§dNeon Tiger Skin\"},ExtraAttributes:{id:\"PET_SKIN_TIGER_NEON\"},AttributeModifiers:[]}",
+  "damage": 3,
+  "lore": [
+    "§8Consumed on use",
+    "",
+    "§7§7Pet skins change the look and",
+    "§7particle trail of your pet but",
+    "§7only one skin can be active at a",
+    "§7time!",
+    "",
+    "§7§7This skin can only be applied",
+    "§7to Tiger pets.",
+    "",
+    "§7§aThis skin is animated!",
+    "",
+    "§7§eRight click on your pet to",
+    "§eapply this skin!",
+    "",
+    "§d§lMYTHIC COSMETIC"
+  ],
+  "internalname": "PET_SKIN_TIGER_NEON",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "2.1.0-REL",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Fire_Sale",
+    "https://wiki.hypixel.net/Fire_Sale"
+  ]
+}
\ No newline at end of file
diff --git a/items/TERMINATOR.json b/items/TERMINATOR.json
index 70252471..5dbb5c73 100644
--- a/items/TERMINATOR.json
+++ b/items/TERMINATOR.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:bow",
   "displayname": "§6Terminator",
-  "nbttag": "{ench:[],Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+310\",1:\"§7Strength: §c+50\",2:\"§7Crit Damage: §c+250%\",3:\"§7Bonus Attack Speed: §c+40%\",4:\"§7Shot Cooldown: §a0.5s\",5:\"\",6:\"§6Shortbow: Instantly shoots!\",7:\"§7Shoots §b3 §7arrows at once.\",8:\"§7Can damage endermen.\",9:\"\",10:\"§cDivides your §9☣ Crit Chance §cby 4!\",11:\"\",12:\"§6Ability: Salvation §e§lRIGHT CLICK\",13:\"§7Can be casted after landing §63 §7hits.\",14:\"§7§7Shoot a beam, penetrating up\",15:\"§7to §e5 §7foes and dealing §c2x\",16:\"§c§7the damage an arrow would.\",17:\"§7The beam always crits.\",18:\"§8Soulflow Cost: §3§31⸎\",19:\"§8Cooldown: §a2s\",20:\"\",21:\"§7§8This item can be reforged!\",22:\"§7§4☠ §cRequires §5Enderman Slayer 7\",23:\"§6§lLEGENDARY BOW\"],Name:\"§6Terminator\"},ExtraAttributes:{id:\"TERMINATOR\"}}",
+  "nbttag": "{ench:[],Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+310\",1:\"§7Strength: §c+50\",2:\"§7Crit Damage: §c+250%\",3:\"§7Bonus Attack Speed: §c+40%\",4:\"§7Shot Cooldown: §a0.5s\",5:\"\",6:\"§6Shortbow: Instantly shoots!\",7:\"§7Shoots §b3 §7arrows at once.\",8:\"§7Can damage endermen.\",9:\"\",10:\"§cDivides your §9☣ Crit Chance §cby 4!\",11:\"\",12:\"§6Ability: Salvation §e§lRIGHT CLICK\",13:\"§7Can be casted after landing §63 §7hits.\",14:\"§7§7Shoot a beam, penetrating up\",15:\"§7to §e5 §7enemies.\",16:\"§7The beam always crits.\",17:\"§8Soulflow Cost: §3§31⸎\",18:\"§8Cooldown: §a2s\",19:\"\",20:\"§7§8This item can be reforged!\",21:\"§7§4☠ §cRequires §5Enderman Slayer 7\",22:\"§6§lLEGENDARY BOW\"],Name:\"§6Terminator\"},ExtraAttributes:{id:\"TERMINATOR\"}}",
   "damage": 0,
   "lore": [
     "§7Damage: §c+310",
@@ -19,8 +19,7 @@
     "§6Ability: Salvation §e§lRIGHT CLICK",
     "§7Can be casted after landing §63 §7hits.",
     "§7§7Shoot a beam, penetrating up",
-    "§7to §e5 §7foes and dealing §c2x",
-    "§c§7the damage an arrow would.",
+    "§7to §e5 §7enemies.",
     "§7The beam always crits.",
     "§8Soulflow Cost: §3§31⸎",
     "§8Cooldown: §a2s",
diff --git a/items/VOID_SWORD.json b/items/VOID_SWORD.json
new file mode 100644
index 00000000..d2891add
--- /dev/null
+++ b/items/VOID_SWORD.json
@@ -0,0 +1,27 @@
+{
+  "itemid": "minecraft:diamond_sword",
+  "displayname": "§5Void Sword",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+125\",1:\"\",2:\"§7Gain §c+20❁ Strength §7per piece\",3:\"§7of §5End Armor §7worn.\",4:\"§7\",5:\"§7Current Bonus: §a0\",6:\"\",7:\"§7§8This item can be reforged!\",8:\"§8§l* §8Co-op Soulbound §8§l*\",9:\"§5§lEPIC SWORD\"],Name:\"§5Void Sword\"},ExtraAttributes:{id:\"VOID_SWORD\"}}",
+  "damage": 0,
+  "lore": [
+    "§7Damage: §c+125",
+    "",
+    "§7Gain §c+20❁ Strength §7per piece",
+    "§7of §5End Armor §7worn.",
+    "§7",
+    "§7Current Bonus: §a0",
+    "",
+    "§7§8This item can be reforged!",
+    "§8§l* §8Co-op Soulbound §8§l*",
+    "§5§lEPIC SWORD"
+  ],
+  "internalname": "VOID_SWORD",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "2.1.0-REL",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Void_Sword",
+    "https://wiki.hypixel.net/Void_Sword"
+  ]
+}