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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 43 insertions, 3 deletions

diff --git a/world/map/news.html b/world/map/news.html
index e017ff80..d187cf6e 100644
--- a/world/map/news.html
+++ b/world/map/news.html
@@ -1,6 +1,34 @@
 <!-- Generated by tools/news.py for index.php -->
 <div>
 <p/>
+<font color="#0000ff">2013-06-29</font>
+<p/>
+This release brings a few new additions to the game:
+<p/>
+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!
+<p/>
+Malivox took the occasion to stop camping in the
+desert and moved into a small house south of
+Tulimshar.
+<p/>
+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.
+<p/>
+With a ferry now serving Nivalis, Dyrin will send you
+somehwere else in Kaizei instead, away from Nivalis.
+<p/>
+As usual there are also a lot of smaller fixes and
+changes. Thanks to everyone who reported issues
+and helped fix these things!
+<p/>
+-<font color="#009000">TMW Development Team</font>
+</div>
+<div>
+<p/>
 <font color="#0000ff">2013-06-07</font>
 <p/>
 This weekend we're temporarily doubling both the
@@ -25,6 +53,18 @@ you will no longer be kicked with an invalid packet error.
 </div>
 <div>
 <p/>
+<font color="#0000ff">2013-06-05</font>
+<p/>
+We had a server crash, and had to restore everything from offline backup.
+<p/>
+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.
+<p/>
+We're going to set up hourly offsite backups of game, forum, and wiki data so that future outages are less painful.
+<p/>
+-<font color="#009000">Frost</font>
+</div>
+<div>
+<p/>
 <font color="#0000ff">2013-04-28</font>
 <p/>
 We're having a bugfix release today.
@@ -91,7 +131,7 @@ This means there was some downtime, starting at 16:00 UTC.
 Most work was done in 1.5 hours, with a brief shutdown later.
 DNS settings may take a while to propogate.
 <p/>
-For more information, see <a href="http://forums.themanaworld.org/viewtopic.php?f=1&t=17126">http://forums.themanaworld.org/viewtopic.php?f=1&t=17126</a>
+For more information, see <a href="http://forums.themanaworld.org/viewtopic.php?f=1&amp;t=17126">http://forums.themanaworld.org/viewtopic.php?f=1&amp;t=17126</a>
 <p/>
 -<font color="#009000">the TMWC</font>
 </div>
@@ -146,7 +186,7 @@ Now, the links:
 <p/>
 Server coding: <a href="irc://chat.freenode.net#tmwa">irc://chat.freenode.net#tmwa</a>
 <p/>
-Everything else: <a href="irc://irc.themanaworld.org#tmw-dev">irc://irc.themanaworld.org#tmw-dev</a> or <a href="irc://chat.freenode.net#themanaworld-dev">irc://chat.freenode.net#themanaworld-dev</a>
+Everything else: <a href="irc://chat.freenode.net#themanaworld-dev">irc://chat.freenode.net#themanaworld-dev</a>
 <p/>
 Forums: <a href="http://forums.themanaworld.org/">http://forums.themanaworld.org/</a>
 <p/>
@@ -186,7 +226,7 @@ support, depending on exactly how old it is:
 Of course, if a particular client release is
 buggy, we may not be able to support it at all.
 <p/>
-For more details, see <a href="http://forums.themanaworld.org/viewtopic.php?f=4&t=16867">http://forums.themanaworld.org/viewtopic.php?f=4&t=16867</a>.
+For more details, see <a href="http://forums.themanaworld.org/viewtopic.php?f=4&amp;t=16867">http://forums.themanaworld.org/viewtopic.php?f=4&amp;t=16867</a>.
 <p/>
 ManaPlus is available at <a href="http://manaplus.evolonline.org/">http://manaplus.evolonline.org/</a>
 <p/>