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

(limited to 'items/SHOWCASE_BLOCK.json')

diff --git a/items/SHOWCASE_BLOCK.json b/items/SHOWCASE_BLOCK.json
new file mode 100644
index 00000000..78d2b100
--- /dev/null
+++ b/items/SHOWCASE_BLOCK.json
@@ -0,0 +1,20 @@
+{
+  "itemid": "minecraft:glass",
+  "displayname": "§aShowcase Block",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Show off an item in this fancy\",1:\"§7glass display box! §e§lRIGHT\",2:\"§e§lCLICK §7to put in or swap an\",3:\"§7item.\",4:\"\",5:\"§7§4❣ §cRequires §aSocial Skill 10\",6:\"§a§lUNCOMMON\"],Name:\"§aShowcase Block\"},ExtraAttributes:{id:\"SHOWCASE_BLOCK\"}}",
+  "damage": 0,
+  "lore": [
+    "§7Show off an item in this fancy",
+    "§7glass display box! §e§lRIGHT",
+    "§e§lCLICK §7to put in or swap an",
+    "§7item.",
+    "",
+    "§7§4❣ §cRequires §aSocial Skill 10",
+    "§a§lUNCOMMON"
+  ],
+  "internalname": "SHOWCASE_BLOCK",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.5-REL",
+  "infoType": ""
+}
\ No newline at end of file
-- 
cgit