Merge remote-tracking branch 'upstream/master'

builtin/mainmenu/dlg_settings_advanced.lua

@@ -706,7 +706,11 @@ local function create_minetest_conf_example()
 				result = result .. " possible values: " .. entry.possible:gsub(",", ", ")
 			end
 			result = result .. "\n"
-			result = result .. "# " .. entry.name .. " = ".. entry.default .. "\n\n"
+			local append = ""
+			if entry.default ~= "" then
+				append = " " .. entry.default
+			end
+			result = result .. "# " .. entry.name .. " =" .. append .. "\n\n"
 		end
 	end
 	return result

builtin/settingtypes.txt

@@ -252,14 +252,12 @@ serverlist_file (Serverlist file) string favoriteservers.txt
 
 [***Basic]
 
+#    Enable VBO
+enable_vbo (VBO) bool true
+
 #    Whether to fog out the end of the visible area.
 enable_fog (Fog) bool true
 
-#    Enable a bit lower water surface, so it doesn't "fill" the node completely.
-#    Note that this is not quite optimized and that smooth lighting on the
-#    water surface doesn't work with this.
-new_style_water (New style water) bool false
-
 #    Leaves style:
 #    -   Fancy:  all faces visible
 #    -   Simple: only outer faces, if defined special_tiles are used

doc/Readme.md

@@ -76,11 +76,17 @@ Compiling on GNU/Linux:
 Install dependencies. Here's an example for Debian/Ubuntu:
 $ sudo apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
 
+For Fedora users:
+$ sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl* openal* libvorbis* libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel irrlicht-devel bzip2-libs gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel doxygen spatialindex-dev bzip2-dev
+
 You can install git for easily keeping your copy up to date.
 If you dont want git, read below on how to get the source without git.
 This is an example for installing git on Debian/Ubuntu:
 $ sudo apt-get install git-core
 
+For Fedora users:
+$ sudo dnf install git-core
+
 Download source (this is the URL to the latest of source repository, which might not work at all times) using git:
 $ git clone --depth 1 https://github.com/MultiCraft/MultiCraft.git
 $ cd MultiCraft

multicraft.conf.example

@@ -197,7 +197,7 @@
 #    Key for toggling the camrea update. Only used for development
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 #    type: key
-# keymap_toggle_update_camera = 
+# keymap_toggle_update_camera =
 
 #    Key for toggling the display of debug info.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
@@ -235,7 +235,7 @@
 #    Leave this blank to start a local server.
 #    Note that the address field in the main menu overrides this setting.
 #    type: string
-# address = 
+# address =
 
 #    Port to connect to (UDP).
 #    Note that the port field in the main menu overrides this setting.
@@ -266,16 +266,14 @@
 
 #### Basic
 
+#    Enable VBO
+#    type: bool
+# enable_vbo = true
+
 #    Whether to fog out the end of the visible area.
 #    type: bool
 # enable_fog = true
 
-#    Enable a bit lower water surface, so it doesn't "fill" the node completely.
-#    Note that this is not quite optimized and that smooth lighting on the
-#    water surface doesn't work with this.
-#    type: bool
-# new_style_water = false
-
 #    Leaves style:
 #    -   Fancy:  all faces visible
 #    -   Simple: only outer faces, if defined special_tiles are used
@@ -300,6 +298,10 @@
 #    type: bool
 # enable_3d_clouds = true
 
+#    Method used to highlight selected object.
+#    type: enum values: box, halo
+# node_highlighting = box
+
 #### Filtering
 
 #    Use mip mapping to scale textures. May slightly increase performance.
@@ -347,9 +349,9 @@
 #    type: bool
 # enable_shaders = true
 
-##### Tone mapping
-#    Enables filmic tone mapping.
-#    Requires shaders to be enabled.
+##### Tone Mapping
+
+#    Enables filmic tone mapping
 #    type: bool
 # tone_mapping = false
 
@@ -440,8 +442,8 @@
 #    type: int
 # pause_fps_max = 20
 
-#    View range in nodes.
-#    Min = 20.
+#    View distance in nodes.
+#    Min = 20
 #    type: int
 # viewing_range = 100
 
@@ -476,7 +478,7 @@
 
 #    Path to texture directory. All textures are first searched from here.
 #    type: path
-# texture_path = 
+# texture_path =
 
 #    The rendering back-end for Irrlicht.
 #    type: enum values: null, software, burningsvideo, direct3d8, direct3d9, opengl
@@ -545,10 +547,6 @@
 #    type: float
 # hud_hotbar_max_width = 1.0
 
-#    Selection highlighting method (box or halo)
-#    type: string
-# node_highlighting = box
-
 #    Enables caching of facedir rotated meshes.
 #    type: bool
 # enable_mesh_cache = false
@@ -578,7 +576,8 @@
 #    type: float min: 0.25 max: 4
 # ambient_occlusion_gamma = 2.2
 
-#    Enable animation of inventory items.
+#    Enables animation of inventory items.
+#    type: bool
 # inventory_items_animations = false
 
 ### Menus
@@ -652,7 +651,7 @@
 
 #    Path to save screenshots at.
 #    type: path
-# screenshot_path = 
+# screenshot_path =
 
 ### Advanced
 
@@ -721,7 +720,7 @@
 
 #    The network interface that the server listens on.
 #    type: string
-# bind_address = 
+# bind_address =
 
 #    Enable to disallow old clients from connecting.
 #    Older clients are compatible in the sense that they will not crash when connecting
@@ -734,7 +733,7 @@
 #    (obviously, remote_media should end with a slash).
 #    Files that are not present will be fetched the usual way.
 #    type: string
-# remote_media = 
+# remote_media =
 
 #    Enable/disable running an IPv6 server.  An IPv6 server may be restricted
 #    to IPv6 clients, depending on system configuration.
@@ -772,7 +771,7 @@
 
 #    Message of the day displayed to players connecting.
 #    type: string
-# motd = 
+# motd =
 
 #    Maximum number of players that can connect simultaneously.
 #    type: int
@@ -781,7 +780,7 @@
 #    World directory (everything in the world is stored here).
 #    Not needed if starting from the main menu.
 #    type: path
-# map-dir = 
+# map-dir =
 
 #    Time in seconds for item entity (dropped items) to live.
 #    Setting it to -1 disables the feature.
@@ -795,11 +794,11 @@
 #    A chosen map seed for a new map, leave empty for random.
 #    Will be overridden when creating a new world in the main menu.
 #    type: string
-# fixed_map_seed = 
+# fixed_map_seed =
 
 #    New users need to input this password.
 #    type: string
-# default_password = 
+# default_password =
 
 #    The privileges that new users automatically get.
 #    See /privs in game for a full list on your server and mod configuration.
@@ -821,7 +820,7 @@
 
 #    If this is set, players will always (re)spawn at the given position.
 #    type: string
-# static_spawnpoint = 
+# static_spawnpoint =
 
 #    If enabled, new players cannot join with an empty password.
 #    type: bool
