diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-04-17 22:18:40 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-04-17 22:18:40 +0000 |
| commit | f36868beb514e1e1dd45f1509f20f7e541354792 (patch) | |
| tree | bdb805255d261b79b14bc2b567f7c9a5a2343fa8 | |
| parent | dec8b89ad4a7373563ad4342b7dea9cfe1267f2f (diff) | |
| parent | b1ecfd6a3cec72aa9fbab7e8af52e144a5290559 (diff) | |
| download | clientdata-f36868beb514e1e1dd45f1509f20f7e541354792.tar.gz clientdata-f36868beb514e1e1dd45f1509f20f7e541354792.tar.bz2 clientdata-f36868beb514e1e1dd45f1509f20f7e541354792.tar.xz clientdata-f36868beb514e1e1dd45f1509f20f7e541354792.zip | |
Merge branch 'emo_id_change' into 'master'
Changed ID to avoid later conflict
See merge request legacy/clientdata!523
| -rw-r--r-- | monsters/monster1174_Emo.xml (renamed from monsters/monster1172_Emo.xml) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/monsters/monster1172_Emo.xml b/monsters/monster1174_Emo.xml index a282a1eb..471d81d9 100644 --- a/monsters/monster1172_Emo.xml +++ b/monsters/monster1174_Emo.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <monsters offset="0"> - <monster id="1172" name="Emo"> + <monster id="1174" name="Emo"> <sprite gender="male">model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite> <sprite>hairstyles/hairstyle27.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite> <sprite>equipment/chest/leather.xml|W:#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite> |