diff options
| author | wushin <pasekei@gmail.com> | 2014-07-28 22:09:49 -0500 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2014-07-28 22:09:49 -0500 |
| commit | d136b3983408c5e7ff64699151d6cdfd2361380d (patch) | |
| tree | 9bc7f65eb82f8aefb91ad44ed65392d155a6ea9b | |
| parent | e39fd6c7595d9ccb1353a54e54169a255e2e64c6 (diff) | |
| parent | bdfa020a7fe909d0bcc742191fe5b5a19bb377d6 (diff) | |
| download | clientdata-d136b3983408c5e7ff64699151d6cdfd2361380d.tar.gz clientdata-d136b3983408c5e7ff64699151d6cdfd2361380d.tar.bz2 clientdata-d136b3983408c5e7ff64699151d6cdfd2361380d.tar.xz clientdata-d136b3983408c5e7ff64699151d6cdfd2361380d.zip | |
Merge remote-tracking branch 'wushin/GM-Swag'
| -rw-r--r-- | graphics/items/generic/toothbrush.png | bin | 0 -> 339 bytes | |||
| -rw-r--r-- | items/generic/_include.xml | 1 | ||||
| -rw-r--r-- | items/generic/item589_Toothbrush.xml | 10 | ||||
| -rw-r--r-- | license.txt | 9 |
4 files changed, 16 insertions, 4 deletions
diff --git a/graphics/items/generic/toothbrush.png b/graphics/items/generic/toothbrush.png Binary files differnew file mode 100644 index 00000000..94e52be2 --- /dev/null +++ b/graphics/items/generic/toothbrush.png diff --git a/items/generic/_include.xml b/items/generic/_include.xml index ce1b7927..9ae8a333 100644 --- a/items/generic/_include.xml +++ b/items/generic/_include.xml @@ -30,6 +30,7 @@ <include name="items/generic/item559_OrangeHint.xml"/> <include name="items/generic/item560_GrayHint.xml"/> <include name="items/generic/item569_RawLog.xml"/> + <include name="items/generic/item589_Toothbrush.xml"/> <include name="items/generic/item611_WhiteFur.xml"/> <include name="items/generic/item612_CaveSnakeLamp.xml"/> <include name="items/generic/item613_HardSpike.xml"/> diff --git a/items/generic/item589_Toothbrush.xml b/items/generic/item589_Toothbrush.xml new file mode 100644 index 00000000..978c3d05 --- /dev/null +++ b/items/generic/item589_Toothbrush.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<items> + <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> + <its:translateRule selector="//item/@name" translate="yes"/> + <its:translateRule selector="//item/@description" translate="yes"/> + <its:translateRule selector="//item/@effect" translate="yes"/> + <its:translateRule selector="//*" translate="no"/> + </its:rules> + <item id="589" image="generic/toothbrush.png" name="Toothbrush" description="Don't let a slime get it. Special: Good for one item out of GM Storage." type="generic" weight="1"/> +</items> diff --git a/license.txt b/license.txt index 7a993e6c..6bab2244 100644 --- a/license.txt +++ b/license.txt @@ -301,7 +301,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/bottle-ice.png (FotherJ, Nami, Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/bottle-sand.png (FotherJ, Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/broken-fourleaf-amulet.png (Alige, Fate, Enchilado) (GPLv2), (CC BY-SA 3.0) - graphics/items/generic/brokendoll.png (Enchilado, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/generic/brokendoll.png (Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/bugleg.png (????, Enchilado) (GPLv2) graphics/items/generic/casinocoins.png (????, Enchilado) (GPLv2) graphics/items/generic/cavesnakelamp.png (????, Enchilado) (GPLv2) @@ -315,7 +315,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/coinbag.png (????, Enchilado) (GPLv2) graphics/items/generic/crystal.png (Crush, Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/dark-easter-egg.png (????, Enchilado) (GPLv2) - graphics/items/generic/dark-petal.png (Enchilado, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/generic/dark-petal.png (Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/doll.png (Lizandra, Enchilado) (GPLv2) graphics/items/generic/dry-branch.png (????, Enchilado) (GPLv2) graphics/items/generic/ear-zombie.png (Goku, Enchilado) (GPLv2) @@ -332,7 +332,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/gemstone-b.png (Crush, Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/grassliner.png (Salmondine, Enchilado) (GPLv2) graphics/items/generic/grassseeds.png (Coolkid782, Enchilado) (GPLv2), (CC BY-SA 3.0) - graphics/items/generic/grub-slime.png (Enchilado, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/generic/grub-slime.png (Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/hardspike.png (Crush, Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/heart-diseased.png (FotherJ, Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/herb.png (Irukard) (GPLv2), (CC BY-SA 3.0) @@ -398,7 +398,8 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/generic/stinger.png (Wombat, Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/strange-coin.png (????, Enchilado) (GPLv2) graphics/items/generic/terraniteore.png (Kr0n05931, Enchilado) (GPLv2) - graphics/items/generic/tongue.png (Enchilado, Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/generic/tongue.png (Enchilado) (GPLv2), (CC BY-SA 3.0) + graphics/items/generic/toothbrush.png (Chay) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/transmutedflower (Korcha, V0id, Enchilado) (GPLv2), (CC BY-SA 3.0) graphics/items/generic/treasurekey.png (????, Enchilado) (GPLv2) graphics/items/generic/tuber.png (Salmondine, Enchilado) (GPLv2) |