@@ -1174,7 +1173,7 @@
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with "no" are used to explicitly disable them.
 #    type: flags possible values: lakes, hills, , nolakes, nohills
-# mgflat_spflags = 
+# mgflat_spflags =
 
 #    Y of flat ground.
 #    type: int
@@ -1301,41 +1300,87 @@
 
 #### Mapgen Valleys
 
-#mg_valleys_spflags = altitude_chill,humid_rivers
+##### General
+
+#    Map generation attributes specific to Mapgen Valleys.
+#    Flags that are not specified in the flag string are not modified from the default.
+#    Flags starting with "no" are used to explicitly disable them.
 #    "altitude_chill" makes higher elevations colder, which may cause biome issues.
 #    "humid_rivers" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes.
-#
-#mg_valleys_altitude_chill = 90  # the altitude at which temperature drops by 20C
-#mg_valleys_large_cave_depth = -33  # Depth below which you'll find large caves.
-#mg_valleys_lava_features = 0    # Creates unpredictable lava features in caves. These can make mining difficult. Zero disables them. (0-10)
-#mg_valleys_massive_cave_depth = -256 # Depth below which you'll find massive caves.
-#mg_valleys_river_depth = 4      # how deep to make rivers
-#mg_valleys_river_size = 5       # how wide to make rivers
-#mg_valleys_water_features = 0   # Creates unpredictable water features in caves. These can make mining difficult. Zero disables them. (0-10)
-#
-#mg_valleys_np_filler_depth = 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0
-#
-# River noise -- rivers occur close to zero
-#mg_valleys_np_rivers = 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0
-#
-# Caves and tunnels form at the intersection of the two noises
-#mg_valleys_np_cave1 = 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0
-#mg_valleys_np_cave2 = 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0
-#
-#mg_valleys_np_massive_caves = 0, 1, (768, 256, 768), 59033, 6, 0.63, 2  # Massive caves form here.
-#
-# Base terrain height
-#mg_valleys_np_terrain_height = -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0
-#
-# Raises terrain to make valleys around the rivers
-#mg_valleys_np_valley_depth = 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0
-#
-# Slope and fill work together to modify the heights
-#mg_valleys_np_inter_valley_fill = 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0
-#mg_valleys_np_inter_valley_slope = 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0
-#
-# Amplifies the valleys
-#mg_valleys_np_valley_profile = 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0
+#    type: flags possible values: altitude_chill, noaltitude_chill, humid_rivers, nohumid_rivers
+# mg_valleys_spflags = altitude_chill,humid_rivers
+
+#    The altitude at which temperature drops by 20C
+#    type: int
+# mg_valleys_altitude_chill = 90
+
+#    Depth below which you'll find large caves.
+#    type: int
+# mg_valleys_large_cave_depth = -33
+
+#    Creates unpredictable lava features in caves.
+#    These can make mining difficult. Zero disables them. (0-10)
+#    type: int
+# mg_valleys_lava_features = 0
+
+#    Depth below which you'll find massive caves.
+#    type: int
+# mg_valleys_massive_cave_depth = -256
+
+#    How deep to make rivers
+#    type: int
+# mg_valleys_river_depth = 4
+
+#    How wide to make rivers
+#    type: int
+# mg_valleys_river_size = 5
+
+#    Creates unpredictable water features in caves.
+#    These can make mining difficult. Zero disables them. (0-10)
+#    type: int
+# mg_valleys_water_features = 0
+
+##### Noises
+
+#    Caves and tunnels form at the intersection of the two noises
+#    type: noise_params
+# mg_valleys_np_cave1 = 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0
+
+#    Caves and tunnels form at the intersection of the two noises
+#    type: noise_params
+# mg_valleys_np_cave2 = 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0
+
+#    The depth of dirt or other filler
+#    type: noise_params
+# mg_valleys_np_filler_depth = 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0
+
+#    Massive caves form here.
+#    type: noise_params
+# mg_valleys_np_massive_caves = 0, 1, (768, 256, 768), 59033, 6, 0.63, 2.0
+
+#    River noise -- rivers occur close to zero
+#    type: noise_params
+# mg_valleys_np_rivers = 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0
+
+#    Base terrain height
+#    type: noise_params
+# mg_valleys_np_terrain_height = -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0
+
+#    Raises terrain to make valleys around the rivers
+#    type: noise_params
+# mg_valleys_np_valley_depth = 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0
+
+#    Slope and fill work together to modify the heights
+#    type: noise_params
+# mg_valleys_np_inter_valley_fill = 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0
+
+#    Amplifies the valleys
+#    type: noise_params
+# mg_valleys_np_valley_profile = 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0
+
+#    Slope and fill work together to modify the heights
+#    type: noise_params
+# mg_valleys_np_inter_valley_slope = 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0
 
 ## Security
 
@@ -1346,7 +1391,12 @@
 #    Comma-separated list of trusted mods that are allowed to access insecure
 #    functions even when mod security is on (via request_insecure_environment()).
 #    type: string
-# secure.trusted_mods = 
+# secure.trusted_mods =
+
+#    Comma-seperated list of mods that are allowed to access HTTP APIs, which
+#    allow them to upload and download data to/from the internet.
+#    type: string
+# secure.http_mods =
 
 #
 # Client and Server
@@ -1356,12 +1406,12 @@
 #    When running a server, clients connecting with this name are admins.
 #    When starting from the main menu, this is overridden.
 #    type: string
-# name = 
+# name =
 
 #    Set the language. Leave empty to use the system language.
 #    A restart is required after changing this.
 #    type: enum values: , be, cs, da, de, eo, es, et, fr, hu, id, it, ja, jbo, ko, ky, lt, nb, nl, pl, pt, pt_BR, ro, ru, tr, uk, zh_CN, zh_TW
-# language =  
+# language =
 
 #    Level of logging to be written to debug.txt:
 #    -    <nothing> (no logging)
@@ -1403,7 +1453,7 @@
 
 #    Replaces the default main menu with a custom one.
 #    type: string
-# main_menu_script = 
+# main_menu_script =
 
 #    type: int
 # main_menu_game_mgr = 0

po/MultiCraft.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-08 21:23+0100\n"
+"POT-Creation-Date: 2016-02-27 05:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -89,14 +89,15 @@ msgstr ""
 msgid "Depends:"
 msgstr ""
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua
-#: src/guiKeyChangeMenu.cpp
+#: builtin/mainmenu/dlg_config_world.lua
+#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
 msgid "Save"
 msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
-#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua
-#: src/guiKeyChangeMenu.cpp src/keycode.cpp
+#: builtin/mainmenu/dlg_rename_modpack.lua
+#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp
+#: src/keycode.cpp
 msgid "Cancel"
 msgstr ""
 
@@ -171,6 +172,7 @@ msgid "Are you sure you want to delete \"$1\"?"
 msgstr ""
 
 #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
