aboutsummaryrefslogtreecommitdiff
path: root/items/SHARPNESS;6.json
diff options
context:
space:
mode:
authorIRONM00N <64110067+IRONM00N@users.noreply.github.com>2020-11-19 15:14:06 -0500
committerIRONM00N <64110067+IRONM00N@users.noreply.github.com>2020-11-19 15:14:06 -0500
commit18b29e6b59c337e3b8cd63715045894994ff7c43 (patch)
tree9b7163c10c182f50fef8acaa7c95b19d3ccf8fe4 /items/SHARPNESS;6.json
parent1404538f31d7bfa9b4d28b6f0f8184ff98c802a9 (diff)
downloadNotEnoughUpdates-REPO-18b29e6b59c337e3b8cd63715045894994ff7c43.tar.gz
NotEnoughUpdates-REPO-18b29e6b59c337e3b8cd63715045894994ff7c43.tar.bz2
NotEnoughUpdates-REPO-18b29e6b59c337e3b8cd63715045894994ff7c43.zip
New Parent System
Diffstat (limited to 'items/SHARPNESS;6.json')
-rw-r--r--items/SHARPNESS;6.json4
1 files changed, 0 insertions, 4 deletions
diff --git a/items/SHARPNESS;6.json b/items/SHARPNESS;6.json
index 9915ed94..dfefa4cb 100644
--- a/items/SHARPNESS;6.json
+++ b/items/SHARPNESS;6.json
@@ -1,11 +1,7 @@
{
"itemid": "minecraft:enchanted_book",
"displayname": "§9Enchanted Book",
-<<<<<<< master
"nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Sharpness VI\",1:\"§7Increases melee damage dealt by\",2:\"§7§a30%§7\",3:\"\",4:\"§7Use this on an item in an Anvil\",5:\"§7to apply it!\",6:\"\",7:\"§aObtained from the Dark Auction or\",8:\"§afrom Tomioka for 10 million\",9:\"\",10:\"§9§lRARE\"],Name:\"§9Enchanted Book\"},ExtraAttributes:{id:\"SHARPNESS;6\",enchantments:{sharpness:6}}}",
-=======
- "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Sharpness VI\",1:\"§7Increases melee damage dealt by\",2:\"§7§a30%§7\",3:\"\",4:\"§7Use this on an item in an Anvil\",5:\"§7to apply it!\",6:\"\",7:\"§aObtained from the Dark Auction.\",8:\"\",9:\"§9§lRARE\"],Name:\"§9Enchanted Book\"},ExtraAttributes:{id:\"SHARPNESS;6\",enchantments:{sharpness:6}}}",
->>>>>>> apotato321-items-1
"damage": 0,
"lore": [
"§9Sharpness VI",