summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorparamat <mat.gregory@virginmedia.com>2017-04-17 14:17:43 +0100
committerparamat <mat.gregory@virginmedia.com>2017-04-19 02:02:11 +0100
commitcfe0291b131630a7400fdcf46b720bd70d8d0fa0 (patch)
tree71676a112c66c955a2274940834491224d14a4a6 /builtin
parentefd509f796a4870243ce97012aa27940993f4a79 (diff)
downloadminetest-cfe0291b131630a7400fdcf46b720bd70d8d0fa0.tar.gz
minetest-cfe0291b131630a7400fdcf46b720bd70d8d0fa0.tar.bz2
minetest-cfe0291b131630a7400fdcf46b720bd70d8d0fa0.zip
Conf.example: Move some lines to minetest.conf.example.extra
Some information in conf.example cannot be generated from settingtypes.txt, moving it to a new file makes generating conf.example while preserving that information easier. Regenerate conf.example from settingtypes.txt.
Diffstat (limited to 'builtin')
-rw-r--r--builtin/mainmenu/dlg_settings_advanced.lua6
1 files changed, 0 insertions, 6 deletions
diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua
index 697babeb6..c63eb972e 100644
--- a/builtin/mainmenu/dlg_settings_advanced.lua
+++ b/builtin/mainmenu/dlg_settings_advanced.lua
@@ -769,10 +769,4 @@ end
-- Generate minetest.conf.example and settings_translation_file.cpp
--- *** Please note ***
--- There is text in minetest.conf.example that will not be generated from
--- settingtypes.txt but must be preserved:
--- The documentation of mapgen noise parameter formats (title plus 16 lines)
--- Noise parameter 'mgv5_np_ground' in group format (13 lines)
-
--assert(loadfile(core.get_builtin_path()..DIR_DELIM.."mainmenu"..DIR_DELIM.."generate_from_settingtypes.lua"))(parse_config_file(true, false))