Merge branch 'master' into master

builtin/client/death_formspec.lua

@@ -1,15 +0,0 @@
--- CSM death formspec. Only used when clientside modding is enabled, otherwise
--- handled by the engine.
-
-core.register_on_death(function()
-	local formspec = "size[11,5.5]bgcolor[#320000b4;true]" ..
-		"label[4.85,1.35;" .. fgettext("You died") ..
-		"]button_exit[4,3;3,0.5;btn_respawn;".. fgettext("Respawn") .."]"
-	core.show_formspec("bultin:death", formspec)
-end)
-
-core.register_on_formspec_input(function(formname, fields)
-	if formname == "bultin:death" then
-		core.send_respawn()
-	end
-end)

builtin/client/init.lua

@@ -9,6 +9,5 @@ dofile(commonpath .. "mod_storage.lua")
 dofile(commonpath .. "chatcommands.lua")
 dofile(commonpath .. "information_formspecs.lua")
 dofile(clientpath .. "chatcommands.lua")
-dofile(clientpath .. "death_formspec.lua")
 dofile(clientpath .. "misc.lua")
 assert(loadfile(commonpath .. "item_s.lua"))({}) -- Just for push/read node functions

builtin/emerge/env.lua

@@ -23,6 +23,8 @@ core.add_node = core.set_node
 -- we don't deal with metadata currently
 core.swap_node = core.set_node
 
+core.bulk_swap_node = core.bulk_set_node
+
 function core.remove_node(pos)
 	return core.vmanip:set_node_at(pos, {name="air"})
 end

builtin/fstk/buttonbar.lua

@@ -28,10 +28,8 @@ local function buttonbar_formspec(self)
 	end
 
 	local formspec = {
-		"style_type[box;noclip=true]",
 		string.format("box[%f,%f;%f,%f;%s]", self.pos.x, self.pos.y, self.size.x,
 				self.size.y, self.bgcolor),
-		"style_type[box;noclip=false]",
 	}
 
 	local btn_size = self.size.y - 2*BASE_SPACING
@@ -71,7 +69,7 @@ local function buttonbar_formspec(self)
 			y = self.pos.y + BASE_SPACING,
 		}
 
-		table.insert(formspec, string.format("image_button[%f,%f;%f,%f;%s;%s;%s;true;false]tooltip[%s;%s]",
+		table.insert(formspec, string.format("image_button[%f,%f;%f,%f;%s;%s;%s;false;false]tooltip[%s;%s]",
 				btn_pos.x, btn_pos.y, btn_size, btn_size, btn.image, btn.name,
 				btn.caption, btn.name, btn.tooltip))
 	end
@@ -86,9 +84,6 @@ local function buttonbar_formspec(self)
 			y = self.pos.y + BASE_SPACING,
 		}
 
-		table.insert(formspec, string.format("style[%s,%s;noclip=true]",
-				self.btn_prev_name, self.btn_next_name))
-
 		table.insert(formspec, string.format("button[%f,%f;%f,%f;%s;<]",
 				btn_prev_pos.x, btn_prev_pos.y, get_scroll_btn_width(), btn_size,
 				self.btn_prev_name))

builtin/fstk/tabview.lua

@@ -66,11 +66,22 @@ local function get_formspec(self)
 
 	local content, prepend = tab.get_formspec(self, tab.name, tab.tabdata, tab.tabsize)
 
-	local tsize = tab.tabsize or { width = self.width, height = self.height }
+	local ENABLE_TOUCH = core.settings:get_bool("enable_touch")
+
+	local orig_tsize = tab.tabsize or { width = self.width, height = self.height }
+	local tsize = { width = orig_tsize.width, height = orig_tsize.height }
+	tsize.height = tsize.height
+		+ TABHEADER_H -- tabheader included in formspec size
+		+ (ENABLE_TOUCH and GAMEBAR_OFFSET_TOUCH or GAMEBAR_OFFSET_DESKTOP)
+		+ GAMEBAR_H -- gamebar included in formspec size
+
 	if self.parent == nil and not prepend then
 		prepend = string.format("size[%f,%f,%s]", tsize.width, tsize.height,
 				dump(self.fixed_size))
 
+		local anchor_pos = TABHEADER_H + orig_tsize.height / 2
+		prepend = prepend .. ("anchor[0.5,%f]"):format(anchor_pos / tsize.height)
+
 		if tab.formspec_version then
 			prepend = ("formspec_version[%d]"):format(tab.formspec_version) .. prepend
 		end
@@ -78,12 +89,15 @@ local function get_formspec(self)
 
 	local end_button_size = 0.75
 
-	local tab_header_size = { width = tsize.width, height = 0.85 }
+	local tab_header_size = { width = tsize.width, height = TABHEADER_H }
 	if self.end_button then
 		tab_header_size.width = tab_header_size.width - end_button_size - 0.1
 	end
 
-	local formspec = (prepend or "") .. self:tab_header(tab_header_size) .. content
+	local formspec = (prepend or "")
+	formspec = formspec .. ("bgcolor[;neither]container[0,%f]box[0,0;%f,%f;#0000008C]"):format(
+			TABHEADER_H, orig_tsize.width, orig_tsize.height)
+	formspec = formspec .. self:tab_header(tab_header_size) .. content
 
 	if self.end_button then
 		formspec = formspec ..
@@ -98,6 +112,8 @@ local function get_formspec(self)
 						self.end_button.name)
 	end
 
