summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/changelog.txt1
-rw-r--r--src/defaultsettings.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/changelog.txt b/doc/changelog.txt
index a7ab817b7..4c77fe1f8 100644
--- 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 c1104eff0..91524a6de 100644
--- 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");