Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

17 files changed, 5 insertions, 0 deletions

diff --git a/world/map/data/002-1.wlk b/world/map/data/002-1.wlk
index 3ab797d7..bb3dcef9 100644
--- a/world/map/data/002-1.wlk
+++ b/world/map/data/002-1.wlk
diff --git a/world/map/data/002-2.wlk b/world/map/data/002-2.wlk
new file mode 100644
index 00000000..1de69a2b
--- /dev/null
+++ b/world/map/data/002-2.wlk
diff --git a/world/map/data/002-3.wlk b/world/map/data/002-3.wlk
index e2d05c89..35421c22 100644
--- a/world/map/data/002-3.wlk
+++ b/world/map/data/002-3.wlk
diff --git a/world/map/data/002-4.wlk b/world/map/data/002-4.wlk
index b6abb2c1..40b37e67 100644
--- a/world/map/data/002-4.wlk
+++ b/world/map/data/002-4.wlk
diff --git a/world/map/data/002-5.wlk b/world/map/data/002-5.wlk
new file mode 100644
index 00000000..738a6412
--- /dev/null
+++ b/world/map/data/002-5.wlk
diff --git a/world/map/data/003-1.wlk b/world/map/data/003-1.wlk
index 34168aed..fceedb2f 100644
--- a/world/map/data/003-1.wlk
+++ b/world/map/data/003-1.wlk
diff --git a/world/map/data/004-1.wlk b/world/map/data/004-1.wlk
index bacd8355..b48d311a 100644
--- a/world/map/data/004-1.wlk
+++ b/world/map/data/004-1.wlk
diff --git a/world/map/data/018-1.wlk b/world/map/data/018-1.wlk
index 05b6b198..1da6b139 100644
--- a/world/map/data/018-1.wlk
+++ b/world/map/data/018-1.wlk
diff --git a/world/map/data/021-1.wlk b/world/map/data/021-1.wlk
index 2e18e65f..19de30d3 100644
--- a/world/map/data/021-1.wlk
+++ b/world/map/data/021-1.wlk
diff --git a/world/map/data/021-3.wlk b/world/map/data/021-3.wlk
new file mode 100644
index 00000000..663cfbd4
--- /dev/null
+++ b/world/map/data/021-3.wlk
diff --git a/world/map/data/031-1.wlk b/world/map/data/031-1.wlk
index 8b5b0d7f..9b33c24d 100644
--- a/world/map/data/031-1.wlk
+++ b/world/map/data/031-1.wlk
diff --git a/world/map/data/043-1.wlk b/world/map/data/043-1.wlk
new file mode 100644
index 00000000..4b2fdd8b
--- /dev/null
+++ b/world/map/data/043-1.wlk
diff --git a/world/map/data/043-3.wlk b/world/map/data/043-3.wlk
new file mode 100644
index 00000000..1a17b2f9
--- /dev/null
+++ b/world/map/data/043-3.wlk
diff --git a/world/map/data/055-1.wlk b/world/map/data/055-1.wlk
index ea9e9293..0f0d3501 100644
--- a/world/map/data/055-1.wlk
+++ b/world/map/data/055-1.wlk
diff --git a/world/map/data/055-3.wlk b/world/map/data/055-3.wlk
index 6c8c1fa0..00bfd16d 100644
--- a/world/map/data/055-3.wlk
+++ b/world/map/data/055-3.wlk
diff --git a/world/map/data/057-1.wlk b/world/map/data/057-1.wlk
index b3c89549..0e72809f 100644
--- a/world/map/data/057-1.wlk
+++ b/world/map/data/057-1.wlk
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#