From: Auke Kok <sofar@foo-projects.org>
Date: Fri, 16 Dec 2016 04:55:41 +0000 (-0800)
Subject: Mapgen: Make mgv7 the default in UI
X-Git-Tag: 0.4.15~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=78bf7c46e5fe8845e9a9f65b98db32b0ff398ad3;p=oweals%2Fminetest.git

Mapgen: Make mgv7 the default in UI

The actual menu default comes from defaultsettings.cpp.
---

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index ea0ca9992..f0ddd5bc0 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -862,7 +862,7 @@ block_send_optimize_distance (block send optimize distance) int 4 2
 
 #    Name of map generator to be used when creating a new world.
 #    Creating a world in the main menu will override this.
-mg_name (Mapgen name) enum v6 v5,v6,v7,flat,valleys,fractal,singlenode
+mg_name (Mapgen name) enum v7 v5,v6,v7,flat,valleys,fractal,singlenode
 
 #    Water surface level of the world.
 water_level (Water level) int 1
diff --git a/minetest.conf.example b/minetest.conf.example
index ff365466f..6c7d1e66b 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1053,7 +1053,7 @@
 #    Name of map generator to be used when creating a new world.
 #    Creating a world in the main menu will override this.
 #    type: enum values: v5, v6, v7, flat, valleys, fractal, singlenode
-# mg_name = v6
+# mg_name = v7
 
 #    Water surface level of the world.
 #    type: int
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index bd88cf530..60a34cf63 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -327,7 +327,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("liquid_update", "1.0");
 
 	//mapgen stuff
-	settings->setDefault("mg_name", "v6");
+	settings->setDefault("mg_name", "v7");
 	settings->setDefault("water_level", "1");
 	settings->setDefault("chunksize", "5");
 	settings->setDefault("mg_flags", "dungeons");