diff options
author | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2020-11-13 18:41:01 -0500 |
---|---|---|
committer | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2020-11-13 18:41:01 -0500 |
commit | b6fd4b6bfe35a3268fd03b267bf626026920b8d7 (patch) | |
tree | 05e6091e4385fba6926bd24d90974c068a4d3979 /items/HOUND;3.json | |
parent | abe9292c1f44cca735dd92474558a23348de203c (diff) | |
download | NotEnoughUpdates-REPO-b6fd4b6bfe35a3268fd03b267bf626026920b8d7.tar.gz NotEnoughUpdates-REPO-b6fd4b6bfe35a3268fd03b267bf626026920b8d7.tar.bz2 NotEnoughUpdates-REPO-b6fd4b6bfe35a3268fd03b267bf626026920b8d7.zip |
Manual Merge bc Conflicts
Diffstat (limited to 'items/HOUND;3.json')
-rw-r--r-- | items/HOUND;3.json | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/items/HOUND;3.json b/items/HOUND;3.json index f7d5c7cf..88deb557 100644 --- a/items/HOUND;3.json +++ b/items/HOUND;3.json @@ -1,12 +1,13 @@ { "itemid": "minecraft:skull", "displayname": "§f§f§7[Lvl {LVL}] §5Hound", - "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"802a167c-cbcd-3a1f-becd-5b1a25a4cf15\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjdjOGJlZjZiZWI3N2UyOWFmODYyN2VjZGMzOGQ4NmFhMmZlYTdjY2QxNjNkYzczYzAwZjlmMjU4ZjlhMTQ1NyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Attack Speed: §a{ATTACK_SPEED}\",3:\"§7Strength: §a{STRENGTH}\",4:\"\",5:\"§6Scavenger\",6:\"§7§7Gain +§a{0} §7coins per\",7:\"§7monster kill\",8:\"\",9:\"§6Finder\",10:\"§7§7Increases the chance for\",11:\"§7monsters to drop their armor by\",12:\"§7§a{1}%\",13:\"\",14:\"§7§eRight-click to add this pet to\",15:\"§eyour pet menu!\",16:\"\",17:\"§5§lEPIC\"],Name:\"§f§f§7[Lvl {LVL}] §5Hound\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"HOUND\\\",\\\"active\\\":false,\\\"exp\\\":341596.47280000115,\\\"tier\\\":\\\"EPIC\\\",\\\"hideInfo\\\":false,\\\"heldItem\\\":\\\"PET_ITEM_COMBAT_SKILL_BOOST_COMMON\\\",\\\"candyUsed\\\":10}\",originTag:\"UNKNOWN\",id:\"HOUND;3\",uuid:\"0ec63d68-87f8-4210-aaed-47d29cbd2f9d\",timestamp:\"5/29/20 1:24 AM\"},AttributeModifiers:[]}", + "nbttag": "{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:\"802a167c-cbcd-3a1f-becd-5b1a25a4cf15\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjdjOGJlZjZiZWI3N2UyOWFmODYyN2VjZGMzOGQ4NmFhMmZlYTdjY2QxNjNkYzczYzAwZjlmMjU4ZjlhMTQ1NyJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Attack Speed: §a{BONUS_ATTACK_SPEED}\",3:\"§7Ferocity: §a{FEROCITY}\",4:\"§7Strength: §a{STRENGTH}\",5:\"\",6:\"§6Scavenger\",7:\"§7§7Gain +§a{0} §7coins per\",8:\"§7monster kill\",9:\"\",10:\"§6Finder\",11:\"§7§7Increases the chance for\",12:\"§7monsters to drop their armor by\",13:\"§7§a{1}%\",14:\"\",15:\"§7§eRight-click to add this pet to\",16:\"§eyour pet menu!\",17:\"\",18:\"§5§lEPIC\"],Name:\"§f§f§7[Lvl {LVL}] §5Hound\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"HOUND\\\",\\\"active\\\":false,\\\"exp\\\":341596.47280000115,\\\"tier\\\":\\\"EPIC\\\",\\\"hideInfo\\\":false,\\\"heldItem\\\":\\\"PET_ITEM_COMBAT_SKILL_BOOST_COMMON\\\",\\\"candyUsed\\\":10}\",originTag:\"UNKNOWN\",id:\"HOUND;3\",uuid:\"0ec63d68-87f8-4210-aaed-47d29cbd2f9d\",timestamp:\"5/29/20 1:24 AM\"},AttributeModifiers:[]}", "damage": 3, "lore": [ "§8Combat Pet", "", - "§7Attack Speed: §a{ATTACK_SPEED}", + "§7Attack Speed: §a{BONUS_ATTACK_SPEED}", + "§7Ferocity: §a{FEROCITY}", "§7Strength: §a{STRENGTH}", "", "§6Scavenger", @@ -25,7 +26,7 @@ ], "internalname": "HOUND;3", "clickcommand": "", - "modver": "REL-1.0.0", + "modver": "1.5-REL", "infoType": "WIKI_URL", "info": [ "https://hypixel-skyblock.fandom.com/wiki/Hound_Pet" |