diff options
| author | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2020-11-17 18:04:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 18:04:10 -0500 |
| commit | d810795aef3e0fde0ce608d33a26ab95fd799ccb (patch) | |
| tree | 9d8c4bb2c5f18b8f25603494bfb288f91ab97675 /items/SHARPNESS;6.json | |
| parent | 2b0bb856ac66ec256d4827fef40250acc6a7c883 (diff) | |
| parent | ec26d3a0f8a2a37a2798240f4ace96cde02852fb (diff) | |
| download | NotEnoughUpdates-REPO-d810795aef3e0fde0ce608d33a26ab95fd799ccb.tar.gz NotEnoughUpdates-REPO-d810795aef3e0fde0ce608d33a26ab95fd799ccb.tar.bz2 NotEnoughUpdates-REPO-d810795aef3e0fde0ce608d33a26ab95fd799ccb.zip | |
Merge pull request #27 from apotato321/apotato321-f7before
Apotato321 f7before
Diffstat (limited to 'items/SHARPNESS;6.json')
| -rw-r--r-- | items/SHARPNESS;6.json | 4 |
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", |