+	formspec = formspec .. "container_end[]"
+
 	return formspec
 end
 

builtin/game/death_screen.lua

@@ -0,0 +1,31 @@
+local F = core.formspec_escape
+local S = core.get_translator("__builtin")
+
+function core.show_death_screen(player, _reason)
+	local fs = {
+		"formspec_version[1]",
+		"size[11,5.5,true]",
+		"bgcolor[#320000b4;true]",
+		"label[4.85,1.35;", F(S("You died")), "]",
+		"button_exit[4,3;3,0.5;btn_respawn;", F(S("Respawn")), "]",
+	}
+	core.show_formspec(player:get_player_name(), "__builtin:death", table.concat(fs, ""))
+end
+
+core.register_on_dieplayer(function(player, reason)
+	core.show_death_screen(player, reason)
+end)
+
+core.register_on_joinplayer(function(player)
+	if player:get_hp() == 0 then
+		core.show_death_screen(player, nil)
+	end
+end)
+
+core.register_on_player_receive_fields(function(player, formname, fields)
+	if formname == "__builtin:death" and fields.quit and player:get_hp() == 0 then
+		player:respawn()
+		core.log("action", player:get_player_name() .. " respawns at " ..
+				player:get_pos():to_string())
+	end
+end)

builtin/game/features.lua

@@ -43,6 +43,8 @@ core.features = {
 	moveresult_new_pos = true,
 	override_item_remove_fields = true,
 	hotbar_hud_element = true,
+	bulk_lbms = true,
+	abm_without_neighbors = true,
 }
 
 function core.has_feature(arg)

builtin/game/init.lua

@@ -38,6 +38,7 @@ dofile(gamepath .. "forceloading.lua")
 dofile(gamepath .. "hud.lua")
 dofile(gamepath .. "knockback.lua")
 dofile(gamepath .. "async.lua")
+dofile(gamepath .. "death_screen.lua")
 
 core.after(0, builtin_shared.cache_content_ids)
 

builtin/game/misc.lua

@@ -6,14 +6,14 @@ local S = core.get_translator("__builtin")
 -- Misc. API functions
 --
 
--- @spec core.kick_player(String, String) :: Boolean
-function core.kick_player(player_name, reason)
+-- @spec core.kick_player(String, String, Boolean) :: Boolean
+function core.kick_player(player_name, reason, reconnect)
 	if type(reason) == "string" then
 		reason = "Kicked: " .. reason
 	else
 		reason = "Kicked."
 	end
-	return core.disconnect_player(player_name, reason)
+	return core.disconnect_player(player_name, reason, reconnect)
 end
 
 function core.check_player_privs(name, ...)
