You missed some stuff catboy :)

This commit is contained in:
nossr50 2019-09-30 14:18:59 -07:00
parent b763a56d75
commit f13364eb04

View File

@ -55,11 +55,8 @@ Anvil.SingleItemStack=[[RED]]You cannot salvage or repair item stacks that have
#DO NOT USE COLOR CODES IN THE JSON KEYS #DO NOT USE COLOR CODES IN THE JSON KEYS
#COLORS ARE DEFINED IN advanced.yml IF YOU WISH TO CHANGE THEM #COLORS ARE DEFINED IN advanced.yml IF YOU WISH TO CHANGE THEM
<<<<<<< HEAD
=======
mcMMO.Template.Prefix=[[GOLD]]([[GREEN]]mcMMO[[GOLD]]) [[GRAY]]{0} mcMMO.Template.Prefix=[[GOLD]]([[GREEN]]mcMMO[[GOLD]]) [[GRAY]]{0}
>>>>>>> 308e3a4b1f46e9e3de28d6d540dd055a540ed4d5
# BEGIN STYLING # BEGIN STYLING
Ability.Generic.Refresh=[[GREEN]]**ABILITIES REFRESHED!** Ability.Generic.Refresh=[[GREEN]]**ABILITIES REFRESHED!**
Ability.Generic.Template.Lock=[[GRAY]]{0} Ability.Generic.Template.Lock=[[GRAY]]{0}