Update default game (#31)

* update: xpanes

* update wool

* update walls

* update vessels

* update tnt

* update stairs

* update spawn

* update sfinv

* update sethome

* update screwdriver

* update player_api

* update map

* update give_initial_stuff

* update game_commands

* update flowers

* update fireflies

* update fire

* update dye

* update dungeon_loot

* update doors

* update creative

* update butterflies

* update bucket

* update bones

* update boats

* update binoculars

* update beds

* update default

* revert to stairs_redo

* mc brick texture

* add xpanes_space.png as dependency

beds/README.txt

@@ -15,11 +15,11 @@ BlockMen (CC BY-SA 3.0)
 TumeniNodes (CC BY-SA 3.0)
  beds_bed_under.png
 
-This mod adds a bed to Minetest which allows to skip the night.
-To sleep, rightclick the bed. If playing in singleplayer mode the night gets skipped
+This mod adds a bed to Minetest which allows players to skip the night.
+To sleep, right click on the bed. If playing in singleplayer mode the night gets skipped
 immediately. If playing multiplayer you get shown how many other players are in bed too,
 if all players are sleeping the night gets skipped. The night skip can be forced if more
-than 50% of the players are lying in bed and use this option.
+than half of the players are lying in bed and use this option.
 
 Another feature is a controlled respawning. If you have slept in bed (not just lying in
 it) your respawn point is set to the beds location and you will respawn there after

beds/api.lua

@@ -17,6 +17,8 @@ local function destruct_bed(pos, n)
 		reverse = not reverse
 		minetest.remove_node(other)
 		minetest.check_for_falling(other)
+		beds.remove_spawns_at(pos)
+		beds.remove_spawns_at(other)
 	else
 		reverse = not reverse
 	end

beds/beds.lua

@@ -1,7 +1,12 @@
+-- beds/beds.lua
+
+-- support for MT game translation.
+local S = beds.get_translator
+
 -- Fancy shaped bed
 
 beds.register_bed("beds:fancy_bed", {
-	description = "Fancy Bed",
+	description = S("Fancy Bed"),
 	inventory_image = "beds_bed_fancy.png",
 	wield_image = "beds_bed_fancy.png",
 	tiles = {
@@ -52,7 +57,7 @@ beds.register_bed("beds:fancy_bed", {
 -- Simple shaped bed
 
 beds.register_bed("beds:bed", {
-	description = "Simple Bed",
+	description = S("Simple Bed"),
 	inventory_image = "beds_bed.png",
 	wield_image = "beds_bed.png",
 	tiles = {
@@ -74,10 +79,10 @@ beds.register_bed("beds:bed", {
 		}
 	},
 	nodebox = {
-		bottom = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5},
-		top = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5},
+		bottom = {-0.5, -0.5, -0.5, 0.5, 0.0625, 0.5},
+		top = {-0.5, -0.5, -0.5, 0.5, 0.0625, 0.5},
 	},
-	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
+	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.0625, 1.5},
 	recipe = {
 		{"wool:white", "wool:white", "wool:white"},
 		{"group:wood", "group:wood", "group:wood"}

beds/depends.txt

@@ -1,2 +0,0 @@
-default
-wool

beds/functions.lua

@@ -1,11 +1,13 @@
 local pi = math.pi
-local player_in_bed = 0
 local is_sp = minetest.is_singleplayer()
 local enable_respawn = minetest.settings:get_bool("enable_bed_respawn")
 if enable_respawn == nil then
 	enable_respawn = true
 end
 
+-- support for MT game translation.
+local S = beds.get_translator
+
 -- Helper functions
 
 local function get_look_yaw(pos)
@@ -59,11 +61,8 @@ local function lay_down(player, pos, bed_pos, state, skip)
 	-- stand up
 	if state ~= nil and not state then
 		local p = beds.pos[name] or nil
-		if beds.player[name] ~= nil then
-			beds.player[name] = nil
-			beds.bed_position[name] = nil
-			player_in_bed = player_in_bed - 1
-		end
+		beds.player[name] = nil
+		beds.bed_position[name] = nil
 		-- skip here to prevent sending player specific changes (used for leaving players)
 		if skip then
 			return
@@ -75,46 +74,62 @@ local function lay_down(player, pos, bed_pos, state, skip)
 		-- physics, eye_offset, etc
 		player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
 		player:set_look_horizontal(math.random(1, 180) / 100)
-		default.player_attached[name] = false
+		player_api.player_attached[name] = false
 		player:set_physics_override(1, 1, 1)
 		hud_flags.wielditem = true
-		default.player_set_animation(player, "stand" , 30)
+		player_api.set_animation(player, "stand" , 30)
 
 	-- lay down
 	else
-		beds.player[name] = 1
 		beds.pos[name] = pos
 		beds.bed_position[name] = bed_pos
-		player_in_bed = player_in_bed + 1
+		beds.player[name] = 1
 
 		-- physics, eye_offset, etc
 		player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0})
 		local yaw, param2 = get_look_yaw(bed_pos)
 		player:set_look_horizontal(yaw)
 		local dir = minetest.facedir_to_dir(param2)
-		local p = {x = bed_pos.x + dir.x / 2, y = bed_pos.y, z = bed_pos.z + dir.z / 2}
+		-- p.y is just above the nodebox height of the 'Simple Bed' (the highest bed),
+		-- to avoid sinking down through the bed.
+		local p = {
+			x = bed_pos.x + dir.x / 2,
+			y = bed_pos.y + 0.07,
+			z = bed_pos.z + dir.z / 2
+		}
 		player:set_physics_override(0, 0, 0)
 		player:set_pos(p)
-		default.player_attached[name] = true
+		player_api.player_attached[name] = true
 		hud_flags.wielditem = false
-		default.player_set_animation(player, "lay" , 0)
+		player_api.set_animation(player, "lay" , 0)
 	end
 
 	player:hud_set_flags(hud_flags)
 end
 
+local function get_player_in_bed_count()
+	local c = 0
+	for _, _ in pairs(beds.player) do
+		c = c + 1
+	end
+	return c
+end
+
 local function update_formspecs(finished)
 	local ges = #minetest.get_connected_players()
-	local form_n
+	local player_in_bed = get_player_in_bed_count()
 	local is_majority = (ges / 2) < player_in_bed
 
+	local form_n
+	local esc = minetest.formspec_escape
 	if finished then
-		form_n = beds.formspec .. "label[2.7,9; Good morning.]"
+		form_n = beds.formspec .. "label[2.7,9;" .. esc(S("Good morning.")) .. "]"
 	else
-		form_n = beds.formspec .. "label[2.2,9;" .. tostring(player_in_bed) ..
-			" of " .. tostring(ges) .. " players are in bed]"
+		form_n = beds.formspec .. "label[2.2,9;" ..
+			esc(S("@1 of @2 players are in bed", player_in_bed, ges)) .. "]"
 		if is_majority and is_night_skip_enabled() then
-			form_n = form_n .. "button_exit[2,6;4,0.75;force;Force night skip]"
+			form_n = form_n .. "button_exit[2,6;4,0.75;force;" ..
+				esc(S("Force night skip")) .. "]"
 		end
 	end
 
@@ -146,7 +161,7 @@ function beds.on_rightclick(pos, player)
 		if beds.player[name] then
 			lay_down(player, nil, nil, false)
 		end
-		minetest.chat_send_player(name, "You can only sleep at night.")
+		minetest.chat_send_player(name, S("You can only sleep at night."))
 		return
 	end
 
@@ -223,7 +238,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	-- Because "Force night skip" button is a button_exit, it will set fields.quit
 	-- and lay_down call will change value of player_in_bed, so it must be taken
 	-- earlier.
-	local last_player_in_bed = player_in_bed
+	local last_player_in_bed = get_player_in_bed_count()
 
 	if fields.quit or fields.leave then
 		lay_down(player, nil, nil, false)

beds/init.lua

@@ -1,13 +1,20 @@
+-- beds/init.lua
+
+-- Load support for MT game translation.
+local S = minetest.get_translator("beds")
+local esc = minetest.formspec_escape
+
 beds = {}
 beds.player = {}
 beds.bed_position = {}
 beds.pos = {}
 beds.spawn = {}
+beds.get_translator = S
 
 beds.formspec = "size[8,11;true]" ..
 	"no_prepend[]" ..
 	"bgcolor[#080808BB;true]" ..
-	"button_exit[2,10;4,0.75;leave;Leave Bed]"
+	"button_exit[2,10;4,0.75;leave;" .. esc(S("Leave Bed")) .. "]"
 
 local modpath = minetest.get_modpath("beds")
 

beds/locale/beds.de.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=Schickes Bett
+Simple Bed=Schlichtes Bett
+Leave Bed=Bett verlassen
+Good morning.=Guten Morgen.
+@1 of @2 players are in bed=@1 von @2 Spielern sind im Bett
+Force night skip=Überspringen der Nacht erzwingen
+You can only sleep at night.=Sie können nur nachts schlafen.

beds/locale/beds.es.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=Cama de lujo
+Simple Bed=Cama sencilla
+Leave Bed=Abandonar cama
+Good morning.=Buenos días.
+@1 of @2 players are in bed=@1 de @2 jugadores están en cama
+Force night skip=Forzar evitar noche
+You can only sleep at night.=Sólo puedes dormir por la noche.

beds/locale/beds.fr.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=Lit chic
+Simple Bed=Lit simple
+Leave Bed=Se lever du lit
+Good morning.=Bonjour.
+@1 of @2 players are in bed=@1 joueur(s) sur @2 sont au lit
+Force night skip=Forcer le passage de la nuit
+You can only sleep at night.=Vous ne pouvez dormir que la nuit.

beds/locale/beds.it.tr

@@ -0,0 +1,4 @@
+# textdomain: beds
+Fancy Bed=Letto decorato
+Simple Bed=Letto semplice
+Leave Bed=Alzati dal letto

beds/locale/beds.ms.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=Katil Beragam
+Simple Bed=Katil Biasa
+Leave Bed=Bangun
+Good morning.=Selamat pagi.
+@1 of @2 players are in bed=@1 daripada @2 pemain sedang tidur
+Force night skip=Paksa langkau malam
+You can only sleep at night.=Anda hanya boleh tidur pada waktu malam.

beds/locale/beds.ru.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=Детализированная Кровать
+Simple Bed=Обычная Кровать
+Leave Bed=Встать с кровати
+Good morning.=Доброе утро.
+@1 of @2 players are in bed=@1 из @2 игроков в кровати
+Force night skip=Пропустить ночь
+You can only sleep at night.=Вы можете спать только ночью.

beds/locale/beds.se.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=Fin säng
+Simple Bed=Enkel Säng
+Leave Bed=Lämna Säng
+Good morning.= God morgon.
+@1 of @2 players are in bed=@1 av @2 spelar försöker sover.
+Force night skip=Tvinga över natten
+You can only sleep at night.=Du kan bara sova på natten.

beds/locale/beds.zh_CN.tr

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=花式床
+Simple Bed=简易床
+Leave Bed=离开床
+Good morning.=早安！
+@1 of @2 players are in bed=@2位玩家中的@1位在床上
+Force night skip=强制跳过夜晚
+You can only sleep at night.=你只能在晚上睡觉。

beds/locale/beds.zh_TW.tr

@@ -0,0 +1,9 @@
+# textdomain: beds
+Fancy Bed=花式床
+Simple Bed=簡易床
+Leave Bed=離開床
+Good morning.=早安！
+@1 of @2 players are in bed=@2位玩家中的@1位在床上
+Force night skip=強制跳過夜晚
+You can only sleep at night.=你只能在晚上睡覺。
+

beds/locale/template.txt

@@ -0,0 +1,8 @@
+# textdomain: beds
+Fancy Bed=
+Simple Bed=
+Leave Bed=
+Good morning.=
+@1 of @2 players are in bed=
+Force night skip=
+You can only sleep at night.=

beds/mod.conf

@@ -0,0 +1,3 @@
+name = beds
+description = Minetest Game mod: beds
+depends = default, wool

beds/spawns.lua

@@ -61,3 +61,12 @@ function beds.set_spawns()
 	end
 	beds.save_spawns()
 end
+
+function beds.remove_spawns_at(pos)
+	for name, p in pairs(beds.spawn) do
+		if vector.equals(vector.round(p), pos) then
+			beds.spawn[name] = nil
+		end
+	end
+	beds.save_spawns()
+end

binoculars/depends.txt

@@ -1,2 +0,0 @@
-default
-creative?

binoculars/init.lua

@@ -1,7 +1,12 @@
+-- binoculars/init.lua
+
 -- Mod global namespace
 
 binoculars = {}
 
+-- Load support for MT game translation.
+local S = minetest.get_translator("binoculars")
+
 
 -- Detect creative mod
 local creative_mod = minetest.get_modpath("creative")
@@ -54,7 +59,7 @@ minetest.after(4.7, cyclic_update)
 -- Binoculars item
 
 minetest.register_craftitem("binoculars:binoculars", {
-	description = "Binoculars\nUse with 'Zoom' key",
+	description = S("Binoculars") .. "\n" .. S("Use with 'Zoom' key"),
 	inventory_image = "binoculars_binoculars.png",
 	stack_max = 1,
 

binoculars/locale/binoculars.de.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Fernglas
+Use with 'Zoom' key=Mit „Zoom“-Taste benutzen

binoculars/locale/binoculars.es.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Prismáticos
+Use with 'Zoom' key=Usar con la tecla 'Zoom'

binoculars/locale/binoculars.fr.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Jumelles
+Use with 'Zoom' key=Utiliser avec le bouton « Zoom »

binoculars/locale/binoculars.it.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Binocolo
+Use with 'Zoom' key=Usalo col tasto 'Ingrandimento'

binoculars/locale/binoculars.ms.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Binokular
+Use with 'Zoom' key=Guna dengan kekunci 'Zum'

binoculars/locale/binoculars.ru.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Бинокль
+Use with 'Zoom' key=Используется с привилегией 'Zoom'

binoculars/locale/binoculars.se.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Kikare
+Use with 'Zoom' key=Används med 'Zoom' knappen

binoculars/locale/binoculars.zh_CN.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=望远镜
+Use with 'Zoom' key=与“缩放”键一起使用

binoculars/locale/binoculars.zh_TW.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=望遠鏡
+Use with 'Zoom' key=與“縮放”鍵一起使用

binoculars/locale/template.txt

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=
+Use with 'Zoom' key=

binoculars/mod.conf

@@ -0,0 +1,4 @@
+name = binoculars
+description = Minetest Game mod: binoculars
+depends = default
+optional_depends = creative

boats/depends.txt

@@ -1,2 +0,0 @@
-default
-player_api

boats/init.lua

@@ -1,3 +1,8 @@
+-- boats/init.lua
+
+-- Load support for MT game translation.
+local S = minetest.get_translator("boats")
+
 --
 -- Helper functions
 --
@@ -8,15 +13,6 @@ local function is_water(pos)
 end
 
 
-local function get_sign(i)
-	if i == 0 then
-		return 0
-	else
-		return i / math.abs(i)
-	end
-end
-
-
 local function get_velocity(v, yaw, y)
 	local x = -math.sin(yaw) * v
 	local z =  math.cos(yaw) * v
@@ -141,7 +137,7 @@ end
 
 
 function boat.on_step(self, dtime)
-	self.v = get_v(self.object:get_velocity()) * get_sign(self.v)
+	self.v = get_v(self.object:get_velocity()) * math.sign(self.v)
 	if self.driver then
 		local driver_objref = minetest.get_player_by_name(self.driver)
 		if driver_objref then
@@ -149,16 +145,16 @@ function boat.on_step(self, dtime)
 			if ctrl.up and ctrl.down then
 				if not self.auto then
 					self.auto = true
-					minetest.chat_send_player(self.driver, "[boats] Cruise on")
+					minetest.chat_send_player(self.driver, S("Boat cruise mode on"))
 				end
 			elseif ctrl.down then
-				self.v = self.v - dtime * 1.8
+				self.v = self.v - dtime * 2.0
 				if self.auto then
 					self.auto = false
-					minetest.chat_send_player(self.driver, "[boats] Cruise off")
+					minetest.chat_send_player(self.driver, S("Boat cruise mode off"))
 				end
 			elseif ctrl.up or self.auto then
-				self.v = self.v + dtime * 1.8
+				self.v = self.v + dtime * 2.0
 			end
 			if ctrl.left then
 				if self.v < -0.001 then
@@ -180,15 +176,14 @@ function boat.on_step(self, dtime)
 		self.object:set_pos(self.object:get_pos())
 		return
 	end
-	local s = get_sign(self.v)
-	self.v = self.v - dtime * 0.6 * s
-	if s ~= get_sign(self.v) then
-		self.object:set_velocity({x = 0, y = 0, z = 0})
+	-- We need to preserve velocity sign to properly apply drag force
+	-- while moving backward
+	local drag = dtime * math.sign(self.v) * (0.01 + 0.0796 * self.v * self.v)
+	-- If drag is larger than velocity, then stop horizontal movement
+	if math.abs(self.v) <= math.abs(drag) then
 		self.v = 0
-		return
-	end
-	if math.abs(self.v) > 5 then
-		self.v = 5 * get_sign(self.v)
+	else
+		self.v = self.v - drag
 	end
 
 	local p = self.object:get_pos()
@@ -242,7 +237,7 @@ minetest.register_entity("boats:boat", boat)
 
 
 minetest.register_craftitem("boats:boat", {
-	description = "Boat",
+	description = S("Boat"),
 	inventory_image = "boats_inventory.png",
 	wield_image = "boats_wield.png",
 	wield_scale = {x = 2, y = 2, z = 1},

boats/locale/boats.de.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Schneller Bootsmodus an
+Boat cruise mode off=Schneller Bootsmodus aus
+Boat=Boot

boats/locale/boats.es.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Modo crucero en bote activado
+Boat cruise mode off=Modo crucero en bote desactivado
+Boat=Bote

boats/locale/boats.fr.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Bateau mode rapide activé
+Boat cruise mode off=Bateau mode rapide désactivé
+Boat=Bateau

boats/locale/boats.it.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Modalità movimento automatico barca attivata
+Boat cruise mode off=Modalità movimento automatico barca disattivata
+Boat=Barca

boats/locale/boats.ms.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Mod bot layar makan angin dibolehkan
+Boat cruise mode off=Mod bot layar makan angin dilumpuhkan
+Boat=Bot

boats/locale/boats.ru.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Режим путешествия на лодке включен
+Boat cruise mode off=Режим путешествия на лодке выключен
+Boat=Лодка

boats/locale/boats.se.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Båtkryssningsläge på
+Boat cruise mode off=Båtkryssningsläge av
+Boat=Båt

boats/locale/boats.zh_CN.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=巡航模式开启
+Boat cruise mode off=巡航模式关闭
+Boat=船

boats/locale/boats.zh_TW.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=巡航模式開啟
+Boat cruise mode off=巡航模式關閉
+Boat=船

boats/locale/template.txt

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=
+Boat cruise mode off=
+Boat=

boats/mod.conf

@@ -0,0 +1,3 @@
+name = boats
+description = Minetest Game mod: boats
+depends = default, player_api

bones/depends.txt

@@ -1 +0,0 @@
-default

bones/init.lua

@@ -1,6 +1,11 @@
+-- bones/init.lua
+
 -- Minetest 0.4 mod: bones
 -- See README.txt for licensing and other information.
 
+-- Load support for MT game translation.
+local S = minetest.get_translator("bones")
+
 bones = {}
 
 local function is_owner(pos, name)
@@ -24,7 +29,7 @@ local share_bones_time = tonumber(minetest.settings:get("share_bones_time")) or
 local share_bones_time_early = tonumber(minetest.settings:get("share_bones_time_early")) or share_bones_time / 4
 
 minetest.register_node("bones:bones", {
-	description = "Bones",
+	description = S("Bones"),
 	tiles = {
 		"bones_top.png^[transform2",
 		"bones_bottom.png",
@@ -116,7 +121,7 @@ minetest.register_node("bones:bones", {
 		local meta = minetest.get_meta(pos)
 		local time = meta:get_int("time") + elapsed
 		if time >= share_bones_time then
-			meta:set_string("infotext", meta:get_string("owner") .. "'s old bones")
+			meta:set_string("infotext", S("@1's old bones", meta:get_string("owner")))
 			meta:set_string("owner", "")
 		else
 			meta:set_int("time", time)
@@ -194,7 +199,7 @@ minetest.register_on_dieplayer(function(player)
 		minetest.log("action", player_name .. " dies at " .. pos_string ..
 			". No bones placed")
 		if bones_position_message then
-			minetest.chat_send_player(player_name, player_name .. " died at " .. pos_string .. ".")
+			minetest.chat_send_player(player_name, S("@1 died at @2.", player_name, pos_string))
 		end
 		return
 	end
@@ -204,7 +209,7 @@ minetest.register_on_dieplayer(function(player)
 		minetest.log("action", player_name .. " dies at " .. pos_string ..
 			". No bones placed")
 		if bones_position_message then
-			minetest.chat_send_player(player_name, player_name .. " died at " .. pos_string .. ".")
+			minetest.chat_send_player(player_name, S("@1 died at @2.", player_name, pos_string))
 		end
 		return
 	end
@@ -230,8 +235,7 @@ minetest.register_on_dieplayer(function(player)
 		minetest.log("action", player_name .. " dies at " .. pos_string ..
 			". Inventory dropped")
 		if bones_position_message then
-			minetest.chat_send_player(player_name, player_name .. " died at " .. pos_string ..
-				", and dropped their inventory.")
+			minetest.chat_send_player(player_name, S("@1 died at @2, and dropped their inventory.", player_name, pos_string))
 		end
 		return
 	end
@@ -242,8 +246,7 @@ minetest.register_on_dieplayer(function(player)
 	minetest.log("action", player_name .. " dies at " .. pos_string ..
 		". Bones placed")
 	if bones_position_message then
-		minetest.chat_send_player(player_name, player_name .. " died at " .. pos_string ..
-			", and bones were placed.")
+		minetest.chat_send_player(player_name, S("@1 died at @2, and bones were placed.", player_name, pos_string))
 	end
 
 	local meta = minetest.get_meta(pos)
@@ -266,7 +269,7 @@ minetest.register_on_dieplayer(function(player)
 	meta:set_string("owner", player_name)
 
 	if share_bones_time ~= 0 then
-		meta:set_string("infotext", player_name .. "'s fresh bones")
+		meta:set_string("infotext", S("@1's fresh bones", player_name))
 
 		if share_bones_time_early == 0 or not minetest.is_protected(pos, player_name) then
 			meta:set_int("time", 0)
@@ -276,6 +279,6 @@ minetest.register_on_dieplayer(function(player)
 
 		minetest.get_node_timer(pos):start(10)
 	else
-		meta:set_string("infotext", player_name.."'s bones")
+		meta:set_string("infotext", S("@1's bones", player_name))
 	end
 end)

bones/locale/bones.de.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Knochen
+@1's old bones=Alte Knochen von @1
+@1 died at @2.=@1 starb bei @2.
+@1 died at @2, and dropped their inventory.=@1 starb bei @2 und ließ das Inventar fallen.
+@1 died at @2, and bones were placed.=@1 starb bei @2 und Knochen wurden platziert.
+@1's fresh bones=Frische Knochen von @1
+@1's bones=Knochen von @1

bones/locale/bones.es.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Huesos
+@1's old bones=Huesos antiguos de @1
+@1 died at @2.=@1 murió en @2.
+@1 died at @2, and dropped their inventory.=@1 murió en @2, y su inventario se desprendió.
+@1 died at @2, and bones were placed.=@1 murió en @2, y sus huesos fueron depositados.
+@1's fresh bones=Huesos recientes de @1
+@1's bones=Huesos de @1

bones/locale/bones.fr.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Os
+@1's old bones=Vieux os de @1
+@1 died at @2.=@1 est mort à @2.
+@1 died at @2, and dropped their inventory.=@1 est mort à @2 et a laissé tomber son inventaire.
+@1 died at @2, and bones were placed.=@1 est mort à @2 et ses os ont été placés.
+@1's fresh bones=Os frais de @1
+@1's bones=Os de @1

bones/locale/bones.it.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Ossa
+@1's old bones=Ossa vecchie di @1
+@1 died at @2.=@1 è morto alla posizione @2.
+@1 died at @2, and dropped their inventory.=@1 è morto alla posizione @2, e ha lasciato a terra il contenuto del suo inventario.
+@1 died at @2, and bones were placed.=@1 è morto alla posizione @2, e vi sono state posizionate delle ossa.
+@1's fresh bones=Ossa fresche di @1
+@1's bones=Ossa di @1

bones/locale/bones.ms.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Tulang
+@1's old bones=Tulang lama @1
+@1 died at @2.=@1 mati di @2.
+@1 died at @2, and dropped their inventory.=@1 mati di @2, dan menjatuhkan inventorinya.
+@1 died at @2, and bones were placed.=@1 mati di @2, dan tulang diletakkan.
+@1's fresh bones=Tulang segar @1
+@1's bones=Tulang @1

bones/locale/bones.ru.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Кости
+@1's old bones=Старые кости @1
+@1 died at @2.=@1 умер в @2.
+@1 died at @2, and dropped their inventory.=@1 умер в @2 и потерял содержимое своего инвентаря. 
+@1 died at @2, and bones were placed.=@1 умер в @2, помещены кости.
+@1's fresh bones=новые кости @1
+@1's bones=кости @1

bones/locale/bones.se.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Ben
+@1's old bones=@1s Gamla ben
+@1 died at @2.=@1 dog på @a.
+@1 died at @2, and dropped their inventory.=@1 dog på @a, och tappade deras saker.
+@1 died at @2, and bones were placed.=@1 dog på @2, och deras ben var placerade.
+@1's fresh bones=@1s färska ben
+@1's bones=@1s ben

bones/locale/bones.zh_CN.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=骨骸
+@1's old bones=@1的旧骨骸
+@1 died at @2.=@1在@2死亡。
+@1 died at @2, and dropped their inventory.=@1在@2死亡，丢掉了物品栏。
+@1 died at @2, and bones were placed.=@1在@2死亡，骨骸被放置。
+@1's fresh bones=@1的新鲜骨骸
+@1's bones=@1的骨骸

bones/locale/bones.zh_TW.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=骨骸
+@1's old bones=@1的舊骨骸
+@1 died at @2.=@1在@2死亡。
+@1 died at @2, and dropped their inventory.=@1在@2死亡，丟掉了物品欄。
+@1 died at @2, and bones were placed.=@1在@2死亡，骨骸被放置。
+@1's fresh bones=@1的新鮮骨骸
+@1's bones=@1的骨骸

bones/locale/template.txt

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=
+@1's old bones=
+@1 died at @2.=
+@1 died at @2, and dropped their inventory.=
+@1 died at @2, and bones were placed.=
+@1's fresh bones=
+@1's bones=

bones/mod.conf

@@ -0,0 +1,3 @@
+name = bones
+description = Minetest Game mod: bones
+depends = default

bucket/depends.txt

@@ -1,2 +0,0 @@
-default
-

bucket/init.lua

@@ -1,15 +1,19 @@
 -- Minetest 0.4 mod: bucket
 -- See README.txt for licensing and other information.
 
+-- Load support for MT game translation.
+local S = minetest.get_translator("bucket")
+
+
 minetest.register_alias("bucket", "bucket:bucket_empty")
 minetest.register_alias("bucket_water", "bucket:bucket_water")
 minetest.register_alias("bucket_lava", "bucket:bucket_lava")
 
 minetest.register_craft({
-	output = 'bucket:bucket_empty 1',
+	output = "bucket:bucket_empty 1",
 	recipe = {
-		{'default:steel_ingot', '', 'default:steel_ingot'},
-		{'', 'default:steel_ingot', ''},
+		{"default:steel_ingot", "", "default:steel_ingot"},
+		{"", "default:steel_ingot", ""},
 	}
 })
 
@@ -111,9 +115,9 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 end
 
 minetest.register_craftitem("bucket:bucket_empty", {
-	description = "Empty Bucket",
+	description = S("Empty Bucket"),
 	inventory_image = "bucket.png",
-	stack_max = 99,
+	groups = {tool = 1},
 	liquids_pointable = true,
 	on_use = function(itemstack, user, pointed_thing)
 		if pointed_thing.type == "object" then
@@ -185,8 +189,8 @@ bucket.register_liquid(
 	"default:water_flowing",
 	"bucket:bucket_water",
 	"bucket_water.png",
-	"Water Bucket",
-	{water_bucket = 1}
+	S("Water Bucket"),
+	{tool = 1, water_bucket = 1}
 )
 
 -- River water source is 'liquid_renewable = false' to avoid horizontal spread
@@ -200,8 +204,8 @@ bucket.register_liquid(
 	"default:river_water_flowing",
 	"bucket:bucket_river_water",
 	"bucket_river_water.png",
-	"River Water Bucket",
-	{water_bucket = 1},
+	S("River Water Bucket"),
+	{tool = 1, water_bucket = 1},
 	true
 )
 
@@ -210,7 +214,8 @@ bucket.register_liquid(
 	"default:lava_flowing",
 	"bucket:bucket_lava",
 	"bucket_lava.png",
-	"Lava Bucket"
+	S("Lava Bucket"),
+	{tool = 1}
 )
 
 minetest.register_craft({
@@ -220,3 +225,16 @@ minetest.register_craft({
 	replacements = {{"bucket:bucket_lava", "bucket:bucket_empty"}},
 })
 
+-- Register buckets as dungeon loot
+if minetest.global_exists("dungeon_loot") then
+	dungeon_loot.register({
+		{name = "bucket:bucket_empty", chance = 0.55},
+		-- water in deserts/ice or above ground, lava otherwise
+		{name = "bucket:bucket_water", chance = 0.45,
+			types = {"sandstone", "desert", "ice"}},
+		{name = "bucket:bucket_water", chance = 0.45, y = {0, 32768},
+			types = {"normal"}},
+		{name = "bucket:bucket_lava", chance = 0.45, y = {-32768, -1},
+			types = {"normal"}},
+	})
+end

bucket/locale/bucket.de.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Leerer Eimer
+Water Bucket=Wassereimer
+River Water Bucket=Flusswassereimer
+Lava Bucket=Lavaeimer

bucket/locale/bucket.es.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Cubo vacío
+Water Bucket=Cubo con agua
+River Water Bucket=Cubo con agua de río
+Lava Bucket=Cubo con lava

bucket/locale/bucket.fr.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Seau vide
+Water Bucket=Seau d'eau
+River Water Bucket=Seau d'eau de rivière
+Lava Bucket=Seau de lave

bucket/locale/bucket.it.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Secchio vuoto
+Water Bucket=Secchio d'acqua
+River Water Bucket=Secchio d'acqua di fiume
+Lava Bucket=Secchio di lava

bucket/locale/bucket.ms.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Baldi Kosong
+Water Bucket=Baldi Air
+River Water Bucket=Baldi Air Sungai
+Lava Bucket=Baldi Lava

bucket/locale/bucket.ru.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Пустое Ведро
+Water Bucket=Ведро с Водой
+River Water Bucket=Ведро с Речной Водой
+Lava Bucket=Ведро с Лавой

bucket/locale/bucket.se.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Tom hink
+Water Bucket=Vatten hink
+River Water Bucket=Flodvatten hink
+Lava Bucket=Lava hink

bucket/locale/bucket.zh_CN.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=空桶
+Water Bucket=水桶
+River Water Bucket=河水桶
+Lava Bucket=岩浆桶

bucket/locale/bucket.zh_TW.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=空桶
+Water Bucket=水桶
+River Water Bucket=河水桶
+Lava Bucket=岩漿桶

bucket/locale/template.txt

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=
+Water Bucket=
+River Water Bucket=
+Lava Bucket=

bucket/mod.conf

@@ -0,0 +1,4 @@
+name = bucket
+description = Minetest Game mod: bucket
+depends = default
+optional_depends = dungeon_loot

butterflies/depends.txt

@@ -1,2 +0,0 @@
-default
-flowers

butterflies/init.lua

@@ -1,8 +1,13 @@
+-- butterflies/init.lua
+
+-- Load support for MT game translation.
+local S = minetest.get_translator("butterflies")
+
 -- register butterflies
 local butter_list = {
-	{"white", "White"},
-	{"red", "Red"},
-	{"violet", "Violet"}
+	{"white",  S("White Butterfly")},
+	{"red",    S("Red Butterfly")},
+	{"violet", S("Violet Butterfly")}
 }
 
 for i in ipairs (butter_list) do
@@ -10,7 +15,7 @@ for i in ipairs (butter_list) do
 	local desc = butter_list[i][2]
 
 	minetest.register_node("butterflies:butterfly_"..name, {
-		description = desc.." Butterfly",
+		description = desc,
 		drawtype = "plantlike",
 		tiles = {{
 			name = "butterflies_butterfly_"..name.."_animated.png",
@@ -56,10 +61,9 @@ for i in ipairs (butter_list) do
 	})
 
 	minetest.register_node("butterflies:hidden_butterfly_"..name, {
-		description = "Hidden "..desc.." Butterfly",
 		drawtype = "airlike",
-		inventory_image = "insects_butterfly_"..name..".png",
-		wield_image =  "insects_butterfly_"..name..".png",
+		inventory_image = "butterflies_butterfly_"..name..".png",
+		wield_image =  "butterflies_butterfly_"..name..".png",
 		paramtype = "light",
 		sunlight_propagates = true,
 		walkable = false,
@@ -98,7 +102,7 @@ minetest.register_decoration({
 	place_offset_y = 2,
 	sidelen = 80,
 	fill_ratio = 0.005,
-	biomes = {"grassland", "deciduous_forest", "floatland_grassland"},
+	biomes = {"grassland", "deciduous_forest"},
 	y_max = 31000,
 	y_min = 1,
 	decoration = {