@@ -298,3 +298,28 @@ do
 		return valid_object_iterator(core.get_objects_in_area(min_pos, max_pos))
 	end
 end
+
+--
+-- Helper for LBM execution, called from C++
+--
+
+function core.run_lbm(id, pos_list, dtime_s)
+	local lbm = core.registered_lbms[id]
+	assert(lbm, "Entry with given id not found in registered_lbms table")
+	core.set_last_run_mod(lbm.mod_origin)
+	if lbm.bulk_action then
+		return lbm.bulk_action(pos_list, dtime_s)
+	end
+	-- emulate non-bulk LBMs
+	local expect = core.get_node(pos_list[1]).name
+	-- engine guarantees that
+	-- 1) all nodes are the same content type
+	-- 2) the list is up-to-date when we're called
+	assert(expect ~= "ignore")
+	for _, pos in ipairs(pos_list) do
+		local n = core.get_node(pos)
+		if n.name == expect then -- might have been changed by previous call
+			lbm.action(pos, n, dtime_s)
+		end
+	end
+end

builtin/game/register.lua

@@ -105,7 +105,12 @@ function core.register_lbm(spec)
 	-- Add to core.registered_lbms
 	check_modname_prefix(spec.name)
 	check_node_list(spec.nodenames, "nodenames")
