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/npc/_import.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/npc/_import.txt')
| -rw-r--r-- | world/map/npc/_import.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt index 05d7791e..9620fa64 100644 --- a/world/map/npc/_import.txt +++ b/world/map/npc/_import.txt @@ -4,8 +4,10 @@ import: npc/001-1/_import.txt import: npc/001-2/_import.txt import: npc/001-3/_import.txt import: npc/002-1/_import.txt +import: npc/002-2/_import.txt import: npc/002-3/_import.txt import: npc/002-4/_import.txt +import: npc/002-5/_import.txt import: npc/003-1/_import.txt import: npc/003-2/_import.txt import: npc/004-1/_import.txt @@ -56,6 +58,7 @@ import: npc/020-2/_import.txt import: npc/020-3/_import.txt import: npc/021-1/_import.txt import: npc/021-2/_import.txt +import: npc/021-3/_import.txt import: npc/022-1/_import.txt import: npc/024-1/_import.txt import: npc/024-2/_import.txt @@ -87,6 +90,8 @@ import: npc/034-2/_import.txt import: npc/041-1/_import.txt import: npc/042-1/_import.txt import: npc/042-2/_import.txt +import: npc/043-1/_import.txt +import: npc/043-3/_import.txt import: npc/044-1/_import.txt import: npc/044-3/_import.txt import: npc/045-1/_import.txt |