aboutsummaryrefslogtreecommitdiff
path: root/items/SHARPNESS;6.json
diff options
context:
space:
mode:
Diffstat (limited to 'items/SHARPNESS;6.json')
-rw-r--r--items/SHARPNESS;6.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/items/SHARPNESS;6.json b/items/SHARPNESS;6.json
index dfefa4cb..9915ed94 100644
--- a/items/SHARPNESS;6.json
+++ b/items/SHARPNESS;6.json
@@ -1,7 +1,11 @@
{
"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",