From 0162818487df8c5b107a2228fe71684c544a0b90 Mon Sep 17 00:00:00 2001
From: jani270 <69345714+jani270@users.noreply.github.com>
Date: Tue, 8 Aug 2023 21:08:35 +0200
Subject: Fixed lore of Etherwarp Merger and added Hemobomb recipe (#963)

* Fixed lore of Etherwarp Merger and added Hemobomb recipe

* Fixed Flying Fish Speed and lore

* Added new skins

* Added new items, fixed grizzly salmon and divan drill

* Fixed conflict enchant

* Fixed lore of Terror Armor

* Fixed lore of spirit armour

* Fixed thing in lore

* Fixed Kuudra Mandible Reforge

* Added new bingo items

* Fixed Tara Tier 3 and 4 name

* Fixed Fungi Cutter

* Fixed more lores
---
 items/ETHERWARP_MERGER.json | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'items/ETHERWARP_MERGER.json')

diff --git a/items/ETHERWARP_MERGER.json b/items/ETHERWARP_MERGER.json
index 8b386fb8..55f86792 100644
--- a/items/ETHERWARP_MERGER.json
+++ b/items/ETHERWARP_MERGER.json
@@ -1,20 +1,21 @@
 {
   "itemid": "minecraft:skull",
-  "displayname": "§f§f§5Etherwarp Merger",
-  "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"209e7834-3376-36e1-84eb-da13ef083836\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyMTYxNzYxOTExMywKICAicHJvZmlsZUlkIiA6ICI0MWQzYWJjMmQ3NDk0MDBjOTA5MGQ1NDM0ZDAzODMxYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNZWdha2xvb24iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvM2U1MzE0ZjQ5MTk2OTFjY2JmODA3NzQzZGFlNDdhZTQ1YWMyZTNmZjA4Zjc5ZWVjZGQ0NTJmZTYwMmVmZjdmNiIKICAgIH0KICB9Cn0=\"}]}},display:{Lore:[0:\"§eRight-click to view recipes!\",1:\"\",2:\"§7§8Crafted by the Etherchemist\",3:\"§8and dropped by the Enderseraph.\",4:\"\",5:\"§5§lEPIC\"],Name:\"§f§f§5Etherwarp Merger\"},ExtraAttributes:{originTag:\"UNKNOWN\",id:\"ETHERWARP_MERGER\"},AttributeModifiers:[]}",
+  "displayname": "§5Etherwarp Merger",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"209e7834-3376-36e1-84eb-da13ef083836\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyMTYxNzYxOTExMywKICAicHJvZmlsZUlkIiA6ICI0MWQzYWJjMmQ3NDk0MDBjOTA5MGQ1NDM0ZDAzODMxYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNZWdha2xvb24iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvM2U1MzE0ZjQ5MTk2OTFjY2JmODA3NzQzZGFlNDdhZTQ1YWMyZTNmZjA4Zjc5ZWVjZGQ0NTJmZTYwMmVmZjdmNiIKICAgIH0KICB9Cn0\u003d\"}]}},display:{Lore:[0:\"\",1:\"§7§8Crafted by the Etherchemist\",2:\"§8and dropped by the Voidgloom\",3:\"§8Seraph.\",4:\"§eRight-click to view recipes!\",5:\"\",6:\"§5§lEPIC\"],Name:\"§5Etherwarp Merger\"},ExtraAttributes:{id:\"ETHERWARP_MERGER\"}}",
   "damage": 3,
   "lore": [
-    "§eRight-click to view recipes!",
     "",
     "§7§8Crafted by the Etherchemist",
-    "§8and dropped by the Enderseraph.",
+    "§8and dropped by the Voidgloom",
+    "§8Seraph.",
+    "§eRight-click to view recipes!",
     "",
     "§5§lEPIC"
   ],
   "internalname": "ETHERWARP_MERGER",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.1.0-REL",
+  "modver": "2.1.1-PRE",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Etherwarp_Merger",
-- 
cgit