changelog update and disable motd by default

diff --git a/doc/changelog.txt b/doc/changelog.txt
index a7ab817b736a6c175cf5fcce1ba3240c03e986d7..4c77fe1f84bb65b7af64d29db48a122153fecb54 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -16,6 +16,7 @@ For minor stuff, refer to the commit log of the repository.
 - Hotbar is a bit smaller
 - Health is now enabled by default; You can now eat cooked rats to heal yourself.
 - Finally added sword textures, altough sword is still of no use
+- Creative mode now preserves normal mode inventory
 
 2011-07-04:
 - Many small fixes

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index c1104eff065b348699785eca547a3db279f43c18..91524a6de55be29611a8f73ab0bf975d04962319 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -77,7 +77,7 @@ void set_default_settings()
        g_settings.setDefault("screenshot_path", ".");
 
        // Server stuff
-       g_settings.setDefault("motd", "<Message of the day (motd) not set>");
+       g_settings.setDefault("motd", "");
        g_settings.setDefault("enable_experimental", "false");
        g_settings.setDefault("creative_mode", "false");
        g_settings.setDefault("enable_damage", "true");