diff options
author | Reid <reidyaro@gmail.com> | 2012-05-28 21:31:07 +0200 |
---|---|---|
committer | Reid <reidyaro@gmail.com> | 2012-05-29 22:14:32 +0200 |
commit | f7d48ca75dc106558a96eb5619bb9c0a2eca5026 (patch) | |
tree | eed2b82b2abba212d607f4535bc4ff0a2e402a73 | |
parent | d897df359b1bda22c6ba889d9fa86395a18cac6d (diff) | |
download | clientdata-f7d48ca75dc106558a96eb5619bb9c0a2eca5026.tar.gz clientdata-f7d48ca75dc106558a96eb5619bb9c0a2eca5026.tar.bz2 clientdata-f7d48ca75dc106558a96eb5619bb9c0a2eca5026.tar.xz clientdata-f7d48ca75dc106558a96eb5619bb9c0a2eca5026.zip |
Correct merge problems.
-rw-r--r-- | items.xml | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -286,8 +286,13 @@ Multiple's colors dye is now setted up by itemcolors.xml. name="Half Coconut" description="The inside seems delicious." effect="+40 HP" - type="usable" weight="14"/> + <item id="513" + image="food/coconut.png" + name="Coconut" + description="" + type="usable" + weight="30"/> <!-- Generic --> |