diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:38:38 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:38:38 +0200 |
commit | 7f4410f9d5dce2884368a4b1d01139abd2e65fd5 (patch) | |
tree | e4f6cd0f6ed40b1852fa5ce28a5d78be982b0a73 /world/map/data/resnametable.txt | |
parent | 8ac35610a416d3937ccf4b3b74a61622382e8162 (diff) | |
parent | fa2ffc29c1ef2c33ff0a9c1baf7026a4d9ffe0b6 (diff) | |
download | serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.gz serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.bz2 serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.xz serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.zip |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/data/resnametable.txt')
-rw-r--r-- | world/map/data/resnametable.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt index a865b707..07f1f6a2 100644 --- a/world/map/data/resnametable.txt +++ b/world/map/data/resnametable.txt @@ -2,7 +2,6 @@ 001-2.gat#001-2.wlk# 001-3.gat#001-3.wlk# 002-1.gat#002-1.wlk# -002-2.gat#002-2.wlk# 002-3.gat#002-3.wlk# 002-4.gat#002-4.wlk# 003-1.gat#003-1.wlk# @@ -55,9 +54,7 @@ 020-3.gat#020-3.wlk# 021-1.gat#021-1.wlk# 021-2.gat#021-2.wlk# -021-8.gat#021-8.wlk# 022-1.gat#022-1.wlk# -023-1.gat#023-1.wlk# 024-1.gat#024-1.wlk# 024-2.gat#024-2.wlk# 024-3.gat#024-3.wlk# @@ -84,6 +81,7 @@ 032-3.gat#032-3.wlk# 033-1.gat#033-1.wlk# 034-1.gat#034-1.wlk# +034-2.gat#034-2.wlk# 041-1.gat#041-1.wlk# 042-1.gat#042-1.wlk# 042-2.gat#042-2.wlk# |