diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-12-24 21:24:57 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-12-24 21:24:57 -0700 |
| commit | 562a0fdbaa002a49f4763bd07442e2ed32726ab9 (patch) | |
| tree | 0e997cd03f8a03e8bf839890318efd15a0242dc2 /npc/_import.txt | |
| parent | 63006fa540fe6fbddd132be33b39fd28f02a2e0f (diff) | |
| parent | e896b785935c661319ade424f473f4442e1878eb (diff) | |
| download | serverdata-562a0fdbaa002a49f4763bd07442e2ed32726ab9.tar.gz serverdata-562a0fdbaa002a49f4763bd07442e2ed32726ab9.tar.bz2 serverdata-562a0fdbaa002a49f4763bd07442e2ed32726ab9.tar.xz serverdata-562a0fdbaa002a49f4763bd07442e2ed32726ab9.zip | |
Merge branch 'master' into magic
Diffstat (limited to 'npc/_import.txt')
| -rw-r--r-- | npc/_import.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/npc/_import.txt b/npc/_import.txt index df218035..74464305 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -6,6 +6,7 @@ import: npc/002-3_Desert_mines/_import.txt import: npc/002-4_Desert_mines/_import.txt import: npc/003-1_Beach/_import.txt import: npc/004-1_Beach/_import.txt +import: npc/004-2_Beach_House/_import.txt import: npc/005-1_Snake_desert/_import.txt import: npc/005-3_Snake_pit/_import.txt import: npc/006-1_Desert_mountains/_import.txt @@ -34,7 +35,10 @@ import: npc/018-1_Woodland_mining_camp/_import.txt import: npc/018-2_Woodland_minning_camp/_import.txt import: npc/018-3_Cave/_import.txt import: npc/019-1_Snow_field/_import.txt -import: npc/020-1/_import.txt -import: npc/020-2/_import.txt +import: npc/020-1_Nivalis/_import.txt +import: npc/020-2_Nivalis/_import.txt import: npc/020-3_Ice_cave/_import.txt import: npc/020-4_Ice_cave/_import.txt +import: npc/021-1_Tulimshar/_import.txt +import: npc/021-2_Tulimshar/_import.txt +import: npc/022-1_Beach_Cliffs/_import.txt |