+#: builtin/mainmenu/tab_settings.lua
 msgid "Yes"
 msgstr ""
 
@@ -202,6 +204,92 @@ msgstr ""
 msgid "Accept"
 msgstr ""
 
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Games"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "(No description of setting given)"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Please enter a comma seperated list of flags."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Possible values are: "
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid ""
+"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
+"<octaves>, <persistence>"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Optionally the lacunarity can be appended with a leading comma."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Format is 3 numbers separated by commas and inside brackets."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Disabled"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Enabled"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Browse"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Please enter a valid integer."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "The value must be greater than $1."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "The value must be lower than $1."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Please enter a valid number."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "\"$1\" is not a valid flag."
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Select path"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "< Back to Settings page"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Edit"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Restore Default"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Show technical names"
+msgstr ""
+
 #: builtin/mainmenu/modmgr.lua
 msgid "Install Mod: file: \"$1\""
 msgstr ""
@@ -312,10 +400,6 @@ msgstr ""
 msgid "Select Mod File:"
 msgstr ""
 
-#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua
-msgid "Mods"
-msgstr ""
-
 #: builtin/mainmenu/tab_multiplayer.lua
 msgid "Address / Port :"
 msgstr ""
@@ -408,69 +492,99 @@ msgid "Server"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Games"
+msgid "Opaque Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "(No description of setting given)"
+msgid "Simple Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Please enter a comma seperated list of flags."
+msgid "Fancy Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Possible values are: "
+msgid "No Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid ""
-"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
-"<octaves>, <persistence>"
+msgid "Bilinear Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Optionally the lacunarity can be appended with a leading comma."
+msgid "Trilinear Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Format is 3 numbers separated by commas and inside brackets."
+msgid "No Mipmap"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Disabled"
+msgid "Mipmap"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Enabled"
+msgid "Mipmap + Aniso. Filter"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
+msgid "None"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Browse"
+msgid "2x"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Please enter a valid integer."
+msgid "4x"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "The value must be greater than $1."
+msgid "8x"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "The value must be lower than $1."
+msgid "Are you sure to reset your singleplayer world?"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Please enter a valid number."
+msgid "No!!!"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "\"$1\" is not a valid flag."
+msgid "Smooth Lighting"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Select path"
+msgid "Enable Particles"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "3D Clouds"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Opaque Water"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Connected Glass"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Node Highlighting"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Texturing:"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Antialiasing:"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
@@ -478,15 +592,39 @@ msgid "Change keys"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Edit"
+msgid "Advanced Settings"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Restore Default"
+msgid "Touchthreshold (px)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Bumpmapping"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Show technical names"
+msgid "Generate Normalmaps"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+msgid "Parallax Occlusion"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Waving Water"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Waving Leaves"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Waving Plants"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "To enable shaders the OpenGL driver needs to be used."
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
@@ -513,10 +651,6 @@ msgstr ""
 msgid "Singleplayer"
 msgstr ""
 
-#: builtin/mainmenu/tab_texturepacks.lua
-msgid "None"
-msgstr ""
-
 #: builtin/mainmenu/tab_texturepacks.lua
 msgid "Select texture pack:"
 msgstr ""
@@ -549,10 +683,6 @@ msgstr ""
 msgid "Initializing nodes"
 msgstr ""
 
-#: src/client.cpp
-msgid "Item textures..."
-msgstr ""
-
 #: src/client.cpp
 msgid "Done!"
 msgstr ""
@@ -1554,7 +1684,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for increasing the viewing range. Modifies the minimum viewing range.\n"
+"Key for increasing the viewing range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -1565,7 +1695,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Key for decreasing the viewing range. Modifies the minimum viewing range.\n"
+"Key for decreasing the viewing range.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
@@ -1652,6 +1782,14 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "VBO"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable VBO"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Fog"
 msgstr ""
@@ -1660,18 +1798,6 @@ msgstr ""
 msgid "Whether to fog out the end of the visible area."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "New style water"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable a bit lower water surface, so it doesn't \"fill\" the node "
-"completely.\n"
-"Note that this is not quite optimized and that smooth lighting on the\n"
-"water surface doesn't work with this."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
 msgstr ""
@@ -1718,6 +1844,14 @@ msgstr ""
 msgid "Use 3D cloud look instead of flat."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Node highlighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Method used to highlight selected object."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Filtering"
 msgstr ""
@@ -1781,18 +1915,6 @@ msgid ""
 "enabled."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Preload inventory textures"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Pre-generate all item visuals used in the inventory.\n"
-"This increases startup time, but runs smoother in-game.\n"
-"The generated textures can easily exceed your VRAM, causing artifacts in the "
-"inventory."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "FSAA"
 msgstr ""
@@ -1803,10 +1925,6 @@ msgid ""
 "when set to higher number than 0."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Shaders"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Shaders allow advanced visul effects and may increase performance on some "
@@ -1815,7 +1933,15 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
+msgid "Tone Mapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filmic tone mapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables filmic tone mapping"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -1854,10 +1980,6 @@ msgid ""
 "A higher value results in smoother normal maps."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Parallax occlusion"
 msgstr ""
@@ -1960,17 +2082,6 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Wanted FPS"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Minimum wanted FPS.\n"
-"The amount of rendered stuff is dynamically set according to this. and "
-"viewing range min and max."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS"
 msgstr ""
@@ -1990,18 +2101,13 @@ msgid "Maximum FPS when game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Viewing range maximum"
+msgid "Viewing range"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The allowed adjustment range for the automatic rendering range adjustment.\n"
-"Set this to be equal to viewing range minimum to disable the auto-adjustment "
-"algorithm."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Viewing range minimum"
+"View distance in nodes.\n"
+"Min = 20"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2009,7 +2115,7 @@ msgid "Screen width"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Vertical initial window size."
+msgid "Width component of the initial window size."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2017,7 +2123,7 @@ msgid "Screen height"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Horizontal initial window size."
+msgid "Height component of the initial window size."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2129,7 +2235,8 @@ msgid ""
 "-    anaglyph: cyan/magenta color 3d.\n"
 "-    interlaced: odd/even line based polarisation screen support.\n"
 "-    topbottom: split screen top/bottom.\n"
-"-    sidebyside: split screen side by side."
+"-    sidebyside: split screen side by side.\n"
+"-    pageflip: quadbuffer based 3d."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2198,14 +2305,6 @@ msgid ""
 "Useful if there's something to be displayed right or left of hotbar."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Node highlighting"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable selection highlighting for nodes (disables selectionbox)."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mesh cache"
 msgstr ""
@@ -2262,6 +2361,14 @@ msgid ""
 "set to the nearest valid value."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Inventory items animations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables animation of inventory items."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr ""
@@ -2692,18 +2799,6 @@ msgstr ""
 msgid "If this is set, players will always (re)spawn at the given position."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Vertical spawn range"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum distance above water level for player spawn.\n"
