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 ea0ca99923fb5d1c3c3732cc2b5d348e0f305539..f0ddd5bc013ff16e7a8bb0ee1bcb2fcce1a351ee 100644 (file)
--- 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 ff365466f0223772b41386fd8a795f85dbc85af3..6c7d1e66b11be742c17dbc44c02a7853e73abf7e 100644 (file)
--- 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 bd88cf53010cfb7da11e7cc8a1f042bca5adff7b..60a34cf63edf4c587fc3504b3a9040d6569642d8 100644 (file)
--- 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");