From b6fd4b6bfe35a3268fd03b267bf626026920b8d7 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Fri, 13 Nov 2020 18:41:01 -0500
Subject: Manual Merge bc Conflicts

---
 items/ISLAND_NPC.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 items/ISLAND_NPC.json

(limited to 'items/ISLAND_NPC.json')

diff --git a/items/ISLAND_NPC.json b/items/ISLAND_NPC.json
new file mode 100644
index 00000000..5a225a91
--- /dev/null
+++ b/items/ISLAND_NPC.json
@@ -0,0 +1,20 @@
+{
+  "itemid": "minecraft:spawn_egg",
+  "displayname": "§9Island NPC",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Spawn island NPCs for your\",1:\"§7private world! Right-Click one\",2:\"§7to edit its settings and add\",3:\"§7dialogue.\",4:\"\",5:\"§7§4❣ §cRequires §aSocial Skill 5\",6:\"§9§lRARE\"],Name:\"§9Island NPC\"},ExtraAttributes:{id:\"ISLAND_NPC\"}}",
+  "damage": 0,
+  "lore": [
+    "§7Spawn island NPCs for your",
+    "§7private world! Right-Click one",
+    "§7to edit its settings and add",
+    "§7dialogue.",
+    "",
+    "§7§4❣ §cRequires §aSocial Skill 5",
+    "§9§lRARE"
+  ],
+  "internalname": "ISLAND_NPC",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.5-REL",
+  "infoType": ""
+}
\ No newline at end of file
-- 
cgit