diff options
| author | apotato321 <ryrylin5@gmail.com> | 2020-11-17 14:39:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 14:39:17 -0800 |
| commit | 1950e48770ace67f261a9ac9cdbb6808e9464c68 (patch) | |
| tree | 758b89bdab78b93754e9bcffce0dcf198fa25771 /items/SHARPNESS;6.json | |
| parent | 549357a3a201a2a24bfab4406346ab2289248929 (diff) | |
| parent | e813da9dbbbc3c63d412155d47073c96c765311e (diff) | |
| download | NotEnoughUpdates-REPO-1950e48770ace67f261a9ac9cdbb6808e9464c68.tar.gz NotEnoughUpdates-REPO-1950e48770ace67f261a9ac9cdbb6808e9464c68.tar.bz2 NotEnoughUpdates-REPO-1950e48770ace67f261a9ac9cdbb6808e9464c68.zip | |
Merge branch 'apotato321-items-1' into master
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 3c674d3c..cecaa321 100644 --- a/items/SHARPNESS;6.json +++ b/items/SHARPNESS;6.json @@ -2,7 +2,11 @@ "itemid": "minecraft:enchanted_book", "parent": "SHARPNESS;4", "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", |