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

(limited to 'items/INFINIDIRT_WAND.json')

diff --git a/items/INFINIDIRT_WAND.json b/items/INFINIDIRT_WAND.json
new file mode 100644
index 00000000..e7adcc16
--- /dev/null
+++ b/items/INFINIDIRT_WAND.json
@@ -0,0 +1,24 @@
+{
+  "itemid": "minecraft:stick",
+  "displayname": "§aInfiniDirt��� Wand",
+  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§6Item Ability: Place Dirt §e§lRIGHT CLICK\",1:\"§7Place a dirt block.\",2:\"§7§7Costs §61 coins§7.\",3:\"§7\",4:\"§7Can be used within the Builders\",5:\"§7Wand!\",6:\"\",7:\"§a§lUNCOMMON\"],Name:\"§aInfiniDirt��� Wand\"},ExtraAttributes:{originTag:\"SHOP_PURCHASE\",id:\"INFINIDIRT_WAND\",uuid:\"66a99177-19cd-4f96-b7db-f60290bd486c\",timestamp:\"11/6/20 6:36 PM\"}}",
+  "damage": 0,
+  "lore": [
+    "§6Item Ability: Place Dirt §e§lRIGHT CLICK",
+    "§7Place a dirt block.",
+    "§7§7Costs §61 coins§7.",
+    "§7",
+    "§7Can be used within the Builders",
+    "§7Wand!",
+    "",
+    "§a§lUNCOMMON"
+  ],
+  "internalname": "INFINIDIRT_WAND",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.5-REL",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/InfiniDirt™_Wand"
+  ]
+}
\ No newline at end of file
-- 
cgit