diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/data/resnametable.txt | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/data/resnametable.txt')
| -rw-r--r-- | world/map/data/resnametable.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt index 07f1f6a2..552a135b 100644 --- a/world/map/data/resnametable.txt +++ b/world/map/data/resnametable.txt @@ -2,8 +2,10 @@ 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# +002-5.gat#002-5.wlk# 003-1.gat#003-1.wlk# 003-2.gat#003-2.wlk# 004-1.gat#004-1.wlk# @@ -54,6 +56,7 @@ 020-3.gat#020-3.wlk# 021-1.gat#021-1.wlk# 021-2.gat#021-2.wlk# +021-3.gat#021-3.wlk# 022-1.gat#022-1.wlk# 024-1.gat#024-1.wlk# 024-2.gat#024-2.wlk# @@ -85,6 +88,8 @@ 041-1.gat#041-1.wlk# 042-1.gat#042-1.wlk# 042-2.gat#042-2.wlk# +043-1.gat#043-1.wlk# +043-3.gat#043-3.wlk# 044-1.gat#044-1.wlk# 044-3.gat#044-3.wlk# 045-1.gat#045-1.wlk# |