diff options
| author | Moulberry <james.jenour@student.scotch.wa.edu.au> | 2020-11-18 23:08:23 +1100 |
|---|---|---|
| committer | Moulberry <james.jenour@student.scotch.wa.edu.au> | 2020-11-18 23:08:23 +1100 |
| commit | 83f603644e95884bd3b1f764192c4545fe45ee44 (patch) | |
| tree | 572d1453c016c0dd208ecc919ad0ab572f7d2aa1 /items | |
| parent | 22f8c106e17b197045aa16e6d492d0d047c0baa7 (diff) | |
| download | NotEnoughUpdates-REPO-83f603644e95884bd3b1f764192c4545fe45ee44.tar.gz NotEnoughUpdates-REPO-83f603644e95884bd3b1f764192c4545fe45ee44.tar.bz2 NotEnoughUpdates-REPO-83f603644e95884bd3b1f764192c4545fe45ee44.zip | |
update parents
Diffstat (limited to 'items')
| -rw-r--r-- | items/PROTECTION;6.json | 4 | ||||
| -rw-r--r-- | items/SHARPNESS;6.json | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/items/PROTECTION;6.json b/items/PROTECTION;6.json index 9bbb328a..f0f2f564 100644 --- a/items/PROTECTION;6.json +++ b/items/PROTECTION;6.json @@ -1,11 +1,7 @@ { "itemid": "minecraft:enchanted_book", "displayname": "§9Enchanted Book", - - "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Protection VI\",1:\"§7Grants §a+18 §a❈ Defense§7.\",2:\"\",3:\"§7Use this on an item in an Anvil\",4:\"§7to apply it!\",5:\"\",6:\"§aObtained from the Dark Auction or\",7:\"§afrom Tomioka for 4 million\",8:\"\",9:\"§9§lRARE\"],Name:\"§9Enchanted Book\"},ExtraAttributes:{id:\"PROTECTION;6\",enchantments:{protection:6}}}", -======= "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Protection VI\",1:\"§7Grants §a+18 §a❈ Defense§7.\",2:\"\",3:\"§7Use this on an item in an Anvil\",4:\"§7to apply it!\",5:\"\",6:\"§aObtained from the Dark Auction.\",7:\"\",8:\"§9§lRARE\"],Name:\"§9Enchanted Book\"},ExtraAttributes:{id:\"PROTECTION;6\",enchantments:{protection:6}}}", - "damage": 0, "lore": [ "§9Protection VI", 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", |