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

Conflicts:
	world/map/db/mob_db.txt

4 files changed, 35 insertions, 1 deletions

diff --git a/world/map/news.d/13-lpc.txt b/world/map/news.d/13-lpc.txt
index 1ab530ca..c68a892d 100644
--- a/world/map/news.d/13-lpc.txt
+++ b/world/map/news.d/13-lpc.txt
@@ -32,7 +32,7 @@ Now, the links:
 
 Server coding: {link:irc://chat.freenode.net#tmwa}
 
-Everything else: {link:irc://irc.themanaworld.org#tmw-dev} or {link:irc://chat.freenode.net#themanaworld-dev}
+Everything else: {link:irc://chat.freenode.net#themanaworld-dev}
 
 Forums: {link:http://forums.themanaworld.org/}
 
diff --git a/world/map/news.d/19-rollbackup.txt b/world/map/news.d/19-rollbackup.txt
new file mode 100644
index 00000000..16e77ba5
--- /dev/null
+++ b/world/map/news.d/19-rollbackup.txt
@@ -0,0 +1,9 @@
+{date:2013-06-05}
+
+We had a server crash, and had to restore everything from offline backup.
+
+34 hours were lost, from about 17:30 (UTC) on 4 June to about 03:30 on 6 June. This affects the game, the forums, and the wiki.
+
+We're going to set up hourly offsite backups of game, forum, and wiki data so that future outages are less painful.
+
+{author:Frost}
diff --git a/world/map/news.d/19-double-exp-drop.txt b/world/map/news.d/20-double-exp-drop.txt
index 85140414..85140414 100644
--- a/world/map/news.d/19-double-exp-drop.txt
+++ b/world/map/news.d/20-double-exp-drop.txt
diff --git a/world/map/news.d/21-tulimshar-caves.txt b/world/map/news.d/21-tulimshar-caves.txt
new file mode 100644
index 00000000..382c3cbe
--- /dev/null
+++ b/world/map/news.d/21-tulimshar-caves.txt
@@ -0,0 +1,25 @@
+{date:2013-06-29}
+
+This release brings a few new additions to the game:
+
+Wushin overhauled the desert caves with an awesome
+new cave tileset. Also the sewers below Tulimshar are
+now accessible. Make sure to check them out!
+
+Malivox took the occasion to stop camping in the
+desert and moved into a small house south of
+Tulimshar.
+
+Frozenbeard has expanded his ferry service in
+Nivalis. You can now go between Nivalis and
+the other major docks both ways. Proper docks for
+Nivalis are being worked on.
+
+With a ferry now serving Nivalis, Dyrin will send you
+somehwere else in Kaizei instead, away from Nivalis.
+
+As usual there are also a lot of smaller fixes and
+changes. Thanks to everyone who reported issues
+and helped fix these things!
+
+{author:TMW Development Team}