-"Larger values result in spawn points closer to (x = 0, z = 0).\n"
-"Smaller values may result in a suitable spawn point not being found,\n"
-"resulting in a spawn at (0, 0, 0) possibly buried underground."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
 msgstr ""
@@ -3045,10 +3140,11 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Global map generation attributes.\n"
+"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
+"and junglegrass, in all other mapgens this flag controls all decorations.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
-"Flags starting with \"no\" are used to explicitly disable them.\n"
-"'trees' and 'flat' flags only have effect in mgv6."
+"Flags starting with \"no\" are used to explicitly disable them."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3292,95 +3388,170 @@ msgid "Mapgen v7 cave2 noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal"
+msgid "Mapgen flat"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal flags"
+msgid "Mapgen flat flags"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Map generation attributes specific to Mapgen fractal.\n"
-"'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
+"Map generation attributes specific to Mapgen flat.\n"
+"Occasional lakes and hills added to the flat world.\n"
 "Flags that are not specified in the flag string are not modified from the "
 "default.\n"
 "Flags starting with \"no\" are used to explicitly disable them."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal mandelbrot iterations"
+msgid "Mapgen flat ground level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y of flat ground."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat large cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y of upper limit of large pseudorandom caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat lake threshold"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Mandelbrot set: Iterations of the recursive function.\n"
-"Controls scale of finest detail."
+"Terrain noise threshold for lakes.\n"
+"Controls proportion of world area covered by lakes.\n"
+"Adjust towards 0.0 for a larger proportion."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal mandelbrot scale"
+msgid "Mapgen flat lake steepness"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
+msgid "Controls steepness/depth of lake depressions."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal mandelbrot offset"
+msgid "Mapgen flat hill threshold"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
-"Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
+"Terrain noise threshold for hills.\n"
+"Controls proportion of world area covered by hills.\n"
+"Adjust towards 0.0 for a larger proportion."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal mandelbrot slice w"
+msgid "Mapgen flat hill steepness"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/height of hills."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat terrain noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
-"Range roughly -2 to 2."
+"Determines terrain shape.\n"
+"The 3 numbers in brackets control the scale of the\n"
+"terrain, the 3 numbers should be identical."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal julia iterations"
+msgid "Mapgen flat filler depth noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave1 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen flat cave2 noise parameters"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal fractal"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Julia set: Iterations of the recursive function.\n"
-"Controls scale of finest detail."
+"Choice of 18 fractals from 9 formulas.\n"
+"1 = 4D \"Roundy\" mandelbrot set.\n"
+"2 = 4D \"Roundy\" julia set.\n"
+"3 = 4D \"Squarry\" mandelbrot set.\n"
+"4 = 4D \"Squarry\" julia set.\n"
+"5 = 4D \"Mandy Cousin\" mandelbrot set.\n"
+"6 = 4D \"Mandy Cousin\" julia set.\n"
+"7 = 4D \"Variation\" mandelbrot set.\n"
+"8 = 4D \"Variation\" julia set.\n"
+"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n"
+"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n"
+"11 = 3D \"Christmas Tree\" mandelbrot set.\n"
+"12 = 3D \"Christmas Tree\" julia set.\n"
+"13 = 3D \"Mandelbulb\" mandelbrot set.\n"
+"14 = 3D \"Mandelbulb\" julia set.\n"
+"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n"
+"16 = 3D \"Cosine Mandelbulb\" julia set.\n"
+"17 = 4D \"Mandelbulb\" mandelbrot set.\n"
+"18 = 4D \"Mandelbulb\" julia set."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal julia scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Julia set: Approximate (X,Y,Z) scales in nodes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen fractal julia offset"
+msgid "Mapgen fractal iterations"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Julia set: (X,Y,Z) offsets from world centre.\n"
-"Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
+"Iterations of the recursive function.\n"
+"Controls the amount of fine detail."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Mapgen fractal julia slice w"
+msgid "Mapgen fractal scale"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Approximate (X,Y,Z) scale of fractal in nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal offset"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
+"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n"
+"Used to move a suitable spawn area of low land close to (0, 0).\n"
+"The default is suitable for mandelbrot sets, it needs to be edited for julia "
+"sets.\n"
+"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen fractal slice w"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"W co-ordinate of the generated 3D slice of a 4D fractal.\n"
+"Determines which 3D slice of the 4D shape is generated.\n"
+"Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
 
@@ -3390,7 +3561,8 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Julia set: X value determining the 4D shape.\n"
+"Julia set only: X component of hypercomplex constant determining julia "
+"shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
 
@@ -3400,7 +3572,8 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Julia set: Y value determining the 4D shape.\n"
+"Julia set only: Y component of hypercomplex constant determining julia "
+"shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
 
@@ -3410,7 +3583,8 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Julia set: Z value determining the 4D shape.\n"
+"Julia set only: Z component of hypercomplex constant determining julia "
+"shape.\n"
 "Range roughly -2 to 2."
 msgstr ""
 
@@ -3420,7 +3594,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Julia set: W value determining the 4D shape.\n"
+"Julia set only: W component of hypercomplex constant determining julia "
+"shape.\n"
+"Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
 
@@ -3440,6 +3616,166 @@ msgstr ""
 msgid "Mapgen fractal cave2 noise parameters"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Mapgen Valleys"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "General"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valleys C Flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen Valleys.\n"
+"Flags that are not specified in the flag string are not modified from the "
+"default.\n"
+"Flags starting with \"no\" are used to explicitly disable them.\n"
+"\"altitude_chill\" makes higher elevations colder, which may cause biome "
+"issues.\n"
+"\"humid_rivers\" modifies the humidity around rivers and in areas where "
+"water would tend to pool. It may interfere with delicately adjusted biomes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Altitude Chill"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The altitude at which temperature drops by 20C"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Large cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find large caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lava Features"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Creates unpredictable lava features in caves.\n"
+"These can make mining difficult. Zero disables them. (0-10)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Massive cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find massive caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River Depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How deep to make rivers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River Size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How wide to make rivers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water Features"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Creates unpredictable water features in caves.\n"
+"These can make mining difficult. Zero disables them. (0-10)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noises"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave noise #1"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Caves and tunnels form at the intersection of the two noises"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave noise #2"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filler Depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The depth of dirt or other filler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Massive cave noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Massive caves form here."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River Noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River noise -- rivers occur close to zero"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain Height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Base terrain height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Raises terrain to make valleys around the rivers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Fill"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Slope and fill work together to modify the heights"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Profile"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Amplifies the valleys"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley Slope"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Security"
 msgstr ""
@@ -3462,6 +3798,16 @@ msgid ""
 "functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "HTTP Mods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
 msgstr ""

src/content_mapblock.cpp

@@ -181,11 +181,6 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 		Some settings
 	*/
 	bool enable_mesh_cache	= g_settings->getBool("enable_mesh_cache");
