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

(limited to 'items/MAGICAL_MILK_BUCKET.json')

diff --git a/items/MAGICAL_MILK_BUCKET.json b/items/MAGICAL_MILK_BUCKET.json
new file mode 100644
index 00000000..71f48c63
--- /dev/null
+++ b/items/MAGICAL_MILK_BUCKET.json
@@ -0,0 +1,19 @@
+{
+  "itemid": "minecraft:milk_bucket",
+  "displayname": "§f§f§fMagical Milk Bucket",
+  "nbttag": "{overrideMeta:1b,HideFlags:254,display:{Lore:[0:\"§7What did the mother cow say to\",1:\"§7the baby cow?\",2:\"\",3:\"§7It\u0027s pasture bed time.\",4:\"\",5:\"§f§lCOMMON\"],Name:\"§f§f§fMagical Milk Bucket\"},ExtraAttributes:{id:\"MAGICAL_MILK_BUCKET\"},AttributeModifiers:[]}",
+  "damage": 0,
+  "lore": [
+    "§7What did the mother cow say to",
+    "§7the baby cow?",
+    "",
+    "§7It\u0027s pasture bed time.",
+    "",
+    "§f§lCOMMON"
+  ],
+  "internalname": "MAGICAL_MILK_BUCKET",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.5-REL",
+  "infoType": ""
+}
\ No newline at end of file
-- 
cgit