Add specific groups to different types of grass (#2852)

This happened when the same item was visible twice and one of them was a
group item. Fix it by ensuring that buttons that should have different
tooltips don't have the same element name.

game.conf

@@ -1,3 +1,3 @@
 name = Minetest Game
 author = Minetest
-description = Bundled by default with Minetest, and aims to be lightweight, moddable, and fairly playable without mods.
+description = A basic exploration, mining, crafting and building sandbox game with no NPCs, monsters or animals. Minetest Game is usually used with mods added and many mods are available for this game. Reliably maintained by Minetest Engine core developers.

game_api.txt

@@ -93,16 +93,21 @@ For example,
 is used to show all tools. Name is used in the sfinv page name, title is the
 human readable title.
 
-`is_enabled_for` is used to check whether a player is in creative mode:
+Creative provides `creative.is_enabled_for(name)`, which is identical in
-
+functionality to the engine's `minetest.creative_is_enabled(name)`.
-    creative.is_enabled_for(name)
+Its use is deprecated and it should also not be overriden.
-
-Override this to allow per-player game modes.
 
 The contents of `creative.formspec_add` is appended to every creative inventory
 page. Mods can use it to add additional formspec elements onto the default
 creative inventory formspec to be drawn after each update.
 
+Group overrides can be used for any registered item, node or tool. Use one of
+the groups stated below to pick which category it will appear in.
+
+	node = 1      -- Appears in the Nodes category
+	tool = 1      -- Appears in the Tools category
+	craftitem = 1 -- Appears in the Items category
+
 
 Chests API
 ----------
@@ -129,12 +134,12 @@ The chests API allows the creation of chests, which have their own inventories f
  * A table indexed by player name to keep track of who opened what chest.
  * Key: The name of the player.
  * Value: A table containing information about the chest the player is looking at.
-   e.g `{ pos = {1, 1, 1}, sound = null, swap = "chest" }`
+   e.g `{ pos = {1, 1, 1}, sound = null, swap = "default:chest" }`
 
 `default.chest.register_chest(name, def)`
 
  * Registers new chest
- * `name` Name for chest
+ * `name` Name for chest e.g. "default:chest"
  * `def`  See [#Chest Definition]
 
 ### Chest Definition
@@ -421,54 +426,56 @@ Give Initial Stuff API
 ^ Adds items to the list of items to be given
 
 
-Players API
+Player API
------------
+----------
 
 The player API can register player models and update the player's appearance.
 
 * `player_api.register_model(name, def)`
 	* Register a new model to be used by players
-	* name: model filename such as "character.x", "foo.b3d", etc.
+	* `name`: model filename such as "character.x", "foo.b3d", etc.
-	* def: See [#Model definition]
+	* `def`: see [#Model definition]
-    * saved to player_api.registered_models
+    * Saved to player_api.registered_models
 
-* `player_api.registered_player_models[name]`
+* `player_api.registered_models[name]`
 	* Get a model's definition
-	 * see [#Model definition]
+	* `name`: model filename
+	* See [#Model definition]
 
 * `player_api.set_model(player, model_name)`
 	* Change a player's model
 	* `player`: PlayerRef
 	* `model_name`: model registered with player_api.register_model()
 
-* `player_api.set_animation(player, anim_name [, speed])`
+* `player_api.set_animation(player, anim_name, speed)`
 	* Applies an animation to a player
-	* anim_name: name of the animation.
+	* `player`: PlayerRef
-	* speed: frames per second. If nil, default from the model is used
+	* `anim_name`: name of the animation
+	* `speed`: frames per second. If nil, the default from the model def is used
 
 * `player_api.set_textures(player, textures)`
 	* Sets player textures
 	* `player`: PlayerRef
-	* `textures`: array of textures, If `textures` is nil the default
+	* `textures`: array of textures. If nil, the default from the model def is used
-	  textures from the model def are used
 
 * `player_api.get_animation(player)`
-	* Returns a table containing fields `model`, `textures` and `animation`.
+	* Returns a table containing fields `model`, `textures` and `animation`
-	* Any of the fields of the returned table may be nil.
+	* Any of the fields of the returned table may be nil
-	* player: PlayerRef
+	* `player`: PlayerRef
 
 * `player_api.player_attached`
-	* A table that maps a player name to a boolean.
+	* A table that maps a player name to a boolean
-	* If the value for a given player is set to true, the default player
+	* If the value for a given player is set to true, the default player animations
-	animations (walking, digging, ...) will no longer be updated.
+	  (walking, digging, ...) will no longer be updated, and knockback from damage is
-	Knockback from damage is also prevented for that player.
+	  prevented for that player
+	* Example of usage: A mod sets a player's value to true when attached to a vehicle
 
 ### Model Definition
 
 	{
-		animation_speed = 30,            -- Default animation speed, in FPS.
+		animation_speed = 30,           -- Default animation speed, in FPS
-		textures = {"character.png", },  -- Default array of textures.
+		textures = {"character.png", }, -- Default array of textures
-		visual_size = {x = 1, y = 1},    -- Used to scale the model.
+		visual_size = {x = 1, y = 1},   -- Used to scale the model
 		animations = {
 			-- <anim_name> = {x = <start_frame>, y = <end_frame>},
 			foo = {x = 0, y = 19},
@@ -758,12 +765,18 @@ delivered with Minetest Game, to keep them compatible with other mods.
  * `worldaligntex`: A bool to set all textures world-aligned. Default false. See [Tile definition]
  * `full_description`: Overrides the description, bypassing string concatenation. This is useful for translation. (optional)
 
-`stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab, sounds, worldaligntex)`
+```
+stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab,
+	sounds, worldaligntex, desc_stair_inner, desc_stair_outer)
+```
 
  * A wrapper for stairs.register_stair, stairs.register_slab, stairs.register_stair_inner, stairs.register_stair_outer
  * Uses almost the same arguments as stairs.register_stair
- * `desc_stair`: Description for stair nodes. For corner stairs 'Inner' or 'Outer' will be prefixed
+ * `desc_stair`: Description for stair nodes. For corner stairs 'Inner' or 'Outer' will be prefixed unless
+ 	`desc_stair_inner` or `desc_stair_outer` are specified, which are used instead.
  * `desc_slab`: Description for slab node
+ * `desc_stair_inner`: Description for inner stair node
+ * `desc_stair_outer`: Description for outer stair node
 
 
 Xpanes API

mods/beds/api.lua

@@ -31,6 +31,7 @@ function beds.register_bed(name, def)
 		wield_image = def.wield_image,
 		drawtype = "nodebox",
 		tiles = def.tiles.bottom,
+		use_texture_alpha = "clip",
 		paramtype = "light",
 		paramtype2 = "facedir",
 		is_ground_content = false,
@@ -95,8 +96,7 @@ function beds.register_bed(name, def)
 			minetest.set_node(pos, {name = name .. "_bottom", param2 = dir})
 			minetest.set_node(botpos, {name = name .. "_top", param2 = dir})
 
-			if not (creative and creative.is_enabled_for
+			if not minetest.is_creative_enabled(player_name) then
-					and creative.is_enabled_for(player_name)) then
 				itemstack:take_item()
 			end
 			return itemstack
@@ -151,11 +151,13 @@ function beds.register_bed(name, def)
 	minetest.register_node(name .. "_top", {
 		drawtype = "nodebox",
 		tiles = def.tiles.top,
+		use_texture_alpha = "clip",
 		paramtype = "light",
 		paramtype2 = "facedir",
 		is_ground_content = false,
 		pointable = false,
-		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2},
+		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2,
+				not_in_creative_inventory = 1},
 		sounds = def.sounds or default.node_sound_wood_defaults(),
 		drop = name .. "_bottom",
 		node_box = {

mods/beds/functions.lua

@@ -60,30 +60,56 @@ 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 not beds.player[name] then
-		beds.player[name] = nil
+			-- player not in bed, do nothing
+			return false
+		end
 		beds.bed_position[name] = nil
 		-- skip here to prevent sending player specific changes (used for leaving players)
 		if skip then
 			return
 		end
-		if p then
+		player:set_pos(beds.pos[name])
-			player:set_pos(p)
-		end
 
 		-- physics, eye_offset, etc
+		local physics_override = beds.player[name].physics_override
+		beds.player[name] = nil
+		player:set_physics_override({
+			speed = physics_override.speed,
+			jump = physics_override.jump,
+			gravity = physics_override.gravity
+		})
 		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
+
+		-- Check if bed is occupied
+		for _, other_pos in pairs(beds.bed_position) do
+			if vector.distance(bed_pos, other_pos) < 0.1 then
+				minetest.chat_send_player(name, S("This bed is already occupied!"))
+				return false
+			end
+		end
+
+		-- Check if player is moving
+		if vector.length(player:get_velocity()) > 0.001 then
+			minetest.chat_send_player(name, S("You have to stop moving before going to bed!"))
+			return false
+		end
+
+		if beds.player[name] then
+			-- player already in bed, do nothing
+			return false
+		end
+
 		beds.pos[name] = pos
 		beds.bed_position[name] = bed_pos
-		beds.player[name] = 1
+		beds.player[name] = {physics_override = player:get_physics_override()}
 
 		-- physics, eye_offset, etc
 		player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0})
@@ -97,11 +123,11 @@ local function lay_down(player, pos, bed_pos, state, skip)
 			y = bed_pos.y + 0.07,
 			z = bed_pos.z + dir.z / 2
 		}
-		player:set_physics_override(0, 0, 0)
+		player:set_physics_override({speed = 0, jump = 0, gravity = 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)
@@ -230,6 +256,19 @@ minetest.register_on_leaveplayer(function(player)
 	end
 end)
 
+minetest.register_on_dieplayer(function(player)
+	local name = player:get_player_name()
+	local in_bed = beds.player
+	local pos = player:get_pos()
+	local yaw = get_look_yaw(pos)
+
+	if in_bed[name] then
+		lay_down(player, nil, pos, false)
+		player:set_look_horizontal(yaw)
+		player:set_pos(pos)
+	end
+end)
+
 minetest.register_on_player_receive_fields(function(player, formname, fields)
 	if formname ~= "beds_form" then
 		return

mods/beds/locale/beds.de.tr

@@ -1,8 +1,10 @@
 # textdomain: beds
 Fancy Bed=Schickes Bett
 Simple Bed=Schlichtes Bett
-Leave Bed=Bett verlassen
+This bed is already occupied!=Dieses Bett ist bereits belegt!
+You have to stop moving before going to bed!=Sie müssen stehen bleiben, bevor Sie zu Bett gehen können!
 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.
+Leave Bed=Bett verlassen

mods/beds/locale/beds.es.tr

@@ -1,8 +1,10 @@
 # textdomain: beds
 Fancy Bed=Cama de lujo
 Simple Bed=Cama sencilla
-Leave Bed=Abandonar cama
+This bed is already occupied!=Esta cama esta ocupada
+You have to stop moving before going to bed!=Deja de moverte o no podras acostarte
 Good morning.=Buenos días.
-@1 of @2 players are in bed=@1 de @2 jugadores están en cama
+@1 of @2 players are in bed=@1 de @2 jugadores están durmiendo
-Force night skip=Forzar evitar noche
+Force night skip=Forzar hacer de dia
 You can only sleep at night.=Sólo puedes dormir por la noche.
+Leave Bed=Levantarse 

mods/beds/locale/beds.fr.tr

@@ -1,8 +1,10 @@
 # textdomain: beds
 Fancy Bed=Lit chic
 Simple Bed=Lit simple
-Leave Bed=Se lever du lit
+This bed is already occupied!=
+You have to stop moving before going to bed!=
 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.
+Leave Bed=Se lever du lit

mods/beds/locale/beds.id.tr

@@ -0,0 +1,10 @@
+# textdomain: beds
+Fancy Bed=Ranjang Mewah
+Simple Bed=Ranjang Sederhana
+This bed is already occupied!=
+You have to stop moving before going to bed!=
+Good morning.=Selamat pagi.
+@1 of @2 players are in bed=@1 dari @2 pemain sedang tidur
+Force night skip=Paksa lewati malam
+You can only sleep at night.=Anda hanya dapat tidur pada waktu malam.
+Leave Bed=Tinggalkan Ranjang

mods/beds/locale/beds.it.tr

@@ -1,4 +1,10 @@
 # textdomain: beds
 Fancy Bed=Letto decorato
 Simple Bed=Letto semplice
+This bed is already occupied!=
+You have to stop moving before going to bed!=
+Good morning.=
+@1 of @2 players are in bed=
+Force night skip=
+You can only sleep at night.=
 Leave Bed=Alzati dal letto

mods/beds/locale/beds.jbo.tr

@@ -0,0 +1,10 @@
+# textdomain: beds
+Fancy Bed=lo selja'i ckana
+Simple Bed=lo sampu ckana
+This bed is already occupied!=.i lo ti ckana cu canlu
+You have to stop moving before going to bed!=lo nu do cando cu sarcu lo nu do sipna
+Good morning.=.i .uise'inai cerni
+@1 of @2 players are in bed=.i @1 cmima be lu'i @2 le pilno cu vreta lo ckana
+Force night skip=bapli le nu co'u nicte
+You can only sleep at night.=.i steci le ka nicte kei fa le ka do kakne le ka sipna ca pa ckaji be ce'u
+Leave Bed=cliva lo ckana

mods/beds/locale/beds.ms.tr

@@ -1,8 +1,10 @@
 # textdomain: beds
 Fancy Bed=Katil Beragam
 Simple Bed=Katil Biasa
-Leave Bed=Bangun
+This bed is already occupied!=
+You have to stop moving before going to bed!=
 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.
+Leave Bed=Bangun

mods/beds/locale/beds.pt_BR.tr

@@ -0,0 +1,10 @@
+# textdomain: beds
+Fancy Bed=Cama Bonita
+Simple Bed=Cama Simples
+This bed is already occupied!=Esta cama já está ocupada!
+You have to stop moving before going to bed!=Você precisa parar de se mover antes de ir para cama!
+Good morning.=Bom dia.
+@1 of @2 players are in bed=@1 de @2 jogadores estão na cama
+Force night skip=Forçar o amanhecer
+You can only sleep at night.=Você só pode dormir à noite
+Leave Bed=Sair da Cama

mods/beds/locale/beds.ru.tr

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

mods/beds/locale/beds.se.tr

@@ -1,8 +1,10 @@
 # textdomain: beds
 Fancy Bed=Fin säng
 Simple Bed=Enkel Säng
-Leave Bed=Lämna Säng
+This bed is already occupied!=
+You have to stop moving before going to bed!=
 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.
+Leave Bed=Lämna Säng

mods/beds/locale/beds.sk.tr

@@ -0,0 +1,10 @@
+# textdomain: beds
+Fancy Bed=Pekná posteľ
+Simple Bed=Jednoduchá posteľ
+This bed is already occupied!=
+You have to stop moving before going to bed!=
+Good morning.=Dobré ráno.
+@1 of @2 players are in bed=@1 z @2 hráčov sú v posteli
+Force night skip=Nútene preskočiť noc
+You can only sleep at night.=Môžeš spať len v noci.
+Leave Bed=Opusti posteľ

mods/beds/locale/beds.zh_CN.tr

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

mods/beds/locale/beds.zh_TW.tr

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

mods/beds/locale/template.txt

@@ -1,8 +1,10 @@
 # textdomain: beds
 Fancy Bed=
 Simple Bed=
-Leave Bed=
+This bed is already occupied!=
+You have to stop moving before going to bed!=
 Good morning.=
 @1 of @2 players are in bed=
 Force night skip=
 You can only sleep at night.=
+Leave Bed=

mods/binoculars/init.lua

@@ -8,25 +8,16 @@ binoculars = {}
 local S = minetest.get_translator("binoculars")
 
 
--- Detect creative mod
-local creative_mod = minetest.get_modpath("creative")
--- Cache creative mode setting as fallback if creative mod not present
-local creative_mode_cache = minetest.settings:get_bool("creative_mode")
-
-
 -- Update player property
 -- Global to allow overriding
 
 function binoculars.update_player_property(player)
-	local creative_enabled =
-		(creative_mod and creative.is_enabled_for(player:get_player_name())) or
-		creative_mode_cache
 	local new_zoom_fov = 0
 
 	if player:get_inventory():contains_item(
 			"main", "binoculars:binoculars") then
 		new_zoom_fov = 10
-	elseif creative_enabled then
+	elseif minetest.is_creative_enabled(player:get_player_name()) then
 		new_zoom_fov = 15
 	end
 

mods/binoculars/locale/binoculars.id.tr

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

mods/binoculars/locale/binoculars.jbo.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=lo reldarvistci
+Use with 'Zoom' key=.i tu'a le jvinu banro batke cu tadji lo nu pilno

mods/binoculars/locale/binoculars.pt_BR.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Binóculos
+Use with 'Zoom' key=Use com a tecla de 'Zoom'

mods/binoculars/locale/binoculars.sk.tr

@@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Ďalekohľad
+Use with 'Zoom' key=Použi s klávesou "Priblíž"

mods/binoculars/mod.conf

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

mods/boats/init.lua

@@ -119,8 +119,7 @@ function boat.on_punch(self, puncher)
 	if not self.driver then
 		self.removed = true
 		local inv = puncher:get_inventory()
-		if not (creative and creative.is_enabled_for
+		if not minetest.is_creative_enabled(name)
-				and creative.is_enabled_for(name))
 				or not inv:contains_item("main", "boats:boat") then
 			local leftover = inv:add_item("main", "boats:boat")
 			-- if no room in inventory add a replacement boat to the world
@@ -172,7 +171,8 @@ function boat.on_step(self, dtime)
 		end
 	end
 	local velo = self.object:get_velocity()
-	if self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
+	if not self.driver and
+			self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
 		self.object:set_pos(self.object:get_pos())
 		return
 	end
@@ -268,8 +268,7 @@ minetest.register_craftitem("boats:boat", {
 				boat:set_yaw(placer:get_look_horizontal())
 			end
 			local player_name = placer and placer:get_player_name() or ""
-			if not (creative and creative.is_enabled_for and
+			if not minetest.is_creative_enabled(player_name) then
-					creative.is_enabled_for(player_name)) then
 				itemstack:take_item()
 			end
 		end

mods/boats/locale/boats.id.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Mode perahu jelajah nyala
+Boat cruise mode off=Mode perahu jelajah mati
+Boat=Perahu

mods/boats/locale/boats.jbo.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=.i lo bloti cu zmiku le ka klama
+Boat cruise mode off=.i lo bloti cu macnu le ka klama
+Boat=lo bloti

mods/boats/locale/boats.pt_BR.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Modo de cruseiro do barco ligado
+Boat cruise mode off=Modo de cruseiro do barco desligado
+Boat=Barco

mods/boats/locale/boats.sk.tr

@@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Cestovný režim loďky zapnutý
+Boat cruise mode off=Cestovný režim loďky vypnutý
+Boat=Loďka

mods/bones/init.lua

@@ -141,8 +141,18 @@ local function may_replace(pos, player)
 		return false
 	end
 
-	-- allow replacing air and liquids
+	-- allow replacing air
-	if node_name == "air" or node_definition.liquidtype ~= "none" then
+	if node_name == "air" then
+		return true
+	end
+
+	-- don't replace nodes inside protections
+	if minetest.is_protected(pos, player:get_player_name()) then
+		return false
+	end
+
+	-- allow replacing liquids
+	if node_definition.liquidtype ~= "none" then
 		return true
 	end
 
@@ -154,8 +164,7 @@ local function may_replace(pos, player)
 
 	-- default to each nodes buildable_to; if a placed block would replace it, why shouldn't bones?
 	-- flowers being squished by bones are more realistical than a squished stone, too
-	-- exception are of course any protected buildable_to
+	return node_definition.buildable_to
-	return node_definition.buildable_to and not minetest.is_protected(pos, player:get_player_name())
 end
 
 local drop = function(pos, itemstack)
@@ -182,7 +191,6 @@ local function is_all_empty(player_inv)
 end
 
 minetest.register_on_dieplayer(function(player)
-
 	local bones_mode = minetest.settings:get("bones_mode") or "bones"
 	if bones_mode ~= "bones" and bones_mode ~= "drop" and bones_mode ~= "keep" then
 		bones_mode = "bones"
@@ -194,8 +202,7 @@ minetest.register_on_dieplayer(function(player)
 	local pos_string = minetest.pos_to_string(pos)
 
 	-- return if keep inventory set or in creative mode
-	if bones_mode == "keep" or (creative and creative.is_enabled_for
+	if bones_mode == "keep" or minetest.is_creative_enabled(player_name) then
-			and creative.is_enabled_for(player:get_player_name())) then
 		minetest.log("action", player_name .. " dies at " .. pos_string ..
 			". No bones placed")
 		if bones_position_message then

mods/bones/locale/bones.id.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 meninggalkan barangnya.
+@1 died at @2, and bones were placed.=@1 mati di @2 dan tulangnya diletakkan.
+@1's fresh bones=Tulang segar @1
+@1's bones=Tulang @1

mods/bones/locale/bones.jbo.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=lo bongu gunma
+@1's old bones=.i ti tolci'o ke bongu gunma po'a la'o zo'i.@1.zo'i
+@1 died at @2.=.i la'o zo'i.@1.zo'i  pu morsi di'o lo me zoi pos.@2.pos.
+@1 died at @2, and dropped their inventory.=.i la'o zo'i.@1.zo'i goi ly. pu morsi di'o lo me zoi pos.@2.pos. .ije ly. te farlu lo me le dacti liste po ly.
+@1 died at @2, and bones were placed.=.i la'o zo'i.@1.zo'i goi ly. pu morsi di'o lo me zoi pos.@2.pos. .ije lo bongu gunma pu se punji
+@1's fresh bones=.i ti cnino ke bongu gunma po'a la'o zo'i.@1.zo'i
+@1's bones=.i ti bongu gunma po'a la'o zo'i.@1.zo'i

mods/bones/locale/bones.pt_BR.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Ossos
+@1's old bones=Ossos antigos de @1
+@1 died at @2.=@1 morreu em @2.
+@1 died at @2, and dropped their inventory.=@1 morreu em @2, e seu inventário foi derrubado.
+@1 died at @2, and bones were placed.=@1 morreu em @2, e os ossos foram colocados.
+@1's fresh bones=Ossos recentes de @1
+@1's bones=Ossos de @1

mods/bones/locale/bones.sk.tr

@@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Kosti
+@1's old bones=Staré kosti hráča @1
+@1 died at @2.=@1 zomrel na pozícií @2.
+@1 died at @2, and dropped their inventory.=@1 zomrel na pozícií @2 a vysypal svoj inventár.
+@1 died at @2, and bones were placed.=@1 zomrel na pozícií @2 a ostali po ňom kosti.
+@1's fresh bones=Čerstvé kosti hráča @1
+@1's bones=Kosti hráča  @1

mods/bucket/locale/bucket.id.tr

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

mods/bucket/locale/bucket.jbo.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=lo baktu be no da
+Water Bucket=lo baktu be lo djacu
+River Water Bucket=lo baktu be lo rirxe djacu
+Lava Bucket=lo baktu be lo likro'i

mods/bucket/locale/bucket.pt_BR.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Balde Vazio
+Water Bucket=Balde de Água
+River Water Bucket=Balde de Água do Rio
+Lava Bucket=Balde de Lava

mods/bucket/locale/bucket.sk.tr

@@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Prázdne vedro
+Water Bucket=Vedro s vodou
+River Water Bucket=Vedro s vodou z rieky
+Lava Bucket=Vedro s lávou

mods/butterflies/init.lua

@@ -62,8 +62,8 @@ for i in ipairs (butter_list) do
 
 	minetest.register_node("butterflies:hidden_butterfly_"..name, {
 		drawtype = "airlike",
-		inventory_image = "butterflies_butterfly_"..name..".png",
+		inventory_image = "butterflies_butterfly_"..name..".png^default_invisible_node_overlay.png",
-		wield_image =  "butterflies_butterfly_"..name..".png",
+		wield_image =  "butterflies_butterfly_"..name..".png^default_invisible_node_overlay.png",
 		paramtype = "light",
 		sunlight_propagates = true,
 		walkable = false,

mods/butterflies/locale/butterflies.id.tr

@@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=Kupu-Kupu Putih
+Red Butterfly=Kupu-Kupu Merah
+Violet Butterfly=Kupu-Kupu Ungu

mods/butterflies/locale/butterflies.jbo.tr

@@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=lo blabi toldi
+Red Butterfly=lo xunre toldi
+Violet Butterfly=lo zirpu toldi

mods/butterflies/locale/butterflies.pt_BR.tr

@@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=
+Red Butterfly=
+Violet Butterfly=

mods/butterflies/locale/butterflies.sk.tr

@@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=Biely motýlik
+Red Butterfly=Červený motýlik
+Violet Butterfly=Fialový motýlik

mods/carts/cart_entity.lua

@@ -67,6 +67,7 @@ end
 function cart_entity:on_detach_child(child)
 	if child and child:get_player_name() == self.driver then
 		self.driver = nil
+		carts:manage_attachment(child, nil)
 	end
 end
 
@@ -107,8 +108,7 @@ function cart_entity:on_punch(puncher, time_from_last_punch, tool_capabilities,
 		end
 		-- Pick up cart
 		local inv = puncher:get_inventory()
-		if not (creative and creative.is_enabled_for
+		if not minetest.is_creative_enabled(puncher:get_player_name())
-				and creative.is_enabled_for(puncher:get_player_name()))
 				or not inv:contains_item("main", "carts:cart") then
 			local leftover = inv:add_item("main", "carts:cart")
 			-- If no room in inventory add a replacement cart to the world
@@ -327,11 +327,10 @@ local function rail_on_step(self, dtime)
 	if self.punched then
 		-- Collect dropped items
 		for _, obj_ in pairs(minetest.get_objects_inside_radius(pos, 1)) do
-			if not obj_:is_player() and
+			local ent = obj_:get_luaentity()
-					obj_:get_luaentity() and
+			-- Careful here: physical_state and disable_physics are item-internal APIs
-					not obj_:get_luaentity().physical_state and
+			if ent and ent.name == "__builtin:item" and ent.physical_state then
-					obj_:get_luaentity().name == "__builtin:item" then
+				ent:disable_physics()
-
 				obj_:set_attach(self.object, "", {x=0, y=0, z=0}, {x=0, y=0, z=0})
 				self.attached_items[#self.attached_items + 1] = obj_
 			end
@@ -389,8 +388,8 @@ minetest.register_entity("carts:cart", cart_entity)
 
 minetest.register_craftitem("carts:cart", {
 	description = S("Cart") .. "\n" .. S("(Sneak+Click to pick up)"),
-	inventory_image = minetest.inventorycube("carts_cart_top.png", "carts_cart_side.png", "carts_cart_side.png"),
+	inventory_image = minetest.inventorycube("carts_cart_top.png", "carts_cart_front.png", "carts_cart_side.png"),
-	wield_image = "carts_cart_side.png",
+	wield_image = "carts_cart_front.png",
 	on_place = function(itemstack, placer, pointed_thing)
 		local under = pointed_thing.under
 		local node = minetest.get_node(under)
@@ -416,8 +415,7 @@ minetest.register_craftitem("carts:cart", {
 		minetest.sound_play({name = "default_place_node_metal", gain = 0.5},
 			{pos = pointed_thing.above}, true)
 
-		if not (creative and creative.is_enabled_for
+		if not minetest.is_creative_enabled(placer:get_player_name()) then
-				and creative.is_enabled_for(placer:get_player_name())) then
 			itemstack:take_item()
 		end
 		return itemstack

mods/carts/locale/carts.id.tr

@@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=Kereta
+(Sneak+Click to pick up)=(Menyelinap + Klik untuk ambil)
+Rail=Rel
+Powered Rail=Rel Bertenaga
+Brake Rail=Rel Rem

mods/carts/locale/carts.jbo.tr

@@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=lo carce
+(Sneak+Click to pick up)=to lo nu dzibi'o je cu samxa'e te cabra cu tadji lo nu lebna toi
+Rail=lo teryre'e
+Powered Rail=lo se dikca teryre'e
+Brake Rail=lo terjabre teryre'e

mods/carts/locale/carts.pt_BR.tr

@@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=Carrinho
+(Sneak+Click to pick up)=(Esgueirar + Clique para pegar)
+Rail=Trilho
+Powered Rail=Trilho Energizado
+Brake Rail=Trilho de Freio

mods/carts/locale/carts.ru.tr

@@ -1,6 +1,6 @@
 # textdomain: carts
 Cart=Вагонетка
 (Sneak+Click to pick up)=(Пригнитесь и кликните по вагонетке, чтобы забрать)
-Rail=Рельса
+Rail=Рельсы
-Powered Rail=Механизированная Рельса
+Powered Rail=Запитанные рельсы
-Brake Rail=Рельса с тормозом
+Brake Rail=Тормозящие рельсы

mods/carts/locale/carts.sk.tr

@@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=Vozík
+(Sneak+Click to pick up)=(Zakrádanie sa + Klik pre zdvihnutie)
+Rail=Koľajnica
+Powered Rail=Koľajnica s pohonom
+Brake Rail=Brzdná koľajnica

mods/creative/init.lua

@@ -27,16 +27,25 @@ minetest.register_privilege("creative", {
 	on_revoke = update_sfinv,
 })
 
-local creative_mode_cache = minetest.settings:get_bool("creative_mode")
+-- Override the engine's creative mode function
+local old_is_creative_enabled = minetest.is_creative_enabled
 
+function minetest.is_creative_enabled(name)
+	if name == "" then
+		return old_is_creative_enabled(name)
+	end
+	return minetest.check_player_privs(name, {creative = true}) or
+		old_is_creative_enabled(name)
+end
+
+-- For backwards compatibility:
 function creative.is_enabled_for(name)
-	return creative_mode_cache or
+	return minetest.is_creative_enabled(name)
-		minetest.check_player_privs(name, {creative = true})
 end
 
 dofile(minetest.get_modpath("creative") .. "/inventory.lua")
 
-if creative_mode_cache then
+if minetest.is_creative_enabled("") then
 	-- Dig time is modified according to difference (leveldiff) between tool
 	-- 'maxlevel' and node 'level'. Digtime is divided by the larger of
 	-- leveldiff and 1.
@@ -70,7 +79,7 @@ end
 -- Unlimited node placement
 minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack)
 	if placer and placer:is_player() then
-		return creative.is_enabled_for(placer:get_player_name())
+		return minetest.is_creative_enabled(placer:get_player_name())
 	end
 end)
 
@@ -78,7 +87,7 @@ end)
 local old_handle_node_drops = minetest.handle_node_drops
 function minetest.handle_node_drops(pos, drops, digger)
 	if not digger or not digger:is_player() or
-		not creative.is_enabled_for(digger:get_player_name()) then
+		not minetest.is_creative_enabled(digger:get_player_name()) then
 		return old_handle_node_drops(pos, drops, digger)
 	end
 	local inv = digger:get_inventory()

mods/creative/inventory.lua

@@ -33,7 +33,7 @@ function creative.init_creative_inventory(player)
 	minetest.create_detached_inventory("creative_" .. player_name, {
 		allow_move = function(inv, from_list, from_index, to_list, to_index, count, player2)
 			local name = player2 and player2:get_player_name() or ""
-			if not creative.is_enabled_for(name) or
+			if not minetest.is_creative_enabled(name) or
 					to_list == "main" then
 				return 0
 			end
@@ -44,7 +44,7 @@ function creative.init_creative_inventory(player)
 		end,
 		allow_take = function(inv, listname, index, stack, player2)
 			local name = player2 and player2:get_player_name() or ""
-			if not creative.is_enabled_for(name) then
+			if not minetest.is_creative_enabled(name) then
 				return 0
 			end
 			return -1
@@ -61,6 +61,7 @@ function creative.init_creative_inventory(player)
 	return player_inventory[player_name]
 end
 
+local NO_MATCH = 999
 local function match(s, filter)
 	if filter == "" then
 		return 0
@@ -68,7 +69,15 @@ local function match(s, filter)
 	if s:lower():find(filter, 1, true) then
 		return #s - #filter
 	end
-	return nil
+	return NO_MATCH
+end
+
+local function description(def, lang_code)
+	local s = def.description
+	if lang_code then
+		s = minetest.get_translated_string(lang_code, s)
+	end
+	return s:gsub("\n.*", "") -- First line only
 end
 
 function creative.update_creative_inventory(player_name, tab_content)
@@ -84,13 +93,26 @@ function creative.update_creative_inventory(player_name, tab_content)
 
 	local items = inventory_cache[tab_content] or init_creative_cache(tab_content)
 
+	local lang
+	local player_info = minetest.get_player_information(player_name)
+	if player_info and player_info.lang_code ~= "" then
+		lang = player_info.lang_code
+	end
+
 	local creative_list = {}
 	local order = {}
 	for name, def in pairs(items) do
-		local m = match(def.description, inv.filter) or match(def.name, inv.filter)
+		local m = match(description(def), inv.filter)
-		if m then
+		if m > 0 then
+			m = math.min(m, match(description(def, lang), inv.filter))
+		end
+		if m > 0 then
+			m = math.min(m, match(name, inv.filter))
+		end
+
+		if m < NO_MATCH then
 			creative_list[#creative_list+1] = name
-			-- Sort by description length first so closer matches appear earlier
+			-- Sort by match value first so closer matches appear earlier
 			order[name] = string.format("%02d", m) .. name
 		end
 	end
@@ -121,7 +143,7 @@ function creative.register_tab(name, title, items)
 	sfinv.register_page("creative:" .. name, {
 		title = title,
 		is_in_nav = function(self, player, context)
-			return creative.is_enabled_for(player:get_player_name())
+			return minetest.is_creative_enabled(player:get_player_name())
 		end,
 		get = function(self, player, context)
 			local player_name = player:get_player_name()
@@ -199,14 +221,34 @@ function creative.register_tab(name, title, items)
 	})
 end
 
+-- Sort registered items
+local registered_nodes = {}
+local registered_tools = {}
+local registered_craftitems = {}
+
+minetest.register_on_mods_loaded(function()
+	for name, def in pairs(minetest.registered_items) do
+		local group = def.groups or {}
+
+		local nogroup = not (group.node or group.tool or group.craftitem)
+		if group.node or (nogroup and minetest.registered_nodes[name]) then
+			registered_nodes[name] = def
+		elseif group.tool or (nogroup and minetest.registered_tools[name]) then
+			registered_tools[name] = def
+		elseif group.craftitem or (nogroup and minetest.registered_craftitems[name]) then
+			registered_craftitems[name] = def
+		end
+	end
+end)
+
 creative.register_tab("all", S("All"), minetest.registered_items)
-creative.register_tab("nodes", S("Nodes"), minetest.registered_nodes)
+creative.register_tab("nodes", S("Nodes"), registered_nodes)
-creative.register_tab("tools", S("Tools"), minetest.registered_tools)
+creative.register_tab("tools", S("Tools"), registered_tools)
-creative.register_tab("craftitems", S("Items"), minetest.registered_craftitems)
+creative.register_tab("craftitems", S("Items"), registered_craftitems)
 
 local old_homepage_name = sfinv.get_homepage_name
 function sfinv.get_homepage_name(player)
-	if creative.is_enabled_for(player:get_player_name()) then
+	if minetest.is_creative_enabled(player:get_player_name()) then
 		return "creative:all"
 	else
 		return old_homepage_name(player)

mods/creative/locale/creative.id.tr

@@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=Bolehkan pemain memakai inventaris kreatif
+Search=Cari
+Reset=Atur ulang
+Previous page=Halaman sebelumnya
+Next page=Halaman selanjutnya
+All=Semua
+Nodes=Nodus
+Tools=Perkakas
+Items=Barang

mods/creative/locale/creative.jbo.tr

@@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=zifre le ka pilno le finti ke dacti liste
+Search=sisku
+Reset=kraga'igau
+Previous page=lidne
+Next page=selyli'e
+All=ro dacti
+Nodes=bliku
+Tools=tutci
+Items=dacti

mods/creative/locale/creative.pt_BR.tr

@@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=Permitir o jogador usar o inventário criativo
+Search=Pesquisar
+Reset=Redefinir
+Previous page=Página anterior
+Next page=Próxima página
+All=Todos
+Nodes=Blocos
+Tools=Ferramentas
+Items=Itens

mods/creative/locale/creative.sk.tr

@@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=Povolí hráčovi použivať kreatívny inventár
+Search=Hľadaj
+Reset=Vrátiť späť
+Previous page=Predchádzajúca stránka
+Next page=Nasledujúca stránka
+All=Všetko
+Nodes=Kocky
+Tools=Nástroje
+Items=Veci