-	assert(type(spec.action) == "function", "Required field 'action' of type function")
+	local have = spec.action ~= nil
+	local have_bulk = spec.bulk_action ~= nil
+	assert(not have or type(spec.action) == "function", "Field 'action' must be a function")
+	assert(not have_bulk or type(spec.bulk_action) == "function", "Field 'bulk_action' must be a function")
+	assert(have ~= have_bulk, "Either 'action' or 'bulk_action' must be present")
+
 	core.registered_lbms[#core.registered_lbms + 1] = spec
 	spec.mod_origin = core.get_current_modname() or "??"
 end

builtin/locale/__builtin.be.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Вы загінулі
+Respawn=Адрадзіцца

builtin/locale/__builtin.bg.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Умряхте
+Respawn=Прераждане

builtin/locale/__builtin.ca.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Has mort
+Respawn=Reaparèixer

builtin/locale/__builtin.cs.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Zemřel jsi
+Respawn=Oživit

builtin/locale/__builtin.cy.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Buest ti farw
+Respawn=Atgyfodi

builtin/locale/__builtin.da.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Du døde
+Respawn=Genopstå

builtin/locale/__builtin.de.tr

@@ -244,3 +244,5 @@ A total of @1 sample(s) were taken.=Es wurden insgesamt @1 Datenpunkt(e) aufgeze
 The output is limited to '@1'.=Die Ausgabe ist beschränkt auf „@1“.
 Saving of profile failed: @1=Speichern des Profils fehlgeschlagen: @1
 Profile saved to @1=Profil abgespeichert nach @1
+You died=Sie sind gestorben
+Respawn=Wiederbeleben

builtin/locale/__builtin.el.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Πέθανες
+Respawn=Επανεμφάνηση

builtin/locale/__builtin.eo.tr

@@ -244,3 +244,5 @@ A total of @1 sample(s) were taken.=Sume @1 ekzemplero(j) konserviĝis.
 The output is limited to '@1'.=La eligo estas limigita al «@1».
 Saving of profile failed: @1=Konservado de profilo malsukcesis: @1
 Profile saved to @1=Profilo konservita al @1
+You died=Vi mortis
+Respawn=Renaskiĝi

builtin/locale/__builtin.es.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Has muerto
+Respawn=Reaparecer

builtin/locale/__builtin.et.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Said surma
+Respawn=Ärka ellu

builtin/locale/__builtin.eu.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Hil zara
+Respawn=Birsortu

builtin/locale/__builtin.fi.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Kuolit
+Respawn=Synny uudelleen

builtin/locale/__builtin.fil.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Namatay ka
+Respawn=Mag-respawn

builtin/locale/__builtin.fr.tr

@@ -244,3 +244,5 @@ A total of @1 sample(s) were taken.=@1 échantillons ont été collectés.
 The output is limited to '@1'.=La sortie est limitée à '@1'.
 Saving of profile failed: @1=La sauvegarde du profil a échoué : @1
 Profile saved to @1=Le profil a été sauvegardé dans @1
+You died=Vous êtes mort
+Respawn=Réapparaître

builtin/locale/__builtin.ga.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Fuair tú bás
+Respawn=Athsceith

builtin/locale/__builtin.gl.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Morreches
+Respawn=Reaparecer

builtin/locale/__builtin.hu.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Meghaltál
+Respawn=Újraéledés

builtin/locale/__builtin.id.tr

@@ -244,3 +244,5 @@ A total of @1 sample(s) were taken.=Total @1 sampel yang diambil.
 The output is limited to '@1'.=Keluaran dibatasi ke '@1'.
 Saving of profile failed: @1=Penyimpanan profil gagal: @1
 Profile saved to @1=Profil disimpan ke @1
+You died=Anda mati
+Respawn=Bangkit kembali

builtin/locale/__builtin.it.tr

@@ -245,3 +245,5 @@ A total of @1 sample(s) were taken.=Son stati ottenuti campioni per un totale di
 The output is limited to '@1'.=L'output è limitato a '@1'.
 Saving of profile failed: @1=Errore nel salvare il profilo: @1
 Profile saved to @1=Profilo salvato in @1
+You died=Sei morto
+Respawn=Rinasci

builtin/locale/__builtin.ja.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=死んでしまった
+Respawn=リスポーン

builtin/locale/__builtin.jbo.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=.i do morsi
+Respawn=tolcanci

builtin/locale/__builtin.jv.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Panjenengan pejah
+Respawn=Bangkit Malilh

builtin/locale/__builtin.ko.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=사망했습니다
+Respawn=리스폰

builtin/locale/__builtin.kv.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Кулінныд
+Respawn=Ловзьыны

builtin/locale/__builtin.ky.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Сиз өлдүңүз.
+Respawn=Кайтадан жаралуу

builtin/locale/__builtin.lt.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Jūs numirėte
+Respawn=Prisikelti

builtin/locale/__builtin.lv.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Jūs nomirāt
+Respawn=Atdzīvoties

builtin/locale/__builtin.lzh.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=尔死矣
+Respawn=复生

builtin/locale/__builtin.mn.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Та үхсэн
+Respawn=Дахин төрөх

builtin/locale/__builtin.mr.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=तू मेलास
+Respawn=पुनर्जन्म

builtin/locale/__builtin.ms.tr

@@ -244,3 +244,5 @@ A total of @1 sample(s) were taken.=Sebanyak @1 sampel telah diambil secara kese
 The output is limited to '@1'.=Output dihadkan kepada '@1'.
 Saving of profile failed: @1=Penyimpanan profil telah gagal: @1
 Profile saved to @1=Profil telah disimpan ke @1
+You died=Anda telah meninggal
+Respawn=Jelma semula

builtin/locale/__builtin.nb.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Du døde
+Respawn=Gjenoppstå

builtin/locale/__builtin.nl.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Je bent gestorven
+Respawn=Herboren worden

builtin/locale/__builtin.nn.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Du døydde
+Respawn=Kom opp att

builtin/locale/__builtin.oc.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Setz mòrt·a
+Respawn=Tornar

builtin/locale/__builtin.pl.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Nie żyjesz
+Respawn=Wróć do gry

builtin/locale/__builtin.pt.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Você morreu
+Respawn=Renascer

builtin/locale/__builtin.pt_BR.tr

@@ -244,3 +244,5 @@ A total of @1 sample(s) were taken.=Um total de @1 amostra(s) foi coletada.
 The output is limited to '@1'.=A saída é limitada a '@1'.
 Saving of profile failed: @1=Falha ao salvar o perfil: @1
 Profile saved to @1=Perfil salvo em @1
+You died=Você morreu
+Respawn=Reviver

builtin/locale/__builtin.ro.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Ai murit
+Respawn=Reînviere

builtin/locale/__builtin.ru.tr

@@ -244,3 +244,5 @@ A total of @1 sample(s) were taken.=Всего было взято @1 образ
 The output is limited to '@1'.=Вывод ограничен значением '@1'.
 Saving of profile failed: @1=Не удалось сохранить данные профилирования: @1
 Profile saved to @1=Данные профилирования сохранены в @1
+You died=Вы умерли
+Respawn=Возродиться

builtin/locale/__builtin.sk.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Zomrel si
+Respawn=Oživiť

builtin/locale/__builtin.sl.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Umrl si
+Respawn=Ponovno oživi

builtin/locale/__builtin.sr_Cyrl.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Умро си
+Respawn=Врати се у живот

builtin/locale/__builtin.sr_Latn.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Umro/la si.
+Respawn=Vrati se u zivot

builtin/locale/__builtin.sv.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Du dog
+Respawn=Återuppstå

builtin/locale/__builtin.sw.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Umekufa.
+Respawn=Respawn

builtin/locale/__builtin.tok.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=sina moli
+Respawn=o kama sin

builtin/locale/__builtin.tr.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Öldün
+Respawn=Yeniden Canlan

builtin/locale/__builtin.tt.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Сез үлдегез
+Respawn=Тергезелергә

builtin/locale/__builtin.uk.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Ви загинули
+Respawn=Відродитися

builtin/locale/__builtin.vi.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=Bạn đã bị chết
+Respawn=Hồi sinh

builtin/locale/__builtin.zh_CN.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=您已死亡
+Respawn=重生

builtin/locale/__builtin.zh_TW.tr

@@ -0,0 +1,3 @@
+# textdomain: __builtin
+You died=您已死亡
+Respawn=重生

builtin/mainmenu/init.lua

@@ -23,6 +23,13 @@ mt_color_dark_green = "#25C191"
 mt_color_orange  = "#FF8800"
 mt_color_red = "#FF3300"
 
+MAIN_TAB_W = 15.5
+MAIN_TAB_H = 7.1
+TABHEADER_H = 0.85
+GAMEBAR_H = 1.25
+GAMEBAR_OFFSET_DESKTOP = 0.375
+GAMEBAR_OFFSET_TOUCH = 0.15
+
 local menupath = core.get_mainmenu_path()
 local basepath = core.get_builtin_path()
 defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" ..
@@ -89,7 +96,7 @@ local function init_globals()
 	mm_game_theme.set_engine() -- This is just a fallback.
 
 	-- Create main tabview
-	local tv_main = tabview_create("maintab", {x = 15.5, y = 7.1}, {x = 0, y = 0})
+	local tv_main = tabview_create("maintab", {x = MAIN_TAB_W, y = MAIN_TAB_H}, {x = 0, y = 0})
 
 	tv_main:set_autosave_tab(true)
 	tv_main:add(tabs.local_game)

builtin/mainmenu/tab_local.lua

@@ -92,10 +92,16 @@ function singleplayer_refresh_gamebar()
 		end
 	end
 
+	local ENABLE_TOUCH = core.settings:get_bool("enable_touch")
+
+	local gamebar_pos_y = MAIN_TAB_H
+		+ TABHEADER_H -- tabheader included in formspec size
+		+ (ENABLE_TOUCH and GAMEBAR_OFFSET_TOUCH or GAMEBAR_OFFSET_DESKTOP)
+
 	local btnbar = buttonbar_create(
 			"game_button_bar",
-			core.settings:get_bool("touch_gui") and {x = 0, y = 7.25} or {x = 0, y = 7.475},
-			{x = 15.5, y = 1.25},
+			{x = 0, y = gamebar_pos_y},
+			{x = MAIN_TAB_W, y = GAMEBAR_H},
 			"#000000",
 			game_buttonbar_button_handler)
 

builtin/profiler/instrumentation.lua

@@ -217,8 +217,9 @@ local function init()
 		-- Wrap register_lbm() to automatically instrument lbms.
 		local orig_register_lbm = core.register_lbm
 		core.register_lbm = function(spec)
-			spec.action = instrument {
-				func = spec.action,
+			local k = spec.bulk_action ~= nil and "bulk_action" or "action"
+			spec[k] = instrument {
+				func = spec[k],
 				class = "LBM",
 				label = spec.label or spec.name,
 			}

builtin/settingtypes.txt

@@ -403,6 +403,11 @@ enable_clouds (Clouds) bool true
 #    Requires: enable_clouds
 enable_3d_clouds (3D clouds) bool true
 
+#   Use smooth cloud shading.
+#
+#   Requires: enable_3d_clouds, enable_clouds
+soft_clouds (Soft clouds) bool false
+
 [**Filtering and Antialiasing]
 
 #    Use mipmaps when scaling textures. May slightly increase performance,
@@ -505,6 +510,11 @@ water_wave_length (Waving liquids wavelength) float 20.0 0.1
 #    Requires: shaders, enable_waving_water
 water_wave_speed (Waving liquids wave speed) float 5.0
 
+#   When enabled, liquid reflections are simulated.
+#
+#   Requires: shaders, enable_waving_water, enable_dynamic_shadows
+enable_water_reflections (Liquid reflections) bool false
+
 [**Dynamic shadows]
 
 #    Set to true to enable Shadow Mapping.
@@ -661,6 +671,18 @@ bloom_radius (Bloom Radius) float 1 0.1 8
 #    Requires: shaders, enable_post_processing, enable_bloom
 enable_volumetric_lighting (Volumetric lighting) bool false
 
+[**Other Effects]
+
+#   Simulate translucency when looking at foliage in the sunlight.
+#
+#   Requires: shaders, enable_dynamic_shadows
+enable_translucent_foliage (Translucent foliage) bool false
+
+#   Apply specular shading to nodes.
+#
+#   Requires: shaders, enable_dynamic_shadows
+enable_node_specular (Node specular) bool false
+
 [*Audio]
 
 #    Volume of all sounds.
@@ -1030,7 +1052,7 @@ mapgen_limit (Map generation limit) int 31007 0 31007
 #    Global map generation attributes.
 #    In Mapgen v6 the 'decorations' flag controls all decorations except trees
 #    and jungle grass, in all other mapgens this flag controls all decorations.
-mg_flags (Mapgen flags) flags caves,dungeons,light,decorations,biomes,ores caves,dungeons,light,decorations,biomes,ores,nocaves,nodungeons,nolight,nodecorations,nobiomes,noores
+mg_flags (Mapgen flags) flags caves,dungeons,light,decorations,biomes,ores caves,dungeons,light,decorations,biomes,ores
 
 [*Biome API]
 
@@ -1049,7 +1071,7 @@ mg_biome_np_humidity_blend (Humidity blend noise) noise_params_2d 0, 1.5, (8, 8,
 [*Mapgen V5]
 
 #    Map generation attributes specific to Mapgen v5.
-mgv5_spflags (Mapgen V5 specific flags) flags caverns caverns,nocaverns
+mgv5_spflags (Mapgen V5 specific flags) flags caverns caverns
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
 #    Value >= 10.0 completely disables generation of tunnels and avoids the
@@ -1123,7 +1145,7 @@ mgv5_np_dungeons (Dungeon noise) noise_params_3d 0.9, 0.5, (500, 500, 500), 0, 2
 #    When the 'snowbiomes' flag is enabled jungles are automatically enabled and
 #    the 'jungles' flag is ignored.
 #    The 'temples' flag disables generation of desert temples. Normal dungeons will appear instead.
-mgv6_spflags (Mapgen V6 specific flags) flags jungles,biomeblend,mudflow,snowbiomes,noflat,trees,temples jungles,biomeblend,mudflow,snowbiomes,flat,trees,temples,nojungles,nobiomeblend,nomudflow,nosnowbiomes,noflat,notrees,notemples
+mgv6_spflags (Mapgen V6 specific flags) flags jungles,biomeblend,mudflow,snowbiomes,noflat,trees,temples jungles,biomeblend,mudflow,snowbiomes,flat,trees,temples
 
 #    Deserts occur when np_biome exceeds this value.
 #    When the 'snowbiomes' flag is enabled, this is ignored.
@@ -1179,7 +1201,7 @@ mgv6_np_apple_trees (Apple trees noise) noise_params_2d 0, 1, (100, 100, 100), 3
 #    'ridges': Rivers.
 #    'floatlands': Floating land masses in the atmosphere.
 #    'caverns': Giant caves deep underground.
-mgv7_spflags (Mapgen V7 specific flags) flags mountains,ridges,nofloatlands,caverns mountains,ridges,floatlands,caverns,nomountains,noridges,nofloatlands,nocaverns
+mgv7_spflags (Mapgen V7 specific flags) flags mountains,ridges,nofloatlands,caverns mountains,ridges,floatlands,caverns
 
 #    Y of mountain density gradient zero level. Used to shift mountains vertically.
 mgv7_mount_zero_level (Mountain zero level) int 0 -31000 31000
@@ -1313,7 +1335,7 @@ mgv7_np_dungeons (Dungeon noise) noise_params_3d 0.9, 0.5, (500, 500, 500), 0, 2
 [*Mapgen Carpathian]
 
 #    Map generation attributes specific to Mapgen Carpathian.
-mgcarpathian_spflags (Mapgen Carpathian specific flags) flags caverns,norivers caverns,rivers,nocaverns,norivers
+mgcarpathian_spflags (Mapgen Carpathian specific flags) flags caverns,norivers caverns,rivers
 
 #    Defines the base ground level.
 mgcarpathian_base_level (Base ground level) float 12.0
@@ -1422,7 +1444,7 @@ mgcarpathian_np_dungeons (Dungeon noise) noise_params_3d 0.9, 0.5, (500, 500, 50
 
 #    Map generation attributes specific to Mapgen Flat.
 #    Occasional lakes and hills can be added to the flat world.
-mgflat_spflags (Mapgen Flat specific flags) flags nolakes,nohills,nocaverns lakes,hills,caverns,nolakes,nohills,nocaverns
+mgflat_spflags (Mapgen Flat specific flags) flags nolakes,nohills,nocaverns lakes,hills,caverns
 
 #    Y of flat ground.
 mgflat_ground_level (Ground level) int 8 -31000 31000
@@ -1506,7 +1528,7 @@ mgflat_np_dungeons (Dungeon noise) noise_params_3d 0.9, 0.5, (500, 500, 500), 0,
 #    Map generation attributes specific to Mapgen Fractal.
 #    'terrain' enables the generation of non-fractal terrain:
 #    ocean, islands and underground.
-mgfractal_spflags (Mapgen Fractal specific flags) flags terrain terrain,noterrain
+mgfractal_spflags (Mapgen Fractal specific flags) flags terrain terrain
 
 #    Controls width of tunnels, a smaller value creates wider tunnels.
 #    Value >= 10.0 completely disables generation of tunnels and avoids the
@@ -1640,7 +1662,7 @@ mgfractal_np_dungeons (Dungeon noise) noise_params_3d 0.9, 0.5, (500, 500, 500),
 #    'vary_river_depth': If enabled, low humidity and high heat causes rivers
 #    to become shallower and occasionally dry.
 #    'altitude_dry': Reduces humidity with altitude.
-mgvalleys_spflags (Mapgen Valleys specific flags) flags altitude_chill,humid_rivers,vary_river_depth,altitude_dry altitude_chill,humid_rivers,vary_river_depth,altitude_dry,noaltitude_chill,nohumid_rivers,novary_river_depth,noaltitude_dry
+mgvalleys_spflags (Mapgen Valleys specific flags) flags altitude_chill,humid_rivers,vary_river_depth,altitude_dry altitude_chill,humid_rivers,vary_river_depth,altitude_dry
 
 #    The vertical distance over which heat drops by 20 if 'altitude_chill' is
 #    enabled. Also, the vertical distance over which humidity drops by 10 if