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/CONNECT_FOUR.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 items/CONNECT_FOUR.json

(limited to 'items/CONNECT_FOUR.json')

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
-- 
cgit