-	bool new_style_water = g_settings->getBool("new_style_water");
-
-	float node_liquid_level = 1.0;
-	if (new_style_water)
-		node_liquid_level = 0.85;
 
 	v3s16 blockpos_nodes = data->m_blockpos*MAP_BLOCKSIZE;
 
@@ -287,35 +282,29 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 					If our topside is liquid, set upper border of face
 					at upper border of node
 				*/
-				if(top_is_same_liquid)
-				{
-					vertices[2].Pos.Y = 0.5*BS;
-					vertices[3].Pos.Y = 0.5*BS;
-				}
+				if (top_is_same_liquid) {
+					vertices[2].Pos.Y = 0.5 * BS;
+					vertices[3].Pos.Y = 0.5 * BS;
+				} else {
 				/*
 					Otherwise upper position of face is liquid level
 				*/
-				else
-				{
-					vertices[2].Pos.Y = (node_liquid_level-0.5)*BS;
-					vertices[3].Pos.Y = (node_liquid_level-0.5)*BS;
+					vertices[2].Pos.Y = 0.5 * BS;
+					vertices[3].Pos.Y = 0.5 * BS;
 				}
 				/*
 					If neighbor is liquid, lower border of face is liquid level
 				*/
-				if(neighbor_is_same_liquid)
-				{
-					vertices[0].Pos.Y = (node_liquid_level-0.5)*BS;
-					vertices[1].Pos.Y = (node_liquid_level-0.5)*BS;
-				}
+				if (neighbor_is_same_liquid) {
+					vertices[0].Pos.Y = 0.5 * BS;
+					vertices[1].Pos.Y = 0.5 * BS;
+				} else {
 				/*
 					If neighbor is not liquid, lower border of face is
 					lower border of node
 				*/
-				else
-				{
-					vertices[0].Pos.Y = -0.5*BS;
-					vertices[1].Pos.Y = -0.5*BS;
+					vertices[0].Pos.Y = -0.5 * BS;
+					vertices[1].Pos.Y = -0.5 * BS;
 				}
 
 				for(s32 j=0; j<4; j++)
@@ -358,7 +347,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 				video::S3DVertex(-BS/2,0,-BS/2, 0,0,0, c, 0,0),
 			};
 
-			v3f offset(p.X*BS, p.Y*BS + (-0.5+node_liquid_level)*BS, p.Z*BS);
+			v3f offset(p.X * BS, (p.Y + 0.5) * BS, p.Z * BS);
 			for(s32 i=0; i<4; i++)
 			{
 				vertices[i].Pos += offset;
@@ -431,14 +420,14 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 					content = n2.getContent();
 
 					if(n2.getContent() == c_source)
-						level = (-0.5+node_liquid_level) * BS;
+						level = 0.5 * BS;
 					else if(n2.getContent() == c_flowing){
 						u8 liquid_level = (n2.param2&LIQUID_LEVEL_MASK);
 						if (liquid_level <= LIQUID_LEVEL_MAX+1-range)
 							liquid_level = 0;
 						else
 							liquid_level -= (LIQUID_LEVEL_MAX+1-range);
-						level = (-0.5 + ((float)liquid_level+ 0.5) / (float)range * node_liquid_level) * BS;
+						level = (-0.5 + ((float)liquid_level + 0.5) / (float)range) * BS;
 					}
 
 					// Check node above neighbor.
@@ -486,7 +475,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 					// Source is always the same height
 					else if(content == c_source)
 					{
-						cornerlevel = (-0.5+node_liquid_level)*BS;
+						cornerlevel = 0.5 * BS;
 						valid_count = 1;
 						break;
 					}

src/defaultsettings.cpp

@@ -107,7 +107,6 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("enable_fog", "true");
 	settings->setDefault("fov", "72");
 	settings->setDefault("view_bobbing", "true");
-	settings->setDefault("new_style_water", "false");
 	settings->setDefault("leaves_style", "fancy");
 	settings->setDefault("connected_glass", "false");
 	settings->setDefault("smooth_lighting", "true");
@@ -178,7 +177,8 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("repeat_rightclick_time", "0.25");
 	settings->setDefault("enable_particles", "true");
 	settings->setDefault("enable_mesh_cache", "false");
-
+	settings->setDefault("enable_vbo", "true");
+	
 	settings->setDefault("enable_minimap", "true");
 	settings->setDefault("minimap_shape_round", "true");
 	settings->setDefault("minimap_double_scan_height", "false");

src/environment.cpp

@@ -1029,7 +1029,8 @@ void ServerEnvironment::step(float dtime)
 	// Update this one
 	// NOTE: This is kind of funny on a singleplayer game, but doesn't
 	// really matter that much.
-	m_recommended_send_interval = g_settings->getFloat("dedicated_server_step");
+	static const float server_step = g_settings->getFloat("dedicated_server_step");
+	m_recommended_send_interval = server_step;
 
 	/*
 		Increment game time
@@ -1086,7 +1087,7 @@ void ServerEnvironment::step(float dtime)
 		/*
 			Update list of active blocks, collecting changes
 		*/
-		const s16 active_block_range = g_settings->getS16("active_block_range");
+		static const s16 active_block_range = g_settings->getS16("active_block_range");
 		std::set<v3s16> blocks_removed;
 		std::set<v3s16> blocks_added;
 		m_active_blocks.update(players_blockpos, active_block_range,
@@ -1101,8 +1102,7 @@ void ServerEnvironment::step(float dtime)
 
 		for(std::set<v3s16>::iterator
 				i = blocks_removed.begin();
-				i != blocks_removed.end(); ++i)
-		{
+				i != blocks_removed.end(); ++i) {
 			v3s16 p = *i;
 
 			/* infostream<<"Server: Block " << PP(p)
@@ -2602,5 +2602,3 @@ ClientEnvEvent ClientEnvironment::getClientEvent()
 }
 
 #endif // #ifndef SERVER
-
-

src/mapblock_mesh.cpp

@@ -1026,6 +1026,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 	m_mesh(new scene::SMesh()),
 	m_minimap_mapblock(NULL),
 	m_gamedef(data->m_gamedef),
+	m_driver(m_gamedef->tsrc()->getDevice()->getVideoDriver()),
 	m_tsrc(m_gamedef->getTextureSource()),
 	m_shdrsrc(m_gamedef->getShaderSource()),
 	m_animation_force_timer(0), // force initial animation
@@ -1036,7 +1037,8 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 {
 	m_enable_shaders = data->m_use_shaders;
 	m_use_tangent_vertices = data->m_use_tangent_vertices;
-
+	m_enable_vbo = g_settings->getBool("enable_vbo");
+	
 	if (g_settings->getBool("enable_minimap")) {
 		m_minimap_mapblock = new MinimapMapblock;
 		m_minimap_mapblock->getMinimapNodes(
@@ -1261,14 +1263,9 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 #endif
 
 		// Use VBO for mesh (this just would set this for ever buffer)
-		// This will lead to infinite memory usage because or irrlicht.
-		//m_mesh->setHardwareMappingHint(scene::EHM_STATIC);
-
-		/*
-			NOTE: If that is enabled, some kind of a queue to the main
-			thread should be made which would call irrlicht to delete
-			the hardware buffer and then delete the mesh
-		*/
+		if (m_enable_vbo) {
+			m_mesh->setHardwareMappingHint(scene::EHM_STATIC);
+		}
 	}
 
 	//std::cout<<"added "<<fastfaces.getSize()<<" faces."<<std::endl;
@@ -1282,6 +1279,12 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 
 MapBlockMesh::~MapBlockMesh()
 {
+	if (m_enable_vbo && m_mesh) {
+		for (u32 i = 0; i < m_mesh->getMeshBufferCount(); i++) {
+			scene::IMeshBuffer *buf = m_mesh->getMeshBuffer(i);
+			m_driver->removeHardwareBuffer(buf);
+		}
+	}
 	m_mesh->drop();
 	m_mesh = NULL;
 	delete m_minimap_mapblock;
@@ -1362,6 +1365,10 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat
 	// Day-night transition
 	if(!m_enable_shaders && (daynight_ratio != m_last_daynight_ratio))
 	{
+		// Force reload mesh to VBO
+		if (m_enable_vbo) {
+			m_mesh->setDirty();
+		}
 		for(std::map<u32, std::map<u32, std::pair<u8, u8> > >::iterator
 				i = m_daynight_diffs.begin();
 				i != m_daynight_diffs.end(); ++i)
@@ -1387,6 +1394,9 @@ void MapBlockMesh::updateCameraOffset(v3s16 camera_offset)
 {
 	if (camera_offset != m_camera_offset) {
 		translateMesh(m_mesh, intToFloat(m_camera_offset-camera_offset, BS));
+		if (m_enable_vbo) {
+			m_mesh->setDirty();
+		}
 		m_camera_offset = camera_offset;
 	}
 }

src/mapblock_mesh.h

@@ -128,11 +128,13 @@ private:
 	scene::IMesh *m_mesh;
 	MinimapMapblock *m_minimap_mapblock;
 	IGameDef *m_gamedef;
+	video::IVideoDriver *m_driver;
 	ITextureSource *m_tsrc;
 	IShaderSource *m_shdrsrc;
 
 	bool m_enable_shaders;
 	bool m_use_tangent_vertices;
+	bool m_enable_vbo;
 
 	// Must animate() be called before rendering?
 	bool m_has_animation;

src/nodedef.cpp

@@ -806,7 +806,6 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef,
 	scene::ISceneManager* smgr = gamedef->getSceneManager();
 	scene::IMeshManipulator* meshmanip = smgr->getMeshManipulator();
 
-	bool new_style_water           = g_settings->getBool("new_style_water");
 	bool connected_glass           = g_settings->getBool("connected_glass");
 	bool opaque_water              = g_settings->getBool("opaque_water");
 	bool enable_shaders            = g_settings->getBool("enable_shaders");
@@ -854,7 +853,7 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef,
 			assert(f->liquid_type == LIQUID_SOURCE);
 			if (opaque_water)
 				f->alpha = 255;
-			f->solidness = new_style_water ? 0 : 1;
+			f->solidness = 0;
 			is_liquid = true;
 			break;
 		case NDT_FLOWINGLIQUID:

src/script/lua_api/l_util.cpp

@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "cpp_api/s_security.h"
 #include "areastore.h"
 #include "porting.h"
+#include "debug.h"
 #include "log.h"
 #include "tool.h"
 #include "filesys.h"
@@ -372,8 +373,8 @@ int ModApiUtil::l_request_insecure_environment(lua_State *L)
 	if (lua_getstack(L, 2, &info)) {
 		return 0;
 	}
-	assert(lua_getstack(L, 1, &info));
-	assert(lua_getinfo(L, "S", &info));
+	FATAL_ERROR_IF(!lua_getstack(L, 1, &info), "lua_getstack() failed");
+	FATAL_ERROR_IF(!lua_getinfo(L, "S", &info), "lua_getinfo() failed");
 	// ...and that that item is the main file scope.
 	if (strcmp(info.what, "main") != 0) {
 		return 0;

src/server.cpp

@@ -664,16 +664,18 @@ void Server::AsyncRunStep(bool initial_step)
 		ScopeProfiler sp(g_profiler, "Server: checking added and deleted objs");
 
 		// Radius inside which objects are active
-		s16 radius = g_settings->getS16("active_object_send_range_blocks");
-		s16 player_radius = g_settings->getS16("player_transfer_distance");
+		static const s16 radius =
+			g_settings->getS16("active_object_send_range_blocks") * MAP_BLOCKSIZE;
 
-		if (player_radius == 0 && g_settings->exists("unlimited_player_transfer_distance") &&
-				!g_settings->getBool("unlimited_player_transfer_distance"))
+		// Radius inside which players are active
+		static const bool is_transfer_limited =
+			g_settings->exists("unlimited_player_transfer_distance") &&
+			!g_settings->getBool("unlimited_player_transfer_distance");
+		static const s16 player_transfer_dist = g_settings->getS16("player_transfer_distance") * MAP_BLOCKSIZE;
+		s16 player_radius = player_transfer_dist;
+		if (player_radius == 0 && is_transfer_limited)
 			player_radius = radius;
 
-		radius *= MAP_BLOCKSIZE;
-		player_radius *= MAP_BLOCKSIZE;
-
 		for (std::map<u16, RemoteClient*>::iterator
 			i = clients.begin();
 			i != clients.end(); ++i) {
@@ -977,8 +979,7 @@ void Server::AsyncRunStep(bool initial_step)
 	{
 		float &counter = m_emergethread_trigger_timer;
 		counter += dtime;
-		if(counter >= 2.0)
-		{
+		if (counter >= 2.0) {
 			counter = 0.0;
 
 			m_emerge->startThreads();
@@ -989,8 +990,9 @@ void Server::AsyncRunStep(bool initial_step)
 	{
 		float &counter = m_savemap_timer;
 		counter += dtime;
-		if(counter >= g_settings->getFloat("server_map_save_interval"))
-		{
+		static const float save_interval =
+			g_settings->getFloat("server_map_save_interval");
+		if (counter >= save_interval) {
 			counter = 0.0;
 			MutexAutoLock lock(m_env_mutex);
 
@@ -3505,9 +3507,11 @@ void dedicated_server_loop(Server &server, bool &kill)
 
 	IntervalLimiter m_profiler_interval;
 
-	for(;;)
-	{
-		float steplen = g_settings->getFloat("dedicated_server_step");
+	static const float steplen = g_settings->getFloat("dedicated_server_step");
+	static const float profiler_print_interval =
+			g_settings->getFloat("profiler_print_interval");
+
+	for(;;) {
 		// This is kind of a hack but can be done like this
 		// because server.step() is very light
 		{
@@ -3529,10 +3533,7 @@ void dedicated_server_loop(Server &server, bool &kill)
 		/*
 			Profiler
 		*/
-		float profiler_print_interval =
-				g_settings->getFloat("profiler_print_interval");
-		if(profiler_print_interval != 0)
-		{
+		if (profiler_print_interval != 0) {
 			if(m_profiler_interval.step(steplen, profiler_print_interval))
 			{
 				infostream<<"Profiler:"<<std::endl;

src/settings_translation_file.cpp

@@ -88,9 +88,9 @@ fake_function() {
 	gettext("Toggle camera mode key");
 	gettext("Key for switching between first- and third-person camera.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("View range increase key");
-	gettext("Key for increasing the viewing range. Modifies the minimum viewing range.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Key for increasing the viewing range.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("View range decrease key");
-	gettext("Key for decreasing the viewing range. Modifies the minimum viewing range.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Key for decreasing the viewing range.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Print stacks");
 	gettext("Key for printing debug stacks. Used for development.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Network");
@@ -109,10 +109,10 @@ fake_function() {
 	gettext("Graphics");
 	gettext("In-Game");
 	gettext("Basic");
+	gettext("VBO");
+	gettext("Enable VBO");
 	gettext("Fog");
 	gettext("Whether to fog out the end of the visible area.");
-	gettext("New style water");
-	gettext("Enable a bit lower water surface, so it doesn't \"fill\" the node completely.\nNote that this is not quite optimized and that smooth lighting on the\nwater surface doesn't work with this.");
 	gettext("Leaves style");
 	gettext("Leaves style:\n-   Fancy:  all faces visible\n-   Simple: only outer faces, if defined special_tiles are used\n-   Opaque: disable transparency");
 	gettext("Connect glass");
@@ -123,6 +123,8 @@ fake_function() {
 	gettext("Clouds are a client side effect.");
 	gettext("3D clouds");
 	gettext("Use 3D cloud look instead of flat.");
+	gettext("Node highlighting");
+	gettext("Method used to highlight selected object.");
 	gettext("Filtering");
 	gettext("Mipmapping");
 	gettext("Use mip mapping to scale textures. May slightly increase performance.");
@@ -141,6 +143,9 @@ fake_function() {
 	gettext("Shaders");
 	gettext("Shaders");
 	gettext("Shaders allow advanced visul effects and may increase performance on some video cards.\nThy only work with the OpenGL video backend.");
+	gettext("Tone Mapping");
+	gettext("Filmic tone mapping");
+	gettext("Enables filmic tone mapping");
 	gettext("Bumpmapping");
 	gettext("Bumpmapping");
 	gettext("Enables bumpmapping for textures. Normalmaps need to be supplied by the texture pack\nor need to be auto-generated.\nRequires shaders to be enabled.");
@@ -174,16 +179,12 @@ fake_function() {
 	gettext("Waving plants");
 	gettext("Set to true enables waving plants.\nRequires shaders to be enabled.");
 	gettext("Advanced");
-	gettext("Wanted FPS");
-	gettext("Minimum wanted FPS.\nThe amount of rendered stuff is dynamically set according to this. and viewing range min and max.");
 	gettext("Maximum FPS");
 	gettext("If FPS would go higher than this, limit it by sleeping\nto not waste CPU power for no benefit.");
 	gettext("FPS in pause menu");
 	gettext("Maximum FPS when game is paused.");
-	gettext("Viewing range maximum");
-	gettext("The allowed adjustment range for the automatic rendering range adjustment.\nSet this to be equal to viewing range minimum to disable the auto-adjustment algorithm.");
-	gettext("Viewing range minimum");
-	gettext("The allowed adjustment range for the automatic rendering range adjustment.\nSet this to be equal to viewing range maximum to disable the auto-adjustment algorithm.");
+	gettext("Viewing range");
+	gettext("View distance in nodes.\nMin = 20");
 	gettext("Screen width");
 	gettext("Width component of the initial window size.");
 	gettext("Screen height");
@@ -211,7 +212,7 @@ fake_function() {
 	gettext("Fall bobbing");
 	gettext("Multiplier for fall bobbing.\nFor example: 0 for no view bobbing; 1.0 for normal; 2.0 for double.");
 	gettext("3D mode");
-	gettext("3D support.\nCurrently supported:\n-    none: no 3d output.\n-    anaglyph: cyan/magenta color 3d.\n-    interlaced: odd/even line based polarisation screen support.\n-    topbottom: split screen top/bottom.\n-    sidebyside: split screen side by side.");
+	gettext("3D support.\nCurrently supported:\n-    none: no 3d output.\n-    anaglyph: cyan/magenta color 3d.\n-    interlaced: odd/even line based polarisation screen support.\n-    topbottom: split screen top/bottom.\n-    sidebyside: split screen side by side.\n-    pageflip: quadbuffer based 3d.");
 	gettext("Console color");
 	gettext("In-game chat console background color (R,G,B).");
 	gettext("Console alpha");
@@ -228,8 +229,6 @@ fake_function() {
 	gettext("Whether node texture animations should be desynchronized per mapblock.");
 	gettext("Maximum hotbar width");
 	gettext("Maximum proportion of current window to be used for hotbar.\nUseful if there's something to be displayed right or left of hotbar.");
-	gettext("Node highlighting");
-	gettext("Enable selection highlighting for nodes (disables selectionbox).");
 	gettext("Mesh cache");
 	gettext("Enables caching of facedir rotated meshes.");
 	gettext("Minimap");
@@ -242,6 +241,8 @@ fake_function() {
 	gettext("Make fog and sky colors depend on daytime (dawn/sunset) and view direction.");
 	gettext("Ambient occlusion gamma");
 	gettext("The strength (darkness) of node ambient-occlusion shading.\nLower is darker, Higher is lighter. The valid range of values for this\nsetting is 0.25 to 4.0 inclusive. If the value is out of range it will be\nset to the nearest valid value.");
+	gettext("Inventory items animations");
+	gettext("Enables animation of inventory items.");
 	gettext("Menus");
 	gettext("Clouds in menu");
 	gettext("Use a cloud animation for the main menu background.");
@@ -343,8 +344,6 @@ fake_function() {
 	gettext("Whether to allow players to damage and kill each other.");
 	gettext("Static spawnpoint");
 	gettext("If this is set, players will always (re)spawn at the given position.");
-	gettext("Vertical spawn range");
-	gettext("Maximum distance above water level for player spawn.\nLarger values result in spawn points closer to (x = 0, z = 0).\nSmaller values may result in a suitable spawn point not being found,\nresulting in a spawn at (0, 0, 0) possibly buried underground.");
 	gettext("Disallow empty passwords");
 	gettext("If enabled, new players cannot join with an empty password.");
 	gettext("Disable anticheat");
@@ -499,33 +498,74 @@ fake_function() {
 	gettext("Mapgen flat cave1 noise parameters");
 	gettext("Mapgen flat cave2 noise parameters");
 	gettext("Mapgen fractal");
-	gettext("Mapgen fractal formula");
-	gettext("Choice of 8 4-dimensional fractals.\n1 = \"Roundy\" mandelbrot set.\n2 = \"Roundy\" julia set.\n3 = \"Squarry\" mandelbrot set.\n4 = \"Squarry\" julia set.\n5 = \"Mandy Cousin\" mandelbrot set.\n6 = \"Mandy Cousin\" julia set.\n7 = \"Variation\" mandelbrot set.\n8 = \"Variation\" julia set.");
+	gettext("Mapgen fractal fractal");
+	gettext("Choice of 18 fractals from 9 formulas.\n1 = 4D \"Roundy\" mandelbrot set.\n2 = 4D \"Roundy\" julia set.\n3 = 4D \"Squarry\" mandelbrot set.\n4 = 4D \"Squarry\" julia set.\n5 = 4D \"Mandy Cousin\" mandelbrot set.\n6 = 4D \"Mandy Cousin\" julia set.\n7 = 4D \"Variation\" mandelbrot set.\n8 = 4D \"Variation\" julia set.\n9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n11 = 3D \"Christmas Tree\" mandelbrot set.\n12 = 3D \"Christmas Tree\" julia set.\n13 = 3D \"Mandelbulb\" mandelbrot set.\n14 = 3D \"Mandelbulb\" julia set.\n15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n16 = 3D \"Cosine Mandelbulb\" julia set.\n17 = 4D \"Mandelbulb\" mandelbrot set.\n18 = 4D \"Mandelbulb\" julia set.");
 	gettext("Mapgen fractal iterations");
-	gettext("Iterations of the recursive function.\nControls scale of finest detail.");
+	gettext("Iterations of the recursive function.\nControls the amount of fine detail.");
 	gettext("Mapgen fractal scale");
 	gettext("Approximate (X,Y,Z) scale of fractal in nodes.");
 	gettext("Mapgen fractal offset");
-	gettext("(X,Y,Z) offset of fractal from world centre.\nUsed to move a suitable spawn area of low land close to (0, 0).\nThe default is suitable for mandelbrot sets, it needs to be edited for julia sets,\ndo this by greatly reducing 'scale' and setting 'offset' initially to (0, 0, 0).\nRange roughly -2 to 2. Multiply by 'scale' for offset in nodes.");
+	gettext("(X,Y,Z) offset of fractal from world centre in units of 'scale'.\nUsed to move a suitable spawn area of low land close to (0, 0).\nThe default is suitable for mandelbrot sets, it needs to be edited for julia sets.\nRange roughly -2 to 2. Multiply by 'scale' for offset in nodes.");
 	gettext("Mapgen fractal slice w");
-	gettext("W co-ordinate of the generated 3D slice of the 4D shape.\nAlters the generated 3D shape.\nRange roughly -2 to 2.");
+	gettext("W co-ordinate of the generated 3D slice of a 4D fractal.\nDetermines which 3D slice of the 4D shape is generated.\nHas no effect on 3D fractals.\nRange roughly -2 to 2.");
 	gettext("Mapgen fractal julia x");
-	gettext("Julia set only: X value determining the 4D shape.\nRange roughly -2 to 2.");
+	gettext("Julia set only: X component of hypercomplex constant determining julia shape.\nRange roughly -2 to 2.");
 	gettext("Mapgen fractal julia y");
-	gettext("Julia set only: Y value determining the 4D shape.\nRange roughly -2 to 2.");
+	gettext("Julia set only: Y component of hypercomplex constant determining julia shape.\nRange roughly -2 to 2.");
 	gettext("Mapgen fractal julia z");
-	gettext("Julia set only: Z value determining the 4D shape.\nRange roughly -2 to 2.");
+	gettext("Julia set only: Z component of hypercomplex constant determining julia shape.\nRange roughly -2 to 2.");
 	gettext("Mapgen fractal julia w");
-	gettext("Julia set only: W value determining the 4D shape.\nRange roughly -2 to 2.");
+	gettext("Julia set only: W component of hypercomplex constant determining julia shape.\nHas no effect on 3D fractals.\nRange roughly -2 to 2.");
 	gettext("Mapgen fractal seabed noise parameters");
 	gettext("Mapgen fractal filler depth noise parameters");
 	gettext("Mapgen fractal cave1 noise parameters");
 	gettext("Mapgen fractal cave2 noise parameters");
+	gettext("Mapgen Valleys");
+	gettext("General");
+	gettext("Valleys C Flags");
+	gettext("Map generation attributes specific to Mapgen Valleys.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them.\n\"altitude_chill\" makes higher elevations colder, which may cause biome issues.\n\"humid_rivers\" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes.");
+	gettext("Altitude Chill");
+	gettext("The altitude at which temperature drops by 20C");
+	gettext("Large cave depth");
+	gettext("Depth below which you'll find large caves.");
+	gettext("Lava Features");
+	gettext("Creates unpredictable lava features in caves.\nThese can make mining difficult. Zero disables them. (0-10)");
+	gettext("Massive cave depth");
+	gettext("Depth below which you'll find massive caves.");
+	gettext("River Depth");
+	gettext("How deep to make rivers");
+	gettext("River Size");
+	gettext("How wide to make rivers");
+	gettext("Water Features");
+	gettext("Creates unpredictable water features in caves.\nThese can make mining difficult. Zero disables them. (0-10)");
+	gettext("Noises");
+	gettext("Cave noise #1");
+	gettext("Caves and tunnels form at the intersection of the two noises");
+	gettext("Cave noise #2");
+	gettext("Caves and tunnels form at the intersection of the two noises");
+	gettext("Filler Depth");
+	gettext("The depth of dirt or other filler");
+	gettext("Massive cave noise");
+	gettext("Massive caves form here.");
+	gettext("River Noise");
+	gettext("River noise -- rivers occur close to zero");
+	gettext("Terrain Height");
+	gettext("Base terrain height");
+	gettext("Valley Depth");
+	gettext("Raises terrain to make valleys around the rivers");
+	gettext("Valley Fill");
+	gettext("Slope and fill work together to modify the heights");
+	gettext("Valley Profile");
+	gettext("Amplifies the valleys");
+	gettext("Valley Slope");
+	gettext("Slope and fill work together to modify the heights");
 	gettext("Security");
 	gettext("Enable mod security");
 	gettext("Prevent mods from doing insecure things like running shell commands.");
 	gettext("Trusted mods");
 	gettext("Comma-separated list of trusted mods that are allowed to access insecure\nfunctions even when mod security is on (via request_insecure_environment()).");
+	gettext("HTTP Mods");
+	gettext("Comma-seperated list of mods that are allowed to access HTTP APIs, which\nallow them to upload and download data to/from the internet.");
 	gettext("Client and Server");
 	gettext("Player name");
 	gettext("Name of the player.\nWhen running a server, clients connecting with this name are admins.\nWhen starting from the main menu, this is overridden.");