diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-06-17 13:29:58 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-06-17 13:29:58 +0200 |
| commit | db53017bd8172d7679b2ce3e7cc6c67927031f2c (patch) | |
| tree | 6777db7b72f0329937f17153ddfa3567695d45ea /data | |
| parent | c0fa45992b123f08e91e86dac11aca765ea73cd2 (diff) | |
| parent | 246072120a1edcba61a350bad56049f110457489 (diff) | |
| download | serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.gz serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.bz2 serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.xz serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.zip | |
Merge gitorious.org:~jenalya/tmw-eathena-data/wip-serverdata
Conflicts:
db/const.txt
npc/022-1_Tulimshar/_import.txt
npc/_import.txt
Diffstat (limited to 'data')
| -rw-r--r-- | data/004-1.wlk | bin | 15565 -> 15565 bytes | |||
| -rw-r--r-- | data/022-1.wlk | bin | 19354 -> 19354 bytes | |||
| -rw-r--r-- | data/033-1.wlk | bin | 17668 -> 17668 bytes | |||
| -rw-r--r-- | data/034-1.wlk | bin | 22788 -> 22788 bytes | |||
| -rw-r--r-- | data/041-1.wlk | bin | 0 -> 15629 bytes | |||
| -rw-r--r-- | data/042-1.wlk | bin | 0 -> 14804 bytes | |||
| -rw-r--r-- | data/042-2.wlk | bin | 0 -> 7704 bytes | |||
| -rw-r--r-- | data/resnametable.txt | 3 |
8 files changed, 3 insertions, 0 deletions
diff --git a/data/004-1.wlk b/data/004-1.wlk Binary files differindex 27423757..435ee4a7 100644 --- a/data/004-1.wlk +++ b/data/004-1.wlk diff --git a/data/022-1.wlk b/data/022-1.wlk Binary files differindex 18f68fed..01da8bf6 100644 --- a/data/022-1.wlk +++ b/data/022-1.wlk diff --git a/data/033-1.wlk b/data/033-1.wlk Binary files differindex 87e0e43e..6d1630bf 100644 --- a/data/033-1.wlk +++ b/data/033-1.wlk diff --git a/data/034-1.wlk b/data/034-1.wlk Binary files differindex 49dc84c4..eaaa8b5e 100644 --- a/data/034-1.wlk +++ b/data/034-1.wlk diff --git a/data/041-1.wlk b/data/041-1.wlk Binary files differnew file mode 100644 index 00000000..df0ec560 --- /dev/null +++ b/data/041-1.wlk diff --git a/data/042-1.wlk b/data/042-1.wlk Binary files differnew file mode 100644 index 00000000..2a289545 --- /dev/null +++ b/data/042-1.wlk diff --git a/data/042-2.wlk b/data/042-2.wlk Binary files differnew file mode 100644 index 00000000..ca2d33e8 --- /dev/null +++ b/data/042-2.wlk diff --git a/data/resnametable.txt b/data/resnametable.txt index 0db3e9a5..fa526488 100644 --- a/data/resnametable.txt +++ b/data/resnametable.txt @@ -78,4 +78,7 @@ 032-3.gat#032-3.wlk# 033-1.gat#033-1.wlk# 034-1.gat#034-1.wlk# +041-1.gat#041-1.wlk# +042-1.gat#042-1.wlk# +042-2.gat#042-2.wlk# botcheck.gat#botcheck.wlk# |