Merge remote-tracking branch 'upstream/stable-5' into nalc-dev

fixes #2228

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.
+name = Notre Ami Le Cube 1.2
+author = Minetest and Sys4
+description = Minetest game slightly modified by Sys4

game_api.txt

@@ -93,21 +93,16 @@ For example,
 is used to show all tools. Name is used in the sfinv page name, title is the
 human readable title.
 
-Creative provides `creative.is_enabled_for(name)`, which is identical in
-functionality to the engine's `minetest.creative_is_enabled(name)`.
-Its use is deprecated and it should also not be overriden.
+`is_enabled_for` is used to check whether a player is in creative mode:
+
+    creative.is_enabled_for(name)
+
+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
 ----------
@@ -134,12 +129,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 = "default:chest" }`
+   e.g `{ pos = {1, 1, 1}, sound = null, swap = "chest" }`
 
 `default.chest.register_chest(name, def)`
 
  * Registers new chest
- * `name` Name for chest e.g. "default:chest"
+ * `name` Name for chest
  * `def`  See [#Chest Definition]
 
 ### Chest Definition

mods/beds/functions.lua

@@ -74,10 +74,10 @@ 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)
-		player_api.player_attached[name] = false
+		default.player_attached[name] = false
 		player:set_physics_override(1, 1, 1)
 		hud_flags.wielditem = true
-		player_api.set_animation(player, "stand" , 30)
+		default.player_set_animation(player, "stand" , 30)
 
 	-- lay down
 	else
@@ -99,9 +99,9 @@ local function lay_down(player, pos, bed_pos, state, skip)
 		}
 		player:set_physics_override(0, 0, 0)
 		player:set_pos(p)
-		player_api.player_attached[name] = true
+		default.player_attached[name] = true
 		hud_flags.wielditem = false
-		player_api.set_animation(player, "lay" , 0)
+		default.player_set_animation(player, "lay" , 0)
 	end
 
 	player:hud_set_flags(hud_flags)

mods/beds/locale/beds.id.tr

@@ -1,8 +0,0 @@
-# textdomain: beds
-Leave Bed=Tinggalkan Dipan
-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 boleh tidur pada waktu malam.
-Fancy Bed=Dipan Mewah
-Simple Bed=Dipan Sederhana

mods/beds/locale/template.txt

@@ -1,8 +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.=
-Fancy Bed=
-Simple Bed=

mods/binoculars/locale/binoculars.id.tr

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

mods/boats/locale/boats.id.tr

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

mods/bones/locale/bones.id.tr

@@ -1,8 +0,0 @@
-# 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/bucket/locale/bucket.id.tr

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

mods/butterflies/locale/butterflies.id.tr

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

mods/carts/cart_entity.lua

@@ -67,7 +67,6 @@ 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
 
@@ -328,10 +327,11 @@ 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
-			local ent = obj_:get_luaentity()
-			-- Careful here: physical_state and disable_physics are item-internal APIs
-			if ent and ent.name == "__builtin:item" and ent.physical_state then
-				ent:disable_physics()
+			if not obj_:is_player() and
+					obj_:get_luaentity() and
+					not obj_:get_luaentity().physical_state and
+					obj_:get_luaentity().name == "__builtin:item" then
+
 				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,7 +389,7 @@ 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_front.png", "carts_cart_side.png"),
+	inventory_image = minetest.inventorycube("carts_cart_top.png", "carts_cart_side.png", "carts_cart_side.png"),
 	wield_image = "carts_cart_side.png",
 	on_place = function(itemstack, placer, pointed_thing)
 		local under = pointed_thing.under

mods/carts/locale/carts.id.tr

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

mods/carts/locale/template.txt

@@ -1,6 +1,6 @@
 # textdomain: carts
+Cart=
+(Sneak+Click to pick up)=
 Rail=
 Powered Rail=
 Brake Rail=
-Cart=
-(Sneak+Click to pick up)=

mods/creative/init.lua

@@ -27,25 +27,16 @@ minetest.register_privilege("creative", {
 	on_revoke = update_sfinv,
 })
 
--- Override the engine's creative mode function
-local old_is_creative_enabled = minetest.is_creative_enabled
+local creative_mode_cache = minetest.settings:get_bool("creative_mode")
 
-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 minetest.is_creative_enabled(name)
+	return creative_mode_cache or
+		minetest.check_player_privs(name, {creative = true})
 end
 
 dofile(minetest.get_modpath("creative") .. "/inventory.lua")
 
-if minetest.is_creative_enabled("") then
+if creative_mode_cache 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.

mods/creative/inventory.lua

@@ -61,7 +61,6 @@ 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
@@ -69,15 +68,7 @@ local function match(s, filter)
 	if s:lower():find(filter, 1, true) then
 		return #s - #filter
 	end
-	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
+	return nil
 end
 
 function creative.update_creative_inventory(player_name, tab_content)
@@ -93,26 +84,13 @@ 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(description(def), inv.filter)
-		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
+		local m = match(def.description, inv.filter) or match(def.name, inv.filter)
+		if m then
 			creative_list[#creative_list+1] = name
-			-- Sort by match value first so closer matches appear earlier
+			-- Sort by description length first so closer matches appear earlier
 			order[name] = string.format("%02d", m) .. name
 		end
 	end
@@ -221,30 +199,10 @@ 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"), registered_nodes)
-creative.register_tab("tools", S("Tools"), registered_tools)
-creative.register_tab("craftitems", S("Items"), registered_craftitems)
+creative.register_tab("nodes", S("Nodes"), minetest.registered_nodes)
+creative.register_tab("tools", S("Tools"), minetest.registered_tools)
+creative.register_tab("craftitems", S("Items"), minetest.registered_craftitems)
 
 local old_homepage_name = sfinv.get_homepage_name
 function sfinv.get_homepage_name(player)

mods/creative/locale/creative.id.tr

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

mods/creative/locale/template.txt

@@ -1,4 +1,5 @@
 # textdomain: creative
+Allow player to use creative inventory=
 Search=
 Reset=
 Previous page=
@@ -7,4 +8,3 @@ All=
 Nodes=
 Tools=
 Items=
-Allow player to use creative inventory=

mods/default/README.txt

@@ -151,6 +151,7 @@ BlockMen (CC BY-SA 3.0):
   default_chest_top.png
   default_mineral_mese.png
   default_meselamp.png
+  bubble.png
   gui_formbg.png
   gui_furnace_arrow_bg.png
   gui_furnace_arrow_fg.png
@@ -195,6 +196,9 @@ Gambit (CC BY-SA 3.0):
 asl97 (CC BY-SA 3.0):
   default_ice.png
 
+KevDoy (CC BY-SA 3.0):
+  heart.png
+
 Pithydon (CC BY-SA 3.0)
   default_coral_brown.png
   default_coral_orange.png
@@ -249,11 +253,6 @@ Topywo (CC BY-SA 3.0)
 
 Extex101 (CC BY-SA 3.0)
   default_large_cactus_seedling.png
-  default_dry_shrub.png -- Derived from the original texture by celeron55
-
-An0n3m0us (CC BY-SA 3.0):
-  heart.png -- Derived from a texture by KevDoy (CC BY-SA 3.0)
-  bubble.png -- Derived from a texture by BlockMen (CC BY-SA 3.0)
 
 
 Sounds

mods/default/chests.lua

@@ -44,7 +44,7 @@ function default.chest.chest_lid_close(pn)
 	end
 
 	local node = minetest.get_node(pos)
-	minetest.after(0.2, minetest.swap_node, pos, { name = swap,
+	minetest.after(0.2, minetest.swap_node, pos, { name = "default:" .. swap,
 			param2 = node.param2 })
 	minetest.sound_play(sound, {gain = 0.3, pos = pos,
 		max_hear_distance = 10}, true)
@@ -76,8 +76,7 @@ minetest.register_on_leaveplayer(function(player)
 	end
 end)
 
-function default.chest.register_chest(prefixed_name, d)
-	local name = prefixed_name:sub(1,1) == ':' and prefixed_name:sub(2,-1) or prefixed_name
+function default.chest.register_chest(name, d)
 	local def = table.copy(d)
 	def.drawtype = "mesh"
 	def.visual = "mesh"
@@ -133,7 +132,7 @@ function default.chest.register_chest(prefixed_name, d)
 					pos = pos, max_hear_distance = 10}, true)
 			if not default.chest.chest_lid_obstructed(pos) then
 				minetest.swap_node(pos,
-						{ name = name .. "_open",
+						{ name = "default:" .. name .. "_open",
 						param2 = node.param2 })
 			end
 			minetest.after(0.2, minetest.show_formspec,
@@ -204,7 +203,7 @@ function default.chest.register_chest(prefixed_name, d)
 					max_hear_distance = 10}, true)
 			if not default.chest.chest_lid_obstructed(pos) then
 				minetest.swap_node(pos, {
-						name = name .. "_open",
+						name = "default:" .. name .. "_open",
 						param2 = node.param2 })
 			end
 			minetest.after(0.2, minetest.show_formspec,
@@ -216,7 +215,7 @@ function default.chest.register_chest(prefixed_name, d)
 		def.on_blast = function(pos)
 			local drops = {}
 			default.get_inventory_drops(pos, "main", drops)
-			drops[#drops+1] = name
+			drops[#drops+1] = "default:" .. name
 			minetest.remove_node(pos)
 			return drops
 		end
@@ -249,7 +248,7 @@ function default.chest.register_chest(prefixed_name, d)
 			def_opened.tiles[i].backface_culling = true
 		end
 	end
-	def_opened.drop = name
+	def_opened.drop = "default:" .. name
 	def_opened.groups.not_in_creative_inventory = 1
 	def_opened.selection_box = {
 		type = "fixed",
@@ -266,31 +265,29 @@ function default.chest.register_chest(prefixed_name, d)
 	def_closed.tiles[5] = def.tiles[3] -- drawtype to make them match the mesh
 	def_closed.tiles[3] = def.tiles[3].."^[transformFX"
 
-	minetest.register_node(prefixed_name, def_closed)
-	minetest.register_node(prefixed_name .. "_open", def_opened)
+	minetest.register_node("default:" .. name, def_closed)
+	minetest.register_node("default:" .. name .. "_open", def_opened)
 
 	-- convert old chests to this new variant
-	if name == "default:chest" or name == "default:chest_locked" then
-		minetest.register_lbm({
-			label = "update chests to opening chests",
-			name = "default:upgrade_" .. name:sub(9,-1) .. "_v2",
-			nodenames = {name},
-			action = function(pos, node)
-				local meta = minetest.get_meta(pos)
-				meta:set_string("formspec", nil)
-				local inv = meta:get_inventory()
-				local list = inv:get_list("default:chest")
-				if list then
-					inv:set_size("main", 8*4)
-					inv:set_list("main", list)
-					inv:set_list("default:chest", nil)
-				end
+	minetest.register_lbm({
+		label = "update chests to opening chests",
+		name = "default:upgrade_" .. name .. "_v2",
+		nodenames = {"default:" .. name},
+		action = function(pos, node)
+			local meta = minetest.get_meta(pos)
+			meta:set_string("formspec", nil)
+			local inv = meta:get_inventory()
+			local list = inv:get_list("default:chest")
+			if list then
+				inv:set_size("main", 8*4)
+				inv:set_list("main", list)
+				inv:set_list("default:chest", nil)
 			end
-		})
-	end
+		end
+	})
 end
 
-default.chest.register_chest("default:chest", {
+default.chest.register_chest("chest", {
 	description = S("Chest"),
 	tiles = {
 		"default_chest_top.png",
@@ -306,7 +303,7 @@ default.chest.register_chest("default:chest", {
 	groups = {choppy = 2, oddly_breakable_by_hand = 2},
 })
 
-default.chest.register_chest("default:chest_locked", {
+default.chest.register_chest("chest_locked", {
 	description = S("Locked Chest"),
 	tiles = {
 		"default_chest_top.png",

mods/default/functions.lua

@@ -210,12 +210,7 @@ end
 function default.grow_papyrus(pos, node)
 	pos.y = pos.y - 1
 	local name = minetest.get_node(pos).name
-	if name ~= "default:dirt" and
-			name ~= "default:dirt_with_grass" and
-			name ~= "default:dirt_with_dry_grass" and
-			name ~= "default:dirt_with_rainforest_litter" and
-			name ~= "default:dry_dirt" and
-			name ~= "default:dry_dirt_with_dry_grass" then
+	if name ~= "default:dirt_with_grass" and name ~= "default:dirt" then
 		return
 	end
 	if not minetest.find_node_near(pos, 3, {"group:water"}) then
@@ -252,17 +247,7 @@ minetest.register_abm({
 minetest.register_abm({
 	label = "Grow papyrus",
 	nodenames = {"default:papyrus"},
-	-- Grows on the dirt and surface dirt nodes of the biomes papyrus appears in,
-	-- including the old savanna nodes.
-	-- 'default:dirt_with_grass' is here only because it was allowed before.
-	neighbors = {
-		"default:dirt",
-		"default:dirt_with_grass",
-		"default:dirt_with_dry_grass",
-		"default:dirt_with_rainforest_litter",
-		"default:dry_dirt",
-		"default:dry_dirt_with_dry_grass",
-	},
+	neighbors = {"default:dirt", "default:dirt_with_grass"},
 	interval = 14,
 	chance = 71,
 	action = function(...)
@@ -448,9 +433,6 @@ local function leafdecay_after_destruct(pos, oldnode, def)
 	end
 end
 
-local movement_gravity = tonumber(
-	minetest.settings:get("movement_gravity")) or 9.81
-
 local function leafdecay_on_timer(pos, def)
 	if minetest.find_node_near(pos, def.radius, def.trunks) then
 		return false
@@ -477,21 +459,6 @@ local function leafdecay_on_timer(pos, def)
 
 	minetest.remove_node(pos)
 	minetest.check_for_falling(pos)
-
-	-- spawn a few particles for the removed node
-	minetest.add_particlespawner({
-		amount = 8,
-		time = 0.001,
-		minpos = vector.subtract(pos, {x=0.5, y=0.5, z=0.5}),
-		maxpos = vector.add(pos, {x=0.5, y=0.5, z=0.5}),
-		minvel = vector.new(-0.5, -1, -0.5),
-		maxvel = vector.new(0.5, 0, 0.5),
-		minacc = vector.new(0, -movement_gravity, 0),
-		maxacc = vector.new(0, -movement_gravity, 0),
-		minsize = 0,
-		maxsize = 0,
-		node = node,
-	})
 end
 
 function default.register_leafdecay(def)
@@ -516,7 +483,7 @@ end
 
 
 --
--- Convert default:dirt to something that fits the environment
+-- Convert dirt to something that fits the environment
 --
 
 minetest.register_abm({
@@ -525,7 +492,6 @@ minetest.register_abm({
 	neighbors = {
 		"air",
 		"group:grass",
-		"group:dry_grass",
 		"default:snow",
 	},
 	interval = 6,
@@ -554,8 +520,6 @@ minetest.register_abm({
 			minetest.set_node(pos, {name = "default:dirt_with_snow"})
 		elseif minetest.get_item_group(name, "grass") ~= 0 then
 			minetest.set_node(pos, {name = "default:dirt_with_grass"})
-		elseif minetest.get_item_group(name, "dry_grass") ~= 0 then
-			minetest.set_node(pos, {name = "default:dirt_with_dry_grass"})
 		end
 	end
 })

mods/default/item_entity.lua

@@ -15,8 +15,8 @@ local item = {
 
 	burn_up = function(self)
 		-- disappear in a smoke puff
-		local p = self.object:get_pos()
 		self.object:remove()
+		local p = self.object:get_pos()
 		minetest.sound_play("default_item_smoke", {
 			pos = p,
 			max_hear_distance = 8,
@@ -39,20 +39,16 @@ local item = {
 		})
 	end,
 
-	on_step = function(self, dtime, ...)
-		builtin_item.on_step(self, dtime, ...)
+	on_step = function(self, dtime)
+		builtin_item.on_step(self, dtime)
 
 		if self.flammable then
-			-- flammable, check for igniters every 10 s
+			-- flammable, check for igniters
 			self.ignite_timer = (self.ignite_timer or 0) + dtime
 			if self.ignite_timer > 10 then
 				self.ignite_timer = 0
 
-				local pos = self.object:get_pos()
-				if pos == nil then
-					return -- object already deleted
-				end
-				local node = minetest.get_node_or_nil(pos)
+				local node = minetest.get_node_or_nil(self.object:get_pos())
 				if not node then
 					return
 				end

mods/default/license.txt

@@ -51,7 +51,6 @@ Copyright (C) 2010-2018:
   Mossmanikin
   random-geek
   Extex101
-  An0n3m0us
 
 You are free to:
 Share — copy and redistribute the material in any medium or format.

mods/default/locale/default.de.tr

@@ -62,12 +62,12 @@ Obsidian Block=Obsidianblock
 Dirt=Erde
 Dirt with Grass=Erde mit Gras
 Dirt with Grass and Footsteps=Erde mit Gras und Fußstapfen
-Dirt with Savanna Grass=Erde mit Savannengras
+Dirt with Dry Grass=Erde mit trockenem Gras
 Dirt with Snow=Erde mit Schnee
 Dirt with Rainforest Litter=Erde mit Regenwaldboden
 Dirt with Coniferous Litter=Erde mit Nadelwaldboden
-Savanna Dirt=Savannenerde
-Savanna Dirt with Savanna Grass=Savannenerde mit Savannengras
+Dry Dirt=Trockene Erde
+Dry Dirt with Dry Grass=Trockene Erde mit trockenem Gras
 Permafrost=Permafrost
 Permafrost with Stones=Permafrost mit Steinen
 Permafrost with Moss=Permafrost mit Moos
@@ -124,7 +124,7 @@ Papyrus=Papyrus
 Dry Shrub=Trockener Busch
 Jungle Grass=Dschungelgras
 Grass=Gras
-Savanna Grass=Savannengras
+Dry Grass=Trockenes Gras
 Fern=Farn
 Marram Grass=Dünengras
 Bush Stem=Buschstamm

mods/default/locale/default.id.tr

@@ -1,211 +0,0 @@
-# textdomain: default
-Stone=Batu
-Cobblestone=Bongkahan Batu
-Stone Brick=Tembok Batu
-Stone Block=Balok Batu
-Mossy Cobblestone=Bongkahan Batu Berlumut
-Desert Stone=Batu Gurun
-Desert Cobblestone=Bongkahan Batu Gurun
-Desert Stone Brick=Tembok Batu Gurun
-Desert Stone Block=Balok Batu Gurun
-Sandstone=Batu Pasir
-Sandstone Brick=Tembok Batu Pasir
-Sandstone Block=Balok Batu Pasir
-Desert Sandstone=Batu Pasir Gurun
-Desert Sandstone Brick=Tembok Batu Pasir Gurun
-Desert Sandstone Block=Balok Batu Pasir Gurun
-Silver Sandstone=Batu Pasir Perak
-Silver Sandstone Brick=Tembok Batu Pasir Perak
-Silver Sandstone Block=Balok Batu Pasir Perak
-Obsidian=Obsidian
-Obsidian Brick=Tembok Obsidian
-Obsidian Block=Balok Obsidian
-Dirt=Tanah
-Dirt with Grass=Tanah Berumput
-Dirt with Grass and Footsteps=Tanah Berumput dan Tapak Kaki
-Dirt with Savanna Grass=Tanah Berumput Sabana
-Dirt with Snow=Tanah Bersalju
-Dirt with Rainforest Litter=Tanah Berserasah Hutan Hujan
-Dirt with Coniferous Litter=Tanah Berserasah Hutan Konifer
-Savanna Dirt=Tanah Sabana
-Savanna Dirt with Savanna Grass=Tanah Sabana Berumput Sabana
-Permafrost=Ibun Abadi
-Permafrost with Stones=Ibun Abadi Berbatu
-Permafrost with Moss=Ibun Abadi Berlumut
-Sand=Pasir
-Desert Sand=Pasir Gurun
-Silver Sand=Pasir Perak
-Gravel=Kerikil
-Clay=Semen
-Snow=Salju
-Snow Block=Balok Salju
-Ice=Es
-Cave Ice=Es Gua
-Apple Tree=Pohon Apel
-Apple Wood Planks=Papan Kayu Pohon Apel
-Apple Tree Sapling=Bibit Apel
-Apple Tree Leaves=Daun Pohon Apel
-Apple=Apel
-Apple Marker=Penanda Apel
-Jungle Tree=Pohon Hutan Rimba
-Jungle Wood Planks=Papan Kayu Pohon Rimba
-Jungle Tree Leaves=Daun Pohon Rimba
-Jungle Tree Sapling=Bibit Pohon Rimba
-Emergent Jungle Tree Sapling=Bibit Bertumbuh Pohon Rimba
-Pine Tree=Pohon Pinus
-Pine Wood Planks=Papan Kayu Pinus
-Pine Needles=Daun Pinus
-Pine Tree Sapling=Bibit Pinus
-Acacia Tree=Pohon Akasia
-Acacia Wood Planks=Papan Kayu Akasia
-Acacia Tree Leaves=Daun Akasia
-Acacia Tree Sapling=Bibit Akasia
-Aspen Tree=Pohon Aspen
-Aspen Wood Planks=Papan Kayu Aspen
-Aspen Tree Leaves=Daun Aspen
-Aspen Tree Sapling=Bibit Aspen
-Coal Ore=Bijih Batu Bara
-Coal Block=Balok Batu Bara
-Iron Ore=Biji Besi
-Steel Block=Balok Baja
-Copper Ore=Bijih Tembaga
-Copper Block=Balok Tembaga
-Tin Ore=Bijih Timah
-Tin Block=Balok Timah
-Bronze Block=Balok Perunggu
-Mese Ore=Bijih Mese
-Mese Block=Balok Mese
-Gold Ore=Bijih Emas
-Gold Block=Balok Emas
-Diamond Ore=Bijih Berlian
-Diamond Block=Balok Berlian
-Cactus=Kaktus
-Large Cactus Seedling=Bibit Kaktus Besar
-Papyrus=Papirus
-Dry Shrub=Semak Kering
-Jungle Grass=Rumput Rimba
-Grass=Rumput
-Savanna Grass=Rumput Sabana
-Fern=Pakis
-Marram Grass=Rumput Pantai
-Bush Stem=Batang Semak
-Bush Leaves=Daun Semak
-Bush Sapling=Bibit Semak
-Blueberry Bush Leaves with Berries=Daun Bluberi Berbuah
-Blueberry Bush Leaves=Daun Bluberi
-Blueberry Bush Sapling=Bibit Bluberi
-Acacia Bush Stem=Batang Semak Akasia
-Acacia Bush Leaves=Daun Semak Akasia
-Acacia Bush Sapling=Bibit Semak Akasia
-Pine Bush Stem=Batang Semak Pinus
-Pine Bush Needles=Daun Semak Pinus
-Pine Bush Sapling=Bibit Semak Pinus
-Kelp=Kelp
-Green Coral=Koral Hijau
-Pink Coral=Koral Jambon
-Cyan Coral=Koral Sian
-Brown Coral=Koral Cokelat
-Orange Coral=Koral Oranye
-Coral Skeleton=Kerangka Koral
-Water Source=Mata Air
-Flowing Water=Aliran Air
-River Water Source=Mata Air Sungai
-Flowing River Water=Aliran Air Sungai
-Lava Source=Sumber Lava
-Flowing Lava=Aliran Lava
-Empty Bookshelf=Rak Buku Kosong
-Bookshelf (@1 written, @2 empty books)=Rak Buku (@1 buku tertulis, @2 buku kosong)
-Bookshelf=Rak Buku
-Text too long=Teks terlalu panjang
-Wooden Sign=Penanda Kayu
-Steel Sign=Penanda Baja
-Wooden Ladder=Tangga Kayu
-Steel Ladder=Tangga Baja
-Apple Wood Fence=Pagar Kayu Apel
-Acacia Wood Fence=Pagar Akasia
-Jungle Wood Fence=Pagar Kayu Rimba
-Pine Wood Fence=Pagar Pinus
-Aspen Wood Fence=Pagar Aspen
-Apple Wood Fence Rail=Rel Pagar Kayu Apel
-Acacia Wood Fence Rail=Rel Pagar Akasia
-Jungle Wood Fence Rail=Rel Pagar Kayu Rimba
-Pine Wood Fence Rail=Rel Pagar Pinus
-Aspen Wood Fence Rail=Rel Pagar Aspen
-Glass=Kaca
-Obsidian Glass=Kaca Obsidian
-Brick Block=Balok Bata
-Mese Lamp=Lampu Mese
-Mese Post Light=Lampu Taman Mese
-Cloud=Awan
-@1 will intersect protection on growth.=@1 akan memotong perlindungan ketika tumbuh.
-Torch=Obor
-Wooden Pickaxe=Beliung Kayu
-Stone Pickaxe=Beliung Batu
-Bronze Pickaxe=Beliung Perunggu
-Steel Pickaxe=Beliung Baja
-Mese Pickaxe=Beliung Mese
-Diamond Pickaxe=Beliung Berlian
-Wooden Shovel=Sekop Kayu
-Stone Shovel=Sekop Batu
-Bronze Shovel=Sekop Perunggu
-Steel Shovel=Sekop Baja
-Mese Shovel=Sekop Mese
-Diamond Shovel=Sekop Berlian
-Wooden Axe=Kapak Kayu
-Stone Axe=Kapak Batu
-Bronze Axe=Kapak Perunggu
-Steel Axe=Kapak Baja
-Mese Axe=Kapak Mese
-Diamond Axe=Kapak Berlian
-Wooden Sword=Pedang Kayu
-Stone Sword=Pedang Batu
-Bronze Sword=Pedang Perunggu
-Steel Sword=Pedang Baja
-Mese Sword=Pedang Mese
-Diamond Sword=Pedang Berlian
-Key=Kunci
-Furnace is empty=Tungku kosong
-100% (output full)=100% (keluaran penuh)
-@1%=@1%
-Not cookable=Tidak bisa dimasak
-Empty=Kosong
-Furnace active=Tungku nyala
-Furnace inactive=Tungku mati
-(Item: @1; Fuel: @2)=(Barang: @1; Bahan Bakar: @2)
-Furnace=Tungku
-Title:=Judul:
-Contents:=Isi:
-Save=Simpan
-by @1=oleh @1
-Page @1 of @2=Halaman @1 dari @2
-"@1"="@1"
-"@1" by @2="@1" oleh @2
-Skeleton Key=Kunci Induk
-Key to @1's @2=Kunci @2 milik @1
-Blueberries=Bluberi
-Book=Buku
-Book with Text=Buku Tertulis
-Bronze Ingot=Perunggu Batangan
-Clay Brick=Bata
-Clay Lump=Bongkahan Semen
-Coal Lump=Bongkahan Batu Bara
-Copper Ingot=Tembaga Batangan
-Copper Lump=Bongkahan Tembaga
-Diamond=Berlian
-Flint=Batu Api
-Gold Ingot=Emas Batangan
-Gold Lump=Bongkahan Emas
-Iron Lump=Bongkahan Besi
-Mese Crystal=Kristal Mese
-Mese Crystal Fragment=Pecahan Kristal Mese
-Obsidian Shard=Pecahan Obsidian
-Paper=Kertas
-Steel Ingot=Baja Batangan
-Stick=Tongkat
-Tin Ingot=Timah Batangan
-Tin Lump=Bongkahan Timah
-Locked Chest=Peti Terkunci
-Locked Chest (owned by @1)=Peti Terkunci (milik @1)
-You do not own this chest.=Anda bukan pemilik peti ini.
-a locked chest=suatu peti terkunci
-Chest=Peti

mods/default/locale/template.txt

@@ -1,4 +1,43 @@
 # textdomain: default
+Locked Chest=
+Locked Chest (owned by @1)=
+You do not own this chest.=
+a locked chest=
+Chest=
+Stick=
+Paper=
+"@1" by @2=
+Book=
+Book with Text=
+Skeleton Key=
+Key to @1's @2=
+Coal Lump=
+Iron Lump=
+Copper Lump=
+Tin Lump=
+Mese Crystal=
+Gold Lump=
+Diamond=
+Clay Lump=
+Steel Ingot=
+Copper Ingot=
+Tin Ingot=
+Bronze Ingot=
+Gold Ingot=
+Mese Crystal Fragment=
+Clay Brick=
+Obsidian Shard=
+Flint=
+Blueberries=
+Furnace is empty=
+100% (output full)=
+@1%=
+Empty=
+Not cookable=
+Furnace active=
+Furnace inactive=
+(Item: @1; Fuel: @2)=
+Furnace=
 Stone=
 Cobblestone=
 Stone Brick=
@@ -23,12 +62,12 @@ Obsidian Block=
 Dirt=
 Dirt with Grass=
 Dirt with Grass and Footsteps=
-Dirt with Savanna Grass=
+Dirt with Dry Grass=
 Dirt with Snow=
 Dirt with Rainforest Litter=
 Dirt with Coniferous Litter=
-Savanna Dirt=
-Savanna Dirt with Savanna Grass=
+Dry Dirt=
+Dry Dirt with Dry Grass=
 Permafrost=
 Permafrost with Stones=
 Permafrost with Moss=
@@ -85,7 +124,7 @@ Papyrus=
 Dry Shrub=
 Jungle Grass=
 Grass=
-Savanna Grass=
+Dry Grass=
 Fern=
 Marram Grass=
 Bush Stem=
@@ -137,8 +176,6 @@ Brick Block=
 Mese Lamp=
 Mese Post Light=
 Cloud=
-@1 will intersect protection on growth.=
-Torch=
 Wooden Pickaxe=
 Stone Pickaxe=
 Bronze Pickaxe=
@@ -164,48 +201,11 @@ Steel Sword=
 Mese Sword=
 Diamond Sword=
 Key=
-Furnace is empty=
-100% (output full)=
-@1%=
-Not cookable=
-Empty=
-Furnace active=
-Furnace inactive=
-(Item: @1; Fuel: @2)=
-Furnace=
+Torch=
+@1 will intersect protection on growth.=
 Title:=
 Contents:=
 Save=
 by @1=
 Page @1 of @2=
 "@1"=
-"@1" by @2=
-Skeleton Key=
-Key to @1's @2=
-Blueberries=
-Book=
-Book with Text=
-Bronze Ingot=
-Clay Brick=
-Clay Lump=
-Coal Lump=
-Copper Ingot=
-Copper Lump=
-Diamond=
-Flint=
-Gold Ingot=
-Gold Lump=
-Iron Lump=
-Mese Crystal=
-Mese Crystal Fragment=
-Obsidian Shard=
-Paper=
-Steel Ingot=
-Stick=
-Tin Ingot=
-Tin Lump=
-Locked Chest=
-Locked Chest (owned by @1)=
-You do not own this chest.=
-a locked chest=
-Chest=

mods/default/nodes.lua

@@ -458,12 +458,12 @@ minetest.register_node("default:dirt_with_grass_footsteps", {
 })
 
 minetest.register_node("default:dirt_with_dry_grass", {
-	description = S("Dirt with Savanna Grass"),
+	description = S("Dirt with Dry Grass"),
 	tiles = {"default_dry_grass.png",
 		"default_dirt.png",
 		{name = "default_dirt.png^default_dry_grass_side.png",
 			tileable_vertical = false}},
-	groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
+	groups = {crumbly = 3, soil = 1},
 	drop = "default:dirt",
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name = "default_grass_footstep", gain = 0.4},
@@ -513,14 +513,14 @@ minetest.register_node("default:dirt_with_coniferous_litter", {
 })
 
 minetest.register_node("default:dry_dirt", {
-	description = S("Savanna Dirt"),
+	description = S("Dry Dirt"),
 	tiles = {"default_dry_dirt.png"},
 	groups = {crumbly = 3, soil = 1},
 	sounds = default.node_sound_dirt_defaults(),
 })
 
 minetest.register_node("default:dry_dirt_with_dry_grass", {
-	description = S("Savanna Dirt with Savanna Grass"),
+	description = S("Dry Dirt with Dry Grass"),
 	tiles = {"default_dry_grass.png", "default_dry_dirt.png",
 		{name = "default_dry_dirt.png^default_dry_grass_side.png",
 			tileable_vertical = false}},
@@ -621,7 +621,7 @@ minetest.register_node("default:snow", {
 	collision_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.5, -0.5, 0.5, -6 / 16, 0.5},
+			{-0.5, -0.5, -0.5, 0.5, -7 / 16, 0.5},
 		},
 	},
 	groups = {crumbly = 3, falling_node = 1, snowy = 1},
@@ -1497,7 +1497,7 @@ end
 
 
 minetest.register_node("default:dry_grass_1", {
-	description = S("Savanna Grass"),
+	description = S("Dry Grass"),
 	drawtype = "plantlike",
 	waving = 1,
 	tiles = {"default_dry_grass_1.png"},
@@ -1526,7 +1526,7 @@ minetest.register_node("default:dry_grass_1", {
 
 for i = 2, 5 do
 	minetest.register_node("default:dry_grass_" .. i, {
-		description = S("Savanna Grass"),
+		description = S("Dry Grass"),
 		drawtype = "plantlike",
 		waving = 1,
 		tiles = {"default_dry_grass_" .. i .. ".png"},
@@ -2579,10 +2579,12 @@ local function register_sign(material, desc, def)
 		sounds = def.sounds,
 
 		on_construct = function(pos)
+			--local n = minetest.get_node(pos)
 			local meta = minetest.get_meta(pos)
 			meta:set_string("formspec", "field[text;;${text}]")
 		end,
 		on_receive_fields = function(pos, formname, fields, sender)
+			--print("Sign at "..minetest.pos_to_string(pos).." got "..dump(fields))
 			local player_name = sender:get_player_name()
 			if minetest.is_protected(pos, player_name) then
 				minetest.record_protection_violation(pos, player_name)
@@ -2596,8 +2598,8 @@ local function register_sign(material, desc, def)
 				minetest.chat_send_player(player_name, S("Text too long"))
 				return
 			end
-			minetest.log("action", player_name .. " wrote \"" .. text ..
-				"\" to the sign at " .. minetest.pos_to_string(pos))
+			minetest.log("action", (player_name or "") .. " wrote \"" ..
+				text .. "\" to sign at " .. minetest.pos_to_string(pos))
 			local meta = minetest.get_meta(pos)
 			meta:set_string("text", text)
 
@@ -2814,10 +2816,7 @@ minetest.register_node("default:brick", {
 	description = S("Brick Block"),
 	paramtype2 = "facedir",
 	place_param2 = 0,
-	tiles = {
-		"default_brick.png^[transformFX",
-		"default_brick.png",
-	},
+	tiles = {"default_brick.png"},
 	is_ground_content = false,
 	groups = {cracky = 3},
 	sounds = default.node_sound_stone_defaults(),

mods/default/trees.lua

@@ -16,7 +16,9 @@ function default.can_grow(pos)
 	if not node_under then
 		return false
 	end
-	if minetest.get_item_group(node_under.name, "soil") == 0 then
+	local name_under = node_under.name
+	local is_soil = minetest.get_item_group(name_under, "soil")
+	if is_soil == 0 then
 		return false
 	end
 	local light_level = minetest.get_node_light(pos)

mods/doors/init.lua

@@ -78,7 +78,9 @@ end
 -- nodes from being placed in the top half of the door.
 minetest.register_node("doors:hidden", {
 	description = S("Hidden Door Segment"),
-	drawtype = "airlike",
+	-- can't use airlike otherwise falling nodes will turn to entities
+	-- and will be forever stuck until door is removed.
+	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = true,
@@ -91,7 +93,13 @@ minetest.register_node("doors:hidden", {
 	drop = "",
 	groups = {not_in_creative_inventory = 1},
 	on_blast = function() end,
-	-- 1px block inside door hinge near node top
+	tiles = {"doors_blank.png"},
+	-- 1px transparent block inside door hinge near node top.
+	node_box = {
+		type = "fixed",
+		fixed = {-15/32, 13/32, -15/32, -13/32, 1/2, -13/32},
+	},
+	-- collision_box needed otherise selection box would be full node size
 	collision_box = {
 		type = "fixed",
 		fixed = {-15/32, 13/32, -15/32, -13/32, 1/2, -13/32},
@@ -107,10 +115,10 @@ local transform = {
 		{v = "_a", param2 = 2},
 	},
 	{
-		{v = "_c", param2 = 1},
-		{v = "_c", param2 = 2},
-		{v = "_c", param2 = 3},
-		{v = "_c", param2 = 0},
+		{v = "_b", param2 = 1},
+		{v = "_b", param2 = 2},
+		{v = "_b", param2 = 3},
+		{v = "_b", param2 = 0},
 	},
 	{
 		{v = "_b", param2 = 1},
@@ -119,10 +127,10 @@ local transform = {
 		{v = "_b", param2 = 0},
 	},
 	{
-		{v = "_d", param2 = 3},
-		{v = "_d", param2 = 0},
-		{v = "_d", param2 = 1},
-		{v = "_d", param2 = 2},
+		{v = "_a", param2 = 3},
+		{v = "_a", param2 = 0},
+		{v = "_a", param2 = 1},
+		{v = "_a", param2 = 2},
 	},
 }
 
@@ -441,23 +449,15 @@ function doors.register(name, def)
 	def.mesh = "door_b.obj"
 	minetest.register_node(":" .. name .. "_b", def)
 
-	def.mesh = "door_a2.obj"
-	minetest.register_node(":" .. name .. "_c", def)
-
-	def.mesh = "door_b2.obj"
-	minetest.register_node(":" .. name .. "_d", def)
-
 	doors.registered_doors[name .. "_a"] = true
 	doors.registered_doors[name .. "_b"] = true
-	doors.registered_doors[name .. "_c"] = true
-	doors.registered_doors[name .. "_d"] = true
 end
 
 doors.register("door_wood", {
 		tiles = {{ name = "doors_door_wood.png", backface_culling = true }},
 		description = S("Wooden Door"),
 		inventory_image = "doors_item_wood.png",
-		groups = {node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 		recipe = {
 			{"group:wood", "group:wood"},
 			{"group:wood", "group:wood"},
@@ -470,7 +470,7 @@ doors.register("door_steel", {
 		description = S("Steel Door"),
 		inventory_image = "doors_item_steel.png",
 		protected = true,
-		groups = {node = 1, cracky = 1, level = 2},
+		groups = {cracky = 1, level = 2},
 		sounds = default.node_sound_metal_defaults(),
 		sound_open = "doors_steel_door_open",
 		sound_close = "doors_steel_door_close",
@@ -485,7 +485,7 @@ doors.register("door_glass", {
 		tiles = {"doors_door_glass.png"},
 		description = S("Glass Door"),
 		inventory_image = "doors_item_glass.png",
-		groups = {node = 1, cracky=3, oddly_breakable_by_hand=3},
+		groups = {cracky=3, oddly_breakable_by_hand=3},
 		sounds = default.node_sound_glass_defaults(),
 		sound_open = "doors_glass_door_open",
 		sound_close = "doors_glass_door_close",
@@ -500,7 +500,7 @@ doors.register("door_obsidian_glass", {
 		tiles = {"doors_door_obsidian_glass.png"},
 		description = S("Obsidian Glass Door"),
 		inventory_image = "doors_item_obsidian_glass.png",
-		groups = {node = 1, cracky=3},
+		groups = {cracky=3},
 		sounds = default.node_sound_glass_defaults(),
 		sound_open = "doors_glass_door_open",
 		sound_close = "doors_glass_door_close",

mods/doors/locale/doors.id.tr

@@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Bagian Pintu Tersembunyi
-Owned by @1=Milik @1
-You do not own this locked door.=Anda bukan pemilik pintu terkunci ini.
-a locked door=pintu terkunci
-Wooden Door=Pintu Kayu
-Steel Door=Pintu Baja
-Glass Door=Pintu Kaca
-Obsidian Glass Door=Pintu Kaca Obsidian
-You do not own this trapdoor.=Anda bukan pemilik pintu kolong ini.
-a locked trapdoor=pintu kolong terkunci
-Wooden Trapdoor=Pintu Kolong Kayu
-Steel Trapdoor=Pintu Kolong Baja
-Apple Wood Fence Gate=Gerbang Kayu Pohon Apel
-Acacia Wood Fence Gate=Gerbang Kayu Akasia
-Jungle Wood Fence Gate=Gerbang Kayu Pohon Rimba
-Pine Wood Fence Gate=Gerbang Kayu Pinus
-Aspen Wood Fence Gate=Gerbang Kayu Aspen

mods/doors/locale/doors.it.tr

@@ -4,7 +4,7 @@ Owned by @1=Di proprietà di @1
 You do not own this locked door.=Non sei il proprietario di questa porta chiusa a chiave.
 a locked door=una porta chiusa a chiave
 Wooden Door=Porta di legno
-Steel Door=Porta d'acciaio
+Steel Door=Porta d'acciacio
 Glass Door=Porta di vetro
 Obsidian Glass Door=Porta di vetro d'ossidiana
 Owned by @1=Di proprietà di @1
@@ -16,4 +16,4 @@ Apple Wood Fence Gate=Cancello della recinzione di legno di melo
 Acacia Wood Fence Gate=Cancello della recinzione di legno d'acacia
 Jungle Wood Fence Gate=Cancello della recinzione di legno della giungla
 Pine Wood Fence Gate=Cancello della recinzione di legno di pino
-Aspen Wood Fence Gate=Cancello della recinzione di legno di pioppo
+Aspen Wood Fence Gate=Cancello della recinzione di legno di pioppo

mods/doors/models/door_a.obj

@@ -1,7 +1,7 @@
 # Blender v2.76 (sub 0) OBJ File: 'door_a.blend'
 # www.blender.org
 mtllib door_a.mtl
-o door_a
+o Cube_Cube.001
 v 0.499000 -0.499000 -0.499000
 v 0.499000 1.499000 -0.499000
 v 0.499000 -0.499000 -0.375000