add palette to wood banister

using pressure plate rules

.luacheckrc

@@ -4,7 +4,9 @@ allow_defined_top = true
 read_globals = {
 	"DIR_DELIM",
 	"minetest", "core",
+	"unpack",
 	"dump",
+	table = { fields = { "copy", "getn" } },
 	"vector", "nodeupdate",
 	"VoxelManip", "VoxelArea",
 	"PseudoRandom", "ItemStack",
@@ -17,6 +19,7 @@ read_globals = {
 	"mesecon",
 	"unifieddyes",
 	"creative",
+	"homedecor_i18n",
 }
 
 globals = {

building_blocks/alias.lua

@@ -0,0 +1,57 @@
+local S = homedecor_i18n.gettext
+
+if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
+	minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar")
+	minetest.register_alias("building_blocks:stair_tar", "stairs:stair_Tar")
+	minetest.register_alias("building_blocks:slab_marble", "stairs:slab_Marble")
+	minetest.register_alias("building_blocks:stair_marble", "stairs:stair_Marble")
+end
+
+if minetest.get_modpath("moreblocks") then
+	stairsplus:register_alias_all("building_blocks", "tar", "building_blocks", "Tar")
+	stairsplus:register_alias_all("building_blocks", "marble", "building_blocks", "Marble")
+	for _, i in ipairs(stairsplus.shapes_list) do
+		local class = i[1]
+		local cut = i[2]
+		minetest.unregister_item("moreblocks:"..class.."tar"..cut)
+		minetest.register_alias("moreblocks:"..class.."tar"..cut, "building_blocks:"..class.."tar"..cut)
+	end
+	minetest.unregister_item("moreblocks:tar")
+	minetest.register_alias("moreblocks:tar", "building_blocks:Tar")
+	stairsplus:register_alias_all("moreblocks", "tar", "building_blocks", "Tar")
+end
+
+minetest.register_alias("adobe", "building_blocks:Adobe")
+minetest.register_alias("fakegrass", "building_blocks:fakegrass")
+minetest.register_alias("hardwood", "building_blocks:hardwood")
+minetest.register_alias("tar_knife", "building_blocks:knife")
+minetest.register_alias("marble", "building_blocks:Marble")
+minetest.register_alias("building_blocks_roofing", "building_blocks:Roofing")
+minetest.register_alias("sticks", "building_blocks:sticks")
+minetest.register_alias("building_blocks:faggot", "building_blocks:sticks")
+minetest.register_alias("tar", "building_blocks:Tar")
+
+if not minetest.get_modpath("technic") then
+	minetest.register_node( ":technic:granite", {
+		    description = S("Granite"),
+		    tiles = { "technic_granite.png" },
+		    is_ground_content = true,
+		    groups = {cracky=1},
+		    sounds = default.node_sound_stone_defaults(),
+	})
+	minetest.register_craft({
+		output = "technic:granite 9",
+		recipe = {
+			{ "group:tar_block", "group:marble", "group:tar_block" },
+			{ "group:marble", "group:tar_block", "group:marble" },
+			{ "group:tar_block", "group:marble", "group:tar_block" }
+		},
+	})
+	if minetest.get_modpath("moreblocks") then
+		stairsplus:register_all("technic", "granite", "technic:granite", {
+				description=S("Granite"),
+				groups={cracky=1, not_in_creative_inventory=1},
+				tiles={"technic_granite.png"},
+		})
+	end
+end

building_blocks/depends.txt

@@ -1,3 +1,4 @@
 default
 homedecor_i18n
 moreblocks?
+stairs?

building_blocks/init.lua

@@ -1,639 +1,7 @@
-
 local S = homedecor_i18n.gettext
+local modpath = minetest.get_modpath("building_blocks")
 
-minetest.register_node("building_blocks:Adobe", {
-	tiles = {"building_blocks_Adobe.png"},
-	description = S("Adobe"),
-	is_ground_content = true,
-	groups = {crumbly=3},
-	sounds = default.node_sound_stone_defaults(),
-})
-minetest.register_node("building_blocks:Roofing", {
-	tiles = {"building_blocks_Roofing.png"},
-	is_ground_content = true,
-	description = S("Roof block"),
-	groups = {snappy=3},
-})
-minetest.register_craft({
-	output = 'building_blocks:terrycloth_towel 2',
-	recipe = {
-		{"farming:string", "farming:string", "farming:string"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:Tarmac_spread 4',
-	recipe = {
-		{"group:tar_block", "group:tar_block"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:gravel_spread 4',
-	recipe = {
-		{"default:gravel", "default:gravel", "default:gravel"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:brobble_spread 4',
-	recipe = {
-		{"default:brick", "default:cobble", "default:brick"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:Fireplace 1',
-	recipe = {
-		{"default:steel_ingot", "building_blocks:sticks", "default:steel_ingot"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:Adobe 3',
-	recipe = {
-		{"default:sand"},
-		{"default:clay"},
-		{"group:stick"},
-	}
-})
-
-minetest.register_craft({
-	output = 'building_blocks:Roofing 10',
-	recipe = {
-		{"building_blocks:Adobe", "building_blocks:Adobe"},
-		{"building_blocks:Adobe", "building_blocks:Adobe"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:BWtile 10',
-	recipe = {
-		{"group:marble", "group:tar_block"},
-		{"group:tar_block", "group:marble"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:grate 1',
-	recipe = {
-		{"default:steel_ingot", "default:steel_ingot"},
-		{"default:glass", "default:glass"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:woodglass 1',
-	recipe = {
-		{"default:wood"},
-		{"default:glass"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:hardwood 2',
-	recipe = {
-		{"default:wood", "default:junglewood"},
-		{"default:junglewood", "default:wood"},
-	}
-})
-
-minetest.register_craft({
-	output = 'building_blocks:hardwood 2',
-	recipe = {
-		{"default:junglewood", "default:wood"},
-		{"default:wood", "default:junglewood"},
-	}
-})
-if minetest.get_modpath("moreblocks") then
-	minetest.register_craft({
-		output = 'building_blocks:sticks 2',
-		recipe = {
-			{'group:stick', ''           , 'group:stick'},
-			{'group:stick', 'group:stick', 'group:stick'},
-			{'group:stick', 'group:stick', 'group:stick'},
-		}
-	})
-else
-	minetest.register_craft({
-		output = 'building_blocks:sticks',
-		recipe = {
-			{'group:stick', 'group:stick'},
-			{'group:stick', 'group:stick'},
-		}
-	})
-end
-
-minetest.register_craft({
-	output = 'default:stick 4',
-	recipe = {
-		{'building_blocks:sticks'},
-	}
-})
-
-minetest.register_craft({
-	output = 'building_blocks:fakegrass 2',
-	recipe = {
-		{'default:leaves'},
-		{"default:dirt"},
-	}
-})
-
-minetest.register_craft({
-	output = 'building_blocks:tar_base 4',
-	recipe = {
-		{"default:coal_lump", "default:gravel"},
-		{"default:gravel", "default:coal_lump"}
-	}
-})
-
-minetest.register_craft({
-	output = 'building_blocks:tar_base 4',
-	recipe = {
-		{"default:gravel", "default:coal_lump"},
-		{"default:coal_lump", "default:gravel"}
-	}
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "building_blocks:smoothglass",
-	recipe = "default:glass"
-})
-minetest.register_node("building_blocks:smoothglass", {
-	drawtype = "glasslike",
-	description = S("Streak Free Glass"),
-	tiles = {"building_blocks_sglass.png"},
-	inventory_image = minetest.inventorycube("building_blocks_sglass.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3},
-	sounds = default.node_sound_glass_defaults(),
-})
-minetest.register_node("building_blocks:grate", {
-	drawtype = "glasslike",
-	description = S("Grate"),
-	tiles = {"building_blocks_grate.png"},
-	inventory_image = minetest.inventorycube("building_blocks_grate.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {cracky=1},
-})
-
-minetest.register_node("building_blocks:Fireplace", {
-	description = S("Fireplace"),
-	tiles = {
-		"building_blocks_cast_iron.png",
-		"building_blocks_cast_iron.png",
-		"building_blocks_cast_iron.png",
-		"building_blocks_cast_iron_fireplace.png"
-	},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	light_source = default.LIGHT_MAX,
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {cracky=2},
-})
-
-minetest.register_node("building_blocks:woodglass", {
-	drawtype = "glasslike",
-	description = S("Wood Framed Glass"),
-	tiles = {"building_blocks_wglass.png"},
-	inventory_image = minetest.inventorycube("building_blocks_wglass.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3},
-	sounds = default.node_sound_glass_defaults(),
-})
-minetest.register_node("building_blocks:terrycloth_towel", {
-	drawtype = "raillike",
-	description = S("Terrycloth towel"),
-	tiles = {"building_blocks_towel.png"},
-	inventory_image = "building_blocks_towel_inv.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-                -- but how to specify the dimensions for curved and sideways rails?
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {crumbly=3},
-})
-minetest.register_node("building_blocks:Tarmac_spread", {
-	drawtype = "raillike",
-	description = S("Tarmac Spread"),
-	tiles = {"building_blocks_tar.png"},
-	inventory_image = "building_blocks_tar_spread_inv.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-                -- but how to specify the dimensions for curved and sideways rails?
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_dirt_defaults(),
-})
-minetest.register_node("building_blocks:BWtile", {
-	drawtype = "nodebox",
-	description = S("Chess board tiling"),
-	tiles = {
-		"building_blocks_BWtile.png",
-		"building_blocks_BWtile.png^[transformR90",
-		"building_blocks_BWtile.png^[transformR90",
-		"building_blocks_BWtile.png^[transformR90",
-		"building_blocks_BWtile.png",
-		"building_blocks_BWtile.png"
-	},
-	inventory_image = "building_blocks_bwtile_inv.png",
-	paramtype = "light",
-	walkable = false,
-	node_box = {
-		type = "fixed",
-		fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {crumbly=3},
-})
-minetest.register_node("building_blocks:brobble_spread", {
-	drawtype = "raillike",
-	-- Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
-	-- Translate however you see fit.
-	description = S("Brobble Spread"),
-	tiles = {"building_blocks_brobble.png"},
-	inventory_image = "building_blocks_brobble_spread_inv.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-                -- but how to specify the dimensions for curved and sideways rails?
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {crumbly=3},
-})
-minetest.register_node("building_blocks:gravel_spread", {
-	drawtype = "raillike",
-	description = S("Gravel Spread"),
-	tiles = {"default_gravel.png"},
-	inventory_image = "building_blocks_gravel_spread_inv.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-                -- but how to specify the dimensions for curved and sideways rails?
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {crumbly=2},
-	sounds = default.node_sound_dirt_defaults({
-		footstep = {name="default_gravel_footstep", gain=0.5},
-		dug = {name="default_gravel_footstep", gain=1.0},
-	}),
-})
-minetest.register_node("building_blocks:hardwood", {
-	tiles = {"building_blocks_hardwood.png"},
-	is_ground_content = true,
-	description = S("Hardwood"),
-	groups = {choppy=1,flammable=1},
-	sounds = default.node_sound_wood_defaults(),
-})
-
-if minetest.get_modpath("moreblocks") then
-
-	stairsplus:register_all(
-		"building_blocks",
-		"marble",
-		"building_blocks:Marble",
-		{
-			description = S("Marble"),
-			tiles = {"building_blocks_marble.png"},
-			groups = {cracky=3},
-			sounds = default.node_sound_stone_defaults(),
-		}
-	)
-	stairsplus:register_all(
-		"building_blocks",
-		"hardwood",
-		"building_blocks:hardwood",
-		{
-			description = S("Hardwood"),
-			tiles = {"building_blocks_hardwood.png"},
-			groups = {choppy=1,flammable=1},
-			sounds = default.node_sound_wood_defaults(),
-		}
-	)
-	stairsplus:register_all(
-		"building_blocks",
-		"fakegrass",
-		"building_blocks:fakegrass",
-		{
-			description = S("Grass"),
-			tiles = {"default_grass.png"},
-			groups = {crumbly=3},
-			sounds = default.node_sound_dirt_defaults({
-				footstep = {name="default_grass_footstep", gain=0.4},
-			}),
-		}
-	)
-
-	for _, i in ipairs(stairsplus.shapes_list) do
-		local class = i[1]
-		local cut = i[2]
-		minetest.unregister_item("moreblocks:"..class.."tar"..cut)
-		minetest.register_alias("moreblocks:"..class.."tar"..cut, "building_blocks:"..class.."tar"..cut)
-
-	end
-	minetest.unregister_item("moreblocks:tar")
-	minetest.register_alias("moreblocks:tar", "building_blocks:Tar")
-
-	stairsplus:register_all(
-		"building_blocks",
-		"tar",
-		"building_blocks:Tar",
-		{
-			description = S("Tar"),
-			tiles = {"building_blocks_tar.png"},
-			groups = {crumbly=1},
-			sounds = default.node_sound_stone_defaults(),
-		}
-	)
-
-	stairsplus:register_all(
-		"building_blocks",
-		"grate",
-		"building_blocks:grate",
-		{
-			description = S("Grate"),
-			tiles = {"building_blocks_grate.png"},
-			groups = {cracky=1},
-			sounds = default.node_sound_stone_defaults(),
-		}
-	)
-	stairsplus:register_all(
-		"building_blocks",
-		"Adobe",
-		"building_blocks:Adobe",
-		{
-			description = S("Adobe"),
-			tiles = {"building_blocks_Adobe.png"},
-			groups = {crumbly=3},
-			sounds = default.node_sound_stone_defaults(),
-		}
-	)
-	stairsplus:register_all(
-		"building_blocks",
-		"Roofing",
-		"building_blocks:Roofing",
-		{
-			description = S("Roofing"),
-			tiles = {"building_blocks_Roofing.png"},
-			groups = {snappy=3},
-			sounds = default.node_sound_stone_defaults(),
-		}
-	)
-else
-	bb_stairs = {}
-
-	-- Node will be called stairs:stair_<subname>
-	function bb_stairs.register_stair(subname, recipeitem, groups, images, description)
-		minetest.register_node("building_blocks:stair_" .. subname, {
-			description = description,
-			drawtype = "nodebox",
-			tiles = images,
-			paramtype = "light",
-			paramtype2 = "facedir",
-			is_ground_content = true,
-			groups = groups,
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
-					{-0.5, 0, 0, 0.5, 0.5, 0.5},
-				},
-			},
-		})
-
-		minetest.register_craft({
-			output = 'building_blocks:stair_' .. subname .. ' 4',
-			recipe = {
-				{recipeitem, "", ""},
-				{recipeitem, recipeitem, ""},
-				{recipeitem, recipeitem, recipeitem},
-			},
-		})
-
-		-- Flipped recipe for the silly minecrafters
-		minetest.register_craft({
-			output = 'building_blocks:stair_' .. subname .. ' 4',
-			recipe = {
-				{"", "", recipeitem},
-				{"", recipeitem, recipeitem},
-				{recipeitem, recipeitem, recipeitem},
-			},
-		})
-	end
-
-	-- Node will be called stairs:slab_<subname>
-	function bb_stairs.register_slab(subname, recipeitem, groups, images, description)
-		minetest.register_node("building_blocks:slab_" .. subname, {
-			description = description,
-			drawtype = "nodebox",
-			tiles = images,
-			paramtype = "light",
-			is_ground_content = true,
-			groups = groups,
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5},
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5},
-			},
-		})
-
-		minetest.register_craft({
-			output = 'building_blocks:slab_' .. subname .. ' 3',
-			recipe = {
-				{recipeitem, recipeitem, recipeitem},
-			},
-		})
-	end
-
-	-- Nodes will be called stairs:{stair,slab}_<subname>
-	function bb_stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab)
-		bb_stairs.register_stair(subname, recipeitem, groups, images, desc_stair)
-		bb_stairs.register_slab(subname, recipeitem, groups, images, desc_slab)
-	end
-	bb_stairs.register_stair_and_slab("marble","building_blocks:Marble",
-		{cracky=3},
-		{"building_blocks_marble.png"},
-		S("Marble stair"),
-		S("Marble slab")
-	)
-	bb_stairs.register_stair_and_slab("hardwood","building_blocks:hardwood",
-		{choppy=1,flammable=1},
-		{"building_blocks_hardwood.png"},
-		S("Hardwood stair"),
-		S("Hardwood slab")
-	)
-	bb_stairs.register_stair_and_slab("fakegrass","building_blocks:fakegrass",
-		{crumbly=3},
-		{"default_grass.png"},
-		S("Grass stair"),
-		S("Grass slab")
-	)
-	bb_stairs.register_stair_and_slab("tar","building_blocks:Tar",
-		{crumbly=1},
-		{"building_blocks_tar.png"},
-		S("Tar stair"),
-		S("Tar slab")
-	)
-	bb_stairs.register_stair_and_slab("grate","building_blocks:grate",
-		{cracky=1},
-		{"building_blocks_grate.png"},
-		S("Grate Stair"),
-		S("Grate Slab")
-	)
-	bb_stairs.register_stair_and_slab("Adobe", "building_blocks:Adobe",
-		{crumbly=3},
-		{"building_blocks_Adobe.png"},
-		S("Adobe stair"),
-		S("Adobe slab")
-	)
-	bb_stairs.register_stair_and_slab("Roofing", "building_blocks:Roofing",
-		{snappy=3},
-		{"building_blocks_Roofing.png"},
-		S("Roofing stair"),
-		S("Roofing slab")
-	)
-end
-
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "building_blocks:hardwood",
-	burntime = 28,
-})
-
-minetest.register_node("building_blocks:fakegrass", {
-	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
-	description = S("Fake Grass"),
-	is_ground_content = true,
-	groups = {crumbly=3},
-		sounds = default.node_sound_dirt_defaults({
-		footstep = {name="default_grass_footstep", gain=0.4},
-	}),
-})
-
-minetest.register_craftitem("building_blocks:sticks", {
-	description = S("Small bundle of sticks"),
-	image = "building_blocks_sticks.png",
-	on_place_on_ground = minetest.craftitem_place_item,
-})
-
-minetest.register_craftitem("building_blocks:tar_base", {
-	description = S("Tar base"),
-	image = "building_blocks_tar_base.png",
-})
-
---Tar
-minetest.register_craft({
-	output = 'building_blocks:knife 1',
-	recipe = {
-		{"group:tar_block"},
-		{"group:stick"},
-	}
-})
-
-minetest.register_alias("tar", "building_blocks:Tar")
-minetest.register_alias("fakegrass", "building_blocks:fakegrass")
-minetest.register_alias("tar_knife", "building_blocks:knife")
-minetest.register_alias("adobe", "building_blocks:Adobe")
-minetest.register_alias("building_blocks_roofing", "building_blocks:Roofing")
-minetest.register_alias("hardwood", "building_blocks:hardwood")
-minetest.register_alias("sticks", "building_blocks:sticks")
-minetest.register_alias("building_blocks:faggot", "building_blocks:sticks")
-minetest.register_alias("marble", "building_blocks:Marble")
-
-minetest.register_node("building_blocks:Tar", {
-	description = S("Tar"),
-	tiles = {"building_blocks_tar.png"},
-	is_ground_content = true,
-	groups = {crumbly=1, tar_block = 1},
-	sounds = default.node_sound_stone_defaults(),
-})
-minetest.register_node("building_blocks:Marble", {
-	description = S("Marble"),
-	tiles = {"building_blocks_marble.png"},
-	is_ground_content = true,
-	groups = {cracky=3, marble = 1},
-	sounds = default.node_sound_stone_defaults(),
-})
-minetest.register_craft({
-	type = "fuel",
-	recipe = "building_blocks:sticks",
-	burntime = 5,
-})
-minetest.register_craft({
-	type = "fuel",
-	recipe = "building_blocks:Tar",
-	burntime = 40,
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "building_blocks:Tar",
-	recipe = "building_blocks:tar_base",
-})
-
-minetest.register_tool("building_blocks:knife", {
-	description = S("Tar Knife"),
-	inventory_image = "building_blocks_knife.png",
-	tool_capabilities = {
-		max_drop_level=0,
-		groupcaps={
-			choppy={times={[2]=7.50, [3]=2.80}, uses=100, maxlevel=1},
-			fleshy={times={[2]=5.50, [3]=2.80}, uses=100, maxlevel=1}
-		}
-	},
-})
-
-minetest.register_craft({
-	output = "building_blocks:Marble 9",
-	recipe = {
-		{"default:clay", "group:tar_block", "default:clay"},
-		{"group:tar_block","default:clay", "group:tar_block"},
-		{"default:clay", "group:tar_block","default:clay"},
-	}
-})
-
-if not minetest.get_modpath("technic") then
-	minetest.register_node( ":technic:granite", {
-		    description = S("Granite"),
-		    tiles = { "technic_granite.png" },
-		    is_ground_content = true,
-		    groups = {cracky=1},
-		    sounds = default.node_sound_stone_defaults(),
-	})
-
-	minetest.register_craft({
-		output = "technic:granite 9",
-		recipe = {
-			{ "group:tar_block", "group:marble", "group:tar_block" },
-			{ "group:marble", "group:tar_block", "group:marble" },
-			{ "group:tar_block", "group:marble", "group:tar_block" }
-		},
-	})
-
-	if minetest.get_modpath("moreblocks") then
-		stairsplus:register_all("technic", "granite", "technic:granite", {
-				description=S("Granite"),
-				groups={cracky=1, not_in_creative_inventory=1},
-				tiles={"technic_granite.png"},
-		})
-	end
-end
+dofile(modpath.."/alias.lua")
+dofile(modpath.."/node_stairs.lua")
+dofile(modpath.."/others.lua")
+dofile(modpath.."/recipes.lua")

building_blocks/node_stairs.lua

@@ -0,0 +1,226 @@
+local S = homedecor_i18n.gettext
+
+local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"}
+
+local function building_blocks_stairs(nodename, def)
+	minetest.register_node(nodename, def)
+	if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
+		local mod, name = nodename:match("(.*):(.*)")
+		minetest.register_alias(mod .. ":slab_" .. name, "stairs:slab_" .. name)
+		minetest.register_alias(mod .. ":stair_" .. name, "stairs:stair_" .. name)
+		local stairs_groups = {}
+		for _, groupname in ipairs(stairs_groups_names) do
+			stairs_groups[groupname] = def.groups[groupname]
+		end
+
+		if minetest.get_modpath("moreblocks") then
+			stairsplus:register_all(
+				mod,
+				name,
+				nodename,
+				{
+					description = def.description,
+					tiles = def.tiles,
+					groups = stairs_groups,
+					sounds = def.sounds,
+				}
+			)
+		else
+			stairs.register_stair_and_slab(name,nodename,
+				stairs_groups,
+				def.tiles,
+				("%s Stair"):format(def.description),
+				("%s Slab"):format(def.description),
+				def.sounds
+			)
+		end	
+	end
+end
+
+building_blocks_stairs("building_blocks:grate", {
+	drawtype = "glasslike",
+	description = S("Grate"),
+	tiles = {"building_blocks_grate.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults(),
+})
+building_blocks_stairs("building_blocks:smoothglass", {
+	drawtype = "glasslike",
+	description = S("Streak Free Glass"),
+	tiles = {"building_blocks_sglass.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3},
+	sounds = default.node_sound_glass_defaults(),
+})
+building_blocks_stairs("building_blocks:woodglass", {
+	drawtype = "glasslike",
+	description = S("Wood Framed Glass"),
+	tiles = {"building_blocks_wglass.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3},
+	sounds = default.node_sound_glass_defaults(),
+})
+
+building_blocks_stairs("building_blocks:Adobe", {
+	tiles = {"building_blocks_Adobe.png"},
+	description = S("Adobe"),
+	is_ground_content = true,
+	groups = {crumbly=3},
+	sounds = default.node_sound_stone_defaults(),
+})
+building_blocks_stairs("building_blocks:fakegrass", {
+	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
+	description = S("Fake Grass"),
+	is_ground_content = true,
+	groups = {crumbly=3},
+	sounds = default.node_sound_dirt_defaults({
+		footstep = {name="default_grass_footstep", gain=0.4},
+	}),
+})
+building_blocks_stairs("building_blocks:hardwood", {
+	tiles = {"building_blocks_hardwood.png"},
+	is_ground_content = true,
+	description = S("Hardwood"),
+	groups = {choppy=1,flammable=1},
+	sounds = default.node_sound_wood_defaults(),
+})
+building_blocks_stairs("building_blocks:Roofing", {
+	tiles = {"building_blocks_Roofing.png"},
+	is_ground_content = true,
+	description = S("Roof block"),
+	groups = {snappy=3},
+	sounds = default.node_sound_stone_defaults(),
+})
+building_blocks_stairs("building_blocks:Tar", {
+	description = S("Tar"),
+	tiles = {"building_blocks_tar.png"},
+	is_ground_content = true,
+	groups = {crumbly=1, tar_block = 1},
+	sounds = default.node_sound_stone_defaults(),
+})
+building_blocks_stairs("building_blocks:Marble", {
+	description = S("Marble"),
+	tiles = {"building_blocks_marble.png"},
+	is_ground_content = true,
+	groups = {cracky=3, marble = 1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("building_blocks:brobble_spread", {
+	drawtype = "raillike",
+	-- Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
+	-- Translate however you see fit.
+	description = S("Brobble Spread"),
+	tiles = {"building_blocks_brobble.png"},
+	inventory_image = "building_blocks_brobble_spread_inv.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+                -- but how to specify the dimensions for curved and sideways rails?
+                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {crumbly=3},
+})
+minetest.register_node("building_blocks:gravel_spread", {
+	drawtype = "raillike",
+	description = S("Gravel Spread"),
+	tiles = {"default_gravel.png"},
+	inventory_image = "building_blocks_gravel_spread_inv.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+                -- but how to specify the dimensions for curved and sideways rails?
+                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {crumbly=2},
+	sounds = default.node_sound_dirt_defaults({
+		footstep = {name="default_gravel_footstep", gain=0.5},
+		dug = {name="default_gravel_footstep", gain=1.0},
+	}),
+})
+minetest.register_node("building_blocks:Tarmac_spread", {
+	drawtype = "raillike",
+	description = S("Tarmac Spread"),
+	tiles = {"building_blocks_tar.png"},
+	inventory_image = "building_blocks_tar_spread_inv.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+                -- but how to specify the dimensions for curved and sideways rails?
+                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {cracky=3},
+	sounds = default.node_sound_dirt_defaults(),
+})
+minetest.register_node("building_blocks:terrycloth_towel", {
+	drawtype = "raillike",
+	description = S("Terrycloth towel"),
+	tiles = {"building_blocks_towel.png"},
+	inventory_image = "building_blocks_towel_inv.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+                -- but how to specify the dimensions for curved and sideways rails?
+                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {crumbly=3},
+})
+
+minetest.register_node("building_blocks:BWtile", {
+	drawtype = "nodebox",
+	description = S("Chess board tiling"),
+	tiles = {
+		"building_blocks_BWtile.png",
+		"building_blocks_BWtile.png^[transformR90",
+		"building_blocks_BWtile.png^[transformR90",
+		"building_blocks_BWtile.png^[transformR90",
+		"building_blocks_BWtile.png",
+		"building_blocks_BWtile.png"
+	},
+	inventory_image = "building_blocks_bwtile_inv.png",
+	paramtype = "light",
+	walkable = false,
+	node_box = {
+		type = "fixed",
+		fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {crumbly=3},
+})
+
+minetest.register_node("building_blocks:Fireplace", {
+	description = S("Fireplace"),
+	tiles = {
+		"building_blocks_cast_iron.png",
+		"building_blocks_cast_iron.png",
+		"building_blocks_cast_iron.png",
+		"building_blocks_cast_iron_fireplace.png"
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	light_source = default.LIGHT_MAX,
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {cracky=2},
+	sounds = default.node_sound_stone_defaults(),
+})

building_blocks/others.lua

@@ -0,0 +1,23 @@
+local S = homedecor_i18n.gettext
+
+minetest.register_craftitem("building_blocks:sticks", {
+	description = S("Small bundle of sticks"),
+	image = "building_blocks_sticks.png",
+	on_place_on_ground = minetest.craftitem_place_item,
+})
+minetest.register_craftitem("building_blocks:tar_base", {
+	description = S("Tar base"),
+	image = "building_blocks_tar_base.png",
+})
+
+minetest.register_tool("building_blocks:knife", {
+	description = S("Tar Knife"),
+	inventory_image = "building_blocks_knife.png",
+	tool_capabilities = {
+		max_drop_level=0,
+		groupcaps={
+			choppy={times={[2]=7.50, [3]=2.80}, uses=100, maxlevel=1},
+			fleshy={times={[2]=5.50, [3]=2.80}, uses=100, maxlevel=1}
+		}
+	},
+})

building_blocks/recipes.lua

@@ -0,0 +1,170 @@
+local S = homedecor_i18n.gettext
+
+if minetest.get_modpath("moreblocks") then
+	minetest.register_craft({
+		output = 'building_blocks:sticks 2',
+		recipe = {
+			{'group:stick', ''           , 'group:stick'},
+			{'group:stick', 'group:stick', 'group:stick'},
+			{'group:stick', 'group:stick', 'group:stick'},
+		}
+	})
+else
+	minetest.register_craft({
+		output = 'building_blocks:sticks',
+		recipe = {
+			{'group:stick', 'group:stick'},
+			{'group:stick', 'group:stick'},
+		}
+	})
+end
+
+minetest.register_craft({
+	output = 'building_blocks:Adobe 3',
+	recipe = {
+		{"default:sand"},
+		{"default:clay"},
+		{"group:stick"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:brobble_spread 4',
+	recipe = {
+		{"default:brick", "default:cobble", "default:brick"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:BWtile 10',
+	recipe = {
+		{"group:marble", "group:tar_block"},
+		{"group:tar_block", "group:marble"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:fakegrass 2',
+	recipe = {
+		{'default:leaves'},
+		{"default:dirt"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:Fireplace 1',
+	recipe = {
+		{"default:steel_ingot", "building_blocks:sticks", "default:steel_ingot"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:grate 1',
+	recipe = {
+		{"default:steel_ingot", "default:steel_ingot"},
+		{"default:glass", "default:glass"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:gravel_spread 4',
+	recipe = {
+		{"default:gravel", "default:gravel", "default:gravel"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:hardwood 2',
+	recipe = {
+		{"default:wood", "default:junglewood"},
+		{"default:junglewood", "default:wood"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:hardwood 2',
+	recipe = {
+		{"default:junglewood", "default:wood"},
+		{"default:wood", "default:junglewood"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:knife 1',
+	recipe = {
+		{"group:tar_block"},
+		{"group:stick"},
+	}
+})
+minetest.register_craft({
+	output = "building_blocks:Marble 9",
+	recipe = {
+		{"default:clay", "group:tar_block", "default:clay"},
+		{"group:tar_block","default:clay", "group:tar_block"},
+		{"default:clay", "group:tar_block","default:clay"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:Roofing 10',
+	recipe = {
+		{"building_blocks:Adobe", "building_blocks:Adobe"},
+		{"building_blocks:Adobe", "building_blocks:Adobe"},
+	}
+})
+minetest.register_craft({
+	output = 'default:stick 4',
+	recipe = {
+		{'building_blocks:sticks'},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:tar_base 4',
+	recipe = {
+		{"default:coal_lump", "default:gravel"},
+		{"default:gravel", "default:coal_lump"}
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:tar_base 4',
+	recipe = {
+		{"default:gravel", "default:coal_lump"},
+		{"default:coal_lump", "default:gravel"}
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:Tarmac_spread 4',
+	recipe = {
+		{"group:tar_block", "group:tar_block"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:terrycloth_towel 2',
+	recipe = {
+		{"farming:string", "farming:string", "farming:string"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:woodglass 1',
+	recipe = {
+		{"default:wood"},
+		{"default:glass"},
+	}
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "building_blocks:smoothglass",
+	recipe = "default:glass"
+})
+minetest.register_craft({
+	type = "cooking",
+	output = "building_blocks:Tar",
+	recipe = "building_blocks:tar_base",
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "building_blocks:hardwood",
+	burntime = 28,
+})
+minetest.register_craft({
+	type = "fuel",
+	recipe = "building_blocks:sticks",
+	burntime = 5,
+})
+minetest.register_craft({
+	type = "fuel",
+	recipe = "building_blocks:Tar",
+	burntime = 40,
+})

chains/init.lua

@@ -3,14 +3,14 @@ local S = homedecor_i18n.gettext
 
 local chains_sbox = {
 	type = "fixed",
-	fixed = { -0.1, -0.625, -0.1, 0.1, 0.5, 0.1 }
+	fixed = { -0.1, -0.5, -0.1, 0.1, 0.5, 0.1 }
 }
 
 local topchains_sbox = {
 	type = "fixed",
 	fixed = {
 		{ -0.25, 0.35, -0.25, 0.25, 0.5, 0.25 },
-		{ -0.1, -0.625, -0.1, 0.1, 0.4, 0.1 }
+		{ -0.1, -0.5, -0.1, 0.1, 0.4, 0.1 }
 	}
 }
 
@@ -73,7 +73,7 @@ minetest.register_node("chains:chain_top_brass", {
 minetest.register_node("chains:chandelier", {
 	description = S("Chandelier (wrought iron)"),
 	paramtype = "light",
-	light_source = default.LIGHT_MAX-2,
+	light_source = 12,
 	walkable = false,
 	climbable = true,
 	sunlight_propagates = true,
@@ -99,7 +99,7 @@ minetest.register_node("chains:chandelier", {
 minetest.register_node("chains:chandelier_brass", {
 	description = S("Chandelier (brass)"),
 	paramtype = "light",
-	light_source = default.LIGHT_MAX-2,
+	light_source = 12,
 	walkable = false,
 	climbable = true,
 	sunlight_propagates = true,

computer/locale/es.txt

@@ -1,6 +0,0 @@
-
-# Language: Español
-# Author: Diego Martínez <lkaezadl3@gmail.com>
-
-Plastic sheet = Placa de Plastico
-Unprocessed Plastic base = Base de Plastico No Procesada

computer/locale/ru.txt

@@ -1,6 +0,0 @@
-
-# Language: Russian
-# Author: inpos <inpos@yandex.ru>
-
-Plastic sheet = Лист пластика
-Unprocessed Plastic base = Необработанная пластиковая основа

fake_fire/init.lua

@@ -16,8 +16,8 @@ local function start_smoke(pos, node, clicker, chimney)
 			end, s_handle)
 		end
 		minetest.delete_particlespawner(id)
-		this_spawner_meta:set_int("smoky", nil)
-		this_spawner_meta:set_int("sound", nil)
+		this_spawner_meta:set_int("smoky", 0)
+		this_spawner_meta:set_int("sound", 0)
 		return
 	end
 
@@ -34,7 +34,7 @@ local function start_smoke(pos, node, clicker, chimney)
 		})
 		if chimney == 1 then
 			this_spawner_meta:set_int("smoky", id)
-			this_spawner_meta:set_int("sound", nil)
+			this_spawner_meta:set_int("sound", 0)
 		else
 			s_handle = minetest.sound_play("fire_small", {
 				pos = pos,
@@ -62,8 +62,8 @@ local function stop_smoke(pos)
 		end, s_handle)
 	end
 
-	this_spawner_meta:set_int("smoky", nil)
-	this_spawner_meta:set_int("sound", nil)
+	this_spawner_meta:set_int("smoky", 0)
+	this_spawner_meta:set_int("sound", 0)
 end
 
 minetest.register_node("fake_fire:ice_fire", {

homedecor/bathroom_furniture.lua

@@ -12,12 +12,9 @@ minetest.register_node("homedecor:bathroom_tiles_dark", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
-	place_param2 = 240,
 	groups = {cracky=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = unifieddyes.on_construct,
-	after_place_node = unifieddyes.recolor_on_place,
-	after_dig_node = unifieddyes.after_dig_node
 })
 
 minetest.register_node("homedecor:bathroom_tiles_medium", {
@@ -31,12 +28,9 @@ minetest.register_node("homedecor:bathroom_tiles_medium", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
-	place_param2 = 240,
 	groups = {cracky=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = unifieddyes.on_construct,
-	after_place_node = unifieddyes.recolor_on_place,
-	after_dig_node = unifieddyes.after_dig_node
 })
 
 minetest.register_node("homedecor:bathroom_tiles_light", {
@@ -50,12 +44,9 @@ minetest.register_node("homedecor:bathroom_tiles_light", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
-	place_param2 = 240,
 	groups = {cracky=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = unifieddyes.on_construct,
-	after_place_node = unifieddyes.recolor_on_place,
-	after_dig_node = unifieddyes.after_dig_node
 })
 
 local tr_cbox = {
@@ -173,21 +164,3 @@ minetest.register_lbm({
 		meta:set_string("palette", "ext")
 	end
 })
-
-minetest.register_lbm({
-	name = "homedecor:recolor_bathroom_tiles",
-	label = "Convert bathroom tiles to use UD extended palette",
-	run_at_every_load = false,
-	nodenames = {
-		"homedecor:bathroom_tiles_light",
-		"homedecor:bathroom_tiles_medium",
-		"homedecor:bathroom_tiles_dark",
-	},
-	action = function(pos, node)
-		local meta = minetest.get_meta(pos)
-		if meta:get_string("palette") ~= "ext" then
-			minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] })
-			meta:set_string("palette", "ext")
-		end
-	end
-})

homedecor/bedroom.lua

@@ -52,13 +52,11 @@ homedecor.register("bed_regular", {
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 		if not placer:get_player_control().sneak then
 			return homedecor.bed_expansion(pos, placer, itemstack, pointed_thing)
 		end
 	end,
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)
-		unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
 		homedecor.unextend_bed(pos)
 	end,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
@@ -67,9 +65,7 @@ homedecor.register("bed_regular", {
 			homedecor.bed_expansion(pos, clicker, itemstack, pointed_thing, true)
 			return itemstack
 		else
---			if minetest.get_modpath("beds") then
---				beds.on_rightclick(pos, clicker)
---			end
+			homedecor.beds_on_rightclick(pos, node, clicker)
 			return itemstack
 		end
 	end
@@ -93,18 +89,13 @@ homedecor.register("bed_extended", {
 	sounds = default.node_sound_wood_defaults(),
 	expand = { forward = "air" },
 	on_rotate = screwdriver.disallow,
-	after_place_node = unifieddyes.recolor_on_place,
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)
-		unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
 		homedecor.unextend_bed(pos)
 	end,
---	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
---		local itemname = itemstack:get_name()
---		if minetest.get_modpath("beds") then
---			beds.on_rightclick(pos, clicker)
---		end
---		return itemstack
---	end,
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		homedecor.beds_on_rightclick(pos, node, clicker)
+		return itemstack
+	end,
 	drop = "homedecor:bed_regular"
 })
 
@@ -129,23 +120,18 @@ homedecor.register("bed_kingsize", {
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)
-		unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
 		local inv = digger:get_inventory()
 		if digger:get_player_control().sneak and inv:room_for_item("main", "homedecor:bed_regular 2") then
 			inv:remove_item("main", "homedecor:bed_kingsize 1")
 			inv:add_item("main", "homedecor:bed_regular 2")
 		end
 	end,
---	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
---		local itemname = itemstack:get_name()
---		if minetest.get_modpath("beds") then
---			beds.on_rightclick(pos, clicker)
---		end
---		return itemstack
---	end
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		homedecor.beds_on_rightclick(pos, node, clicker)
+		return itemstack
+	end,
 })
 
 for _, w in pairs({ N_("mahogany"), N_("oak") }) do

homedecor/books.lua

@@ -156,13 +156,20 @@ for _, c in ipairs(bookcolors) do
 end
 
 minetest.register_on_player_receive_fields(function(player, form_name, fields)
-	if form_name ~= BOOK_FORMNAME or not fields.save then
-		return
+	if form_name ~= BOOK_FORMNAME then
+		return false
 	end
 	local player_name = player:get_player_name()
 	local pos = player_current_book[player_name]
-	if not pos then return end
+	if not pos then
+		return true
+	end
 	local meta = minetest.get_meta(pos)
+	local owner = meta:get_string("owner")
+	if owner ~= "" and player_name ~= owner or not fields.save then
+		player_current_book[player_name] = nil
+		return true
+	end
 	meta:set_string("title", fields.title or "")
 	meta:set_string("text", fields.text or "")
 	meta:set_string("owner", player_name)
@@ -171,6 +178,9 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields)
 	end
 	minetest.log("action", S("@1 has written in a book (title: \"@2\"): \"@3\" at location @4",
 			player:get_player_name(), fields.title, fields.text, minetest.pos_to_string(player:getpos())))
+
+	player_current_book[player_name] = nil
+	return true
 end)
 
 minetest.register_alias("homedecor:book", "homedecor:book_grey")

homedecor/climate-control.lua

@@ -25,7 +25,6 @@ minetest.register_entity("homedecor:mesh_desk_fan", {
 })
 
 local add_mesh_desk_fan_entity = function(pos)
-	print("in add_mesh_desk_fan_entity()")
 	local param2 = minetest.get_node(pos).param2
 	local entity = minetest.add_entity(pos, "homedecor:mesh_desk_fan")
 	if param2 == 0 then

homedecor/crafts.lua

@@ -546,6 +546,17 @@ minetest.register_craft( {
 	},
 })
 
+unifieddyes.register_color_craft({
+	output = "homedecor:shutter_colored",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:shutter",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 minetest.register_craft({
         type = "fuel",
         recipe = "homedecor:shutter_oak",
@@ -867,6 +878,28 @@ minetest.register_craft( {
 	},
 })
 
+unifieddyes.register_color_craft({
+	output = "homedecor:curtain_closed",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:curtain_closed",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:curtain_open",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:curtain_open",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 local mats = {
 	{ "brass", "homedecor:pole_brass" },
 	{ "wrought_iron", "homedecor:pole_wrought_iron" },
@@ -1195,7 +1228,6 @@ minetest.register_craft( {
 minetest.register_craft({
 	output = "homedecor:glowlight_half 6",
 	recipe = {
-		{ "dye:white", "dye:white", "dye:white" },
 		{ "default:glass", "homedecor:power_crystal", "default:glass", },
 	}
 })
@@ -1203,11 +1235,38 @@ minetest.register_craft({
 minetest.register_craft({
         output = "homedecor:glowlight_half 6",
         recipe = {
-		{ "dye:white", "dye:white", "dye:white" },
 		{"moreblocks:super_glow_glass", "moreblocks:glow_glass", "moreblocks:super_glow_glass", },
 	}
 })
 
+minetest.register_craft({
+        output = "homedecor:glowlight_half",
+        recipe = {
+		{"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"},
+		{"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"}
+	}
+})
+
+minetest.register_craft({
+		output = "homedecor:glowlight_half",
+		type = "shapeless",
+		recipe = {
+		"homedecor:glowlight_quarter",
+		"homedecor:glowlight_quarter"
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:glowlight_half",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:glowlight_half",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 minetest.register_craft({
         output = "homedecor:glowlight_quarter 6",
         recipe = {
@@ -1215,6 +1274,17 @@ minetest.register_craft({
 	}
 })
 
+unifieddyes.register_color_craft({
+	output = "homedecor:glowlight_quarter",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:glowlight_quarter",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 minetest.register_craft({
 	output = "homedecor:glowlight_small_cube 8",
 	recipe = {
@@ -1239,20 +1309,14 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-        output = "homedecor:glowlight_half",
-        recipe = {
-		{"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"},
-		{"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"}
-	}
-})
-
-minetest.register_craft({
-		output = "homedecor:glowlight_half",
-		type = "shapeless",
-		recipe = {
-		"homedecor:glowlight_quarter",
-		"homedecor:glowlight_quarter"
+unifieddyes.register_color_craft({
+	output = "homedecor:glowlight_small_cube",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:glowlight_small_cube",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
 	}
 })
 
@@ -2227,6 +2291,17 @@ minetest.register_craft( {
 		},
 })
 
+unifieddyes.register_color_craft({
+	output = "homedecor:bathroom_tiles_light",
+	palette = "extended",
+	type = "shapeless",
+	neutral_node = "homedecor:bathroom_tiles_light",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 minetest.register_craft( {
 		output = "homedecor:bathroom_tiles_medium 4",
 		recipe = {
@@ -2235,6 +2310,17 @@ minetest.register_craft( {
 		},
 })
 
+unifieddyes.register_color_craft({
+	output = "homedecor:bathroom_tiles_medium",
+	palette = "extended",
+	type = "shapeless",
+	neutral_node = "homedecor:bathroom_tiles_medium",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 minetest.register_craft( {
 		output = "homedecor:bathroom_tiles_dark 4",
 		recipe = {
@@ -2243,6 +2329,17 @@ minetest.register_craft( {
 		},
 })
 
+unifieddyes.register_color_craft({
+	output = "homedecor:bathroom_tiles_dark",
+	palette = "extended",
+	type = "shapeless",
+	neutral_node = "homedecor:bathroom_tiles_dark",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 -- misc electrical
 
 minetest.register_craft( {
@@ -2476,6 +2573,17 @@ minetest.register_craft( {
 	},
 })
 
+unifieddyes.register_color_craft({
+	output = "homedecor:bed_regular",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:bed_regular",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 minetest.register_craft( {
 	output = "homedecor:bed_kingsize",
 	recipe = {
@@ -2483,6 +2591,29 @@ minetest.register_craft( {
 	},
 })
 
+unifieddyes.register_color_craft({
+	output = "homedecor:bed_kingsize",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:bed_kingsize",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:bed_kingsize",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:bed_regular",
+	recipe = {
+		"NEUTRAL_NODE",
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 minetest.register_craft( {
         output = "homedecor:bottle_green",
         recipe = {
@@ -2843,6 +2974,17 @@ minetest.register_craft({
 	},
 })
 
+unifieddyes.register_color_craft({
+	output = "homedecor:desk_lamp",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:desk_lamp",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 minetest.register_craft({
 	output = "homedecor:hanging_lantern 2",
 	recipe = {
@@ -2920,7 +3062,7 @@ minetest.register_craft({
 	recipe = {
 		{ "", "technic:brass_ingot", ""},
 		{ "", "homedecor:chainlink_brass", ""},
-		{ "default:glass", "homedecor:glowlight_small", "default:glass"}
+		{ "default:glass", "homedecor:glowlight_small_cube", "default:glass"}
 	},
 })
 
@@ -2928,7 +3070,7 @@ minetest.register_craft({
 	output = "homedecor:ceiling_lamp",
 	recipe = {
 		{ "", "chains:chain_top_brass", ""},
-		{ "default:glass", "homedecor:glowlight_small", "default:glass"}
+		{ "default:glass", "homedecor:glowlight_small_cube", "default:glass"}
 	},
 })
 
@@ -2950,23 +3092,29 @@ minetest.register_craft({
 	},
 })
 
-minetest.register_craft({
-	type = "shapeless",
-	output = "homedecor:coin 5",
-	recipe = {"moreblocks:micro_goldblock_1", "default:sword_stone"}
-})
+if minetest.settings:get_bool("homedecor.disable_coin_crafting") == false then
+	minetest.register_craft({
+		type = "shapeless",
+		output = "homedecor:coin 5",
+		recipe = {"moreblocks:micro_goldblock_1", "default:sword_stone"}
+	})
 
-minetest.register_craft({
-	type = "shapeless",
-	output = "homedecor:coin 15",
-	recipe = {"default:gold_ingot", "default:sword_steel"}
-})
+	minetest.register_craft({
+		type = "shapeless",
+		output = "homedecor:coin 15",
+		recipe = {"default:gold_ingot", "default:sword_steel"}
+	})
 
-minetest.register_craft({
-	type = "shapeless",
-	output = "homedecor:coin 50",
-	recipe = {"default:goldblock", "default:sword_mese"}
-})
+	minetest.register_craft({
+		type = "shapeless",
+		output = "homedecor:coin 50",
+		recipe = {"default:goldblock", "default:sword_mese"}
+	})
+else
+	if minetest.settings:get("log_mods") then
+		minetest.log("[HomeDecor] " .. S("coin crafting is disabled!"))
+	end
+end
 
 minetest.register_craft({
 	output = "homedecor:lattice_wood 8",
@@ -3125,6 +3273,19 @@ for i in ipairs(homedecor.banister_materials) do
 	})
 end
 
+unifieddyes.register_color_craft({
+	output = "",
+	palette = "split",
+	neutral_node = "homedecor:banister_wood_horizontal",
+	type = "shapeless",
+	output_prefix = "homedecor:banister_wood_horizontal_",
+	output_suffix = "",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE",
+	}
+})
+
 if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then
 	technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"homedecor:oil_extract 2","dye:yellow 1"} })
 end

homedecor/depends.txt

@@ -1,6 +1,7 @@
 default
 unifieddyes
 homedecor_i18n
+creative
 building_blocks?
 signs_lib?
 moreblocks?
@@ -11,3 +12,5 @@ bucket?
 beds?
 flowers?
 3d_armor?
+skinsdb?
+mesecons?

homedecor/doors_and_gates.lua

@@ -4,6 +4,8 @@ local S = homedecor_i18n.gettext
 
 local function N_(x) return x end
 
+local m_rules = mesecon and mesecon.rules and mesecon.rules.pplate
+
 -- doors
 
 local function isSolid(pos, adjust)
@@ -264,6 +266,7 @@ for i, side in ipairs(sides) do
 			drop = "homedecor:door_"..doorname.."_left",
 		    mesecons = {
 		        effector = {
+					rules = m_rules,
 		            action_on = function(pos,node)
 		                local isClosed = getClosed(pos)
 		                if isClosed then
@@ -405,6 +408,7 @@ for i, g in ipairs(gate_list) do
 		end,
         mesecons = {
             effector = {
+				rules = m_rules,
                 action_on = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "closed") end
             }
         }
@@ -433,6 +437,7 @@ for i, g in ipairs(gate_list) do
         return itemstack
 	end
     def.mesecons.effector = {
+		rules = m_rules,
         action_off = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "open") end
     }
 

homedecor/furniture.lua

@@ -83,9 +83,7 @@ homedecor.register("kitchen_chair_padded", {
 	sounds = default.node_sound_wood_defaults(),
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
-	after_dig_node = unifieddyes.after_dig_node,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		pos.y = pos.y+0 -- where do I put my ass ?
@@ -110,9 +108,7 @@ homedecor.register("armchair", {
 	node_box = ac_cbox,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
-	after_dig_node = unifieddyes.after_dig_node,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 })
 
@@ -235,8 +231,6 @@ minetest.register_lbm({
 		local param2 = paletteidx + new_fdir
 		local newname = "homedecor:armchair"
 
-		print(name, dump(a), dump(b), dump(color).."("..dump(paletteidx)..")", dump(param2))
-
 		if node.name == "homedecor:chair" then
 			newname = "homedecor:kitchen_chair_wood"
 		elseif string.find(node.name, "homedecor:chair_") then

homedecor/furniture_recipes.lua

@@ -70,6 +70,17 @@ minetest.register_craft({
 	},
 })
 
+unifieddyes.register_color_craft({
+	output = "homedecor:armchair",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:armchair",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "homedecor:kitchen_chair_padded",
@@ -79,6 +90,17 @@ minetest.register_craft({
 	},
 })
 
+unifieddyes.register_color_craft({
+	output = "homedecor:kitchen_chair_padded",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:kitchen_chair_padded",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 minetest.register_craft({
 	type = "fuel",
 	recipe = "homedecor:kitchen_chair_wood",
@@ -106,6 +128,17 @@ minetest.register_craft({
 	},
 })
 
+unifieddyes.register_color_craft({
+	output = "homedecor:standing_lamp_off",
+	palette = "extended",
+	type = "shapeless",
+	neutral_node = "homedecor:standing_lamp_off",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 minetest.register_craft({
 	type = "fuel",
 	recipe = "homedecor:table_lamp_off",
@@ -131,14 +164,34 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "homedecor:standing_lamp_off",
+	output = "homedecor:table_lamp_off",
 	recipe = {
-		{ "homedecor:table_lamp_off"},
-		{ "group:stick"},
-		{ "group:stick"},
+		{ "wool:white", "default:torch", "wool:white"},
+		{ "", "group:stick", ""},
+		{ "", "moreblocks:slab_wood", "" },
 	},
 })
 
+minetest.register_craft({
+	output = "homedecor:table_lamp_off",
+	recipe = {
+		{ "cottages:wool", "default:torch", "cottages:wool"},
+		{ "", "group:stick", ""},
+		{ "", "moreblocks:slab_wood", "" },
+	},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:table_lamp_off",
+	palette = "extended",
+	type = "shapeless",
+	neutral_node = "homedecor:table_lamp_off",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 minetest.register_craft({
 	output = "homedecor:toilet",
 	recipe = {

homedecor/handlers/expansion.lua

@@ -211,22 +211,21 @@ function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, trybunks
 	local rightnode = minetest.get_node(rightpos)
 
 	local inv = placer:get_inventory()
-	local lastdye = unifieddyes.last_used_dye[placer_name]
 
 	if leftnode.name == "homedecor:bed_regular" then
 		local newname = string.gsub(thisnode.name, "_regular", "_kingsize")
-		local meta = minetest.get_meta(leftpos)
+		local meta = minetest.get_meta(pos)
+		local leftmeta = minetest.get_meta(leftpos)
+
 		minetest.set_node(pos, {name = "air"})
-		minetest.set_node(leftpos, { name = newname, param2 = param2})
-		meta:set_string("dye", lastdye)
-		inv:add_item("main", lastdye)
+		minetest.swap_node(leftpos, { name = newname, param2 = param2})
 	elseif rightnode.name == "homedecor:bed_regular" then
 		local newname = string.gsub(thisnode.name, "_regular", "_kingsize")
-		local meta = minetest.get_meta(rightpos)
+		local meta = minetest.get_meta(pos)
+		local rightmeta = minetest.get_meta(rightpos)
+
 		minetest.set_node(rightpos, {name = "air"})
-		minetest.set_node(pos, { name = newname, param2 = param2})
-		meta:set_string("dye", lastdye)
-		inv:add_item("main", lastdye)
+		minetest.swap_node(pos, { name = newname, param2 = param2})
 	end
 
 	local toppos = {x=pos.x, y=pos.y+1.0, z=pos.z}
@@ -235,14 +234,7 @@ function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, trybunks
 	if trybunks and is_buildable_to(placer_name, toppos, topposfwd) then
 		local newname = string.gsub(thisnode.name, "_regular", "_extended")
 		local newparam2 = param2 % 8
-		if inv:contains_item("main", lastdye) then
-			minetest.set_node(toppos, { name = thisnode.name, param2 = param2})
-			if lastdye then inv:remove_item("main", lastdye.." 1") end
-		else
-			minetest.set_node(toppos, { name = thisnode.name, param2 = newparam2})
-			minetest.chat_send_player(placer_name, "Ran out of "..lastdye..", using neutral color.")
-			unifieddyes.last_used_dye[placer_name] = nil
-		end
+		minetest.swap_node(toppos, { name = thisnode.name, param2 = param2})
 		minetest.swap_node(pos, { name = newname, param2 = param2})
 		itemstack:take_item()
 	end
@@ -265,6 +257,8 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
 	if not pos then return itemstack end
 
 	local fdir = minetest.dir_to_facedir(placer:get_look_dir())
+	local meta = itemstack:get_meta()
+	local pindex = meta:get_int("palette_index")
 
 	local abovepos  = { x=pos.x, y=pos.y+1, z=pos.z }
 	local abovenode = minetest.get_node(abovepos)
@@ -379,7 +373,7 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
 		end
 	end
 
-	minetest.set_node(pos, {name = new_place_name, param2 = fdir})
+	minetest.set_node(pos, {name = new_place_name, param2 = fdir+pindex})
 	itemstack:take_item()
 	return itemstack
 end

homedecor/handlers/init.lua

@@ -19,4 +19,6 @@ dofile(handlerpath.."registration.lua")
 -- some nodes have particle spawners
 dofile(handlerpath.."water_particles.lua")
 
+
+dofile(handlerpath.."mt_game_beds_functions.lua")
 dofile(handlerpath.."sit.lua")

homedecor/handlers/mt_game_beds_functions.lua

@@ -0,0 +1,175 @@
+-- This file is a partial copy of functions.lua from minetest_game's beds mod
+-- with changes needed for homedecor's beds.
+
+local pi = math.pi
+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
+
+-- Helper functions
+
+local function get_look_yaw(pos)
+	local n = minetest.get_node(pos)
+	local fdir = n.param2 % 4
+	if fdir == 0 then
+		return pi / 2, fdir
+	elseif fdir == 1 then
+		return -pi / 2, fdir
+	elseif fdir == 3 then
+		return pi, fdir
+	else
+		return 0, fdir
+	end
+end
+
+local function is_night_skip_enabled()
+	local enable_night_skip = minetest.settings:get_bool("enable_bed_night_skip")
+	if enable_night_skip == nil then
+		enable_night_skip = true
+	end
+	return enable_night_skip
+end
+
+local function check_in_beds(players)
+	local in_bed = beds.player
+	if not players then
+		players = minetest.get_connected_players()
+	end
+
+	for n, player in ipairs(players) do
+		local name = player:get_player_name()
+		if not in_bed[name] then
+			return false
+		end
+	end
+
+	return #players > 0
+end
+
+local function get_player_in_bed()
+	local player_in_bed = 0
+	for k,v in pairs(beds.player) do
+		player_in_bed = player_in_bed + 1
+	end
+	return player_in_bed
+end
+
+local function lay_down(player, pos, bed_pos, state, skip)
+	local name = player:get_player_name()
+	local hud_flags = player:hud_get_flags()
+
+	if not player or not name then
+		return
+	end
+
+	-- 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
+		end
+		-- skip here to prevent sending player specific changes (used for leaving players)
+		if skip then
+			return
+		end
+		if p then
+			player:setpos(p)
+		end
+
+		-- 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:set_physics_override(1, 1, 1)
+		hud_flags.wielditem = true
+		default.player_set_animation(player, "stand" , 30)
+
+	-- lay down
+	else
+		beds.player[name] = 1
+		beds.pos[name] = pos
+		-- physics, eye_offset, etc
+		player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0})
+		local yaw, fdir = get_look_yaw(bed_pos)
+		player:set_look_horizontal(yaw)
+		local offsets = {
+			[0] = {0.5,     0},
+			[1] = {-0.5,    0},
+			[2] = {0,    -0.5},
+			[3] = {0,     0.5}
+		}
+		local p = {x = bed_pos.x + offsets[fdir][1], y = bed_pos.y, z = bed_pos.z + offsets[fdir][2]}
+		player:set_physics_override(0, 0, 0)
+		player:setpos(p)
+		default.player_attached[name] = true
+		hud_flags.wielditem = false
+		default.player_set_animation(player, "lay" , 0)
+	end
+
+	player:hud_set_flags(hud_flags)
+end
+
+local function update_formspecs(finished)
+	local ges = #minetest.get_connected_players()
+	local player_in_bed = get_player_in_bed()
+	local form_n
+	local is_majority = (ges / 2) < player_in_bed
+
+	if finished then
+		form_n = beds.formspec .. "label[2.7,11; Good morning.]"
+	else
+		form_n = beds.formspec .. "label[2.2,11;" .. tostring(player_in_bed) ..
+			" of " .. tostring(ges) .. " players are in bed]"
+		if is_majority and is_night_skip_enabled() then
+			form_n = form_n .. "button_exit[2,8;4,0.75;force;Force night skip]"
+		end
+	end
+
+	for name,_ in pairs(beds.player) do
+		minetest.show_formspec(name, "beds_form", form_n)
+	end
+end
+
+
+-- Public functions
+
+function homedecor.beds_on_rightclick(pos, node, player)
+	local name = player:get_player_name()
+	local ppos = player:getpos()
+	local tod = minetest.get_timeofday()
+
+	if tod > 0.2 and tod < 0.805 then
+		if beds.player[name] then
+			lay_down(player, nil, nil, false)
+		end
+		minetest.chat_send_player(name, "You can only sleep at night.")
+		return
+	end
+
+	-- move to bed
+	if not beds.player[name] then
+		lay_down(player, ppos, pos)
+		beds.set_spawns() -- save respawn positions when entering bed
+	else
+		lay_down(player, nil, nil, false)
+	end
+
+	if not is_sp then
+		update_formspecs(false)
+	end
+
+	-- skip the night and let all players stand up
+	if check_in_beds() then
+		minetest.after(2, function()
+			if not is_sp then
+				update_formspecs(is_night_skip_enabled())
+			end
+			if is_night_skip_enabled() then
+				beds.skip_night()
+				beds.kick_players()
+			end
+		end)
+	end
+end

homedecor/handlers/water_particles.lua

@@ -30,8 +30,8 @@ function homedecor.start_particle_spawner(pos, node, particledef, soundname)
 			end, s_handle)
 		end
 		minetest.delete_particlespawner(id)
-		this_spawner_meta:set_int("active", nil)
-		this_spawner_meta:set_int("sound", nil)
+		this_spawner_meta:set_int("active", 0)
+		this_spawner_meta:set_int("sound", 0)
 		return
 	end
 
@@ -109,6 +109,6 @@ function homedecor.stop_particle_spawner(pos)
 		end, s_handle)
 	end
 
-	this_spawner_meta:set_int("active", nil)
-	this_spawner_meta:set_int("sound", nil)
+	this_spawner_meta:set_int("active", 0)
+	this_spawner_meta:set_int("sound", 0)
 end

homedecor/init.lua

@@ -119,4 +119,6 @@ dofile(modpath.."/wardrobe.lua")
 
 dofile(modpath.."/crafts.lua")
 
-print("[HomeDecor] " .. S("Loaded!"))
+if minetest.settings:get_bool("log_mod") then
+	minetest.log("action", "[HomeDecor] " .. S("Loaded!"))
+end

homedecor/lighting.lua

@@ -46,9 +46,7 @@ minetest.register_node("homedecor:glowlight_half", {
 	sounds = default.node_sound_glass_defaults(),
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
-	after_dig_node = unifieddyes.after_dig_node
 })
 
 minetest.register_node("homedecor:glowlight_quarter", {
@@ -86,9 +84,7 @@ minetest.register_node("homedecor:glowlight_quarter", {
 	sounds = default.node_sound_glass_defaults(),
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
-	after_dig_node = unifieddyes.after_dig_node
 })
 
 minetest.register_node("homedecor:glowlight_small_cube", {
@@ -126,9 +122,7 @@ minetest.register_node("homedecor:glowlight_small_cube", {
 	sounds = default.node_sound_glass_defaults(),
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
-	after_dig_node = unifieddyes.after_dig_node
 })
 
 homedecor.register("plasma_lamp", {
@@ -449,7 +443,6 @@ local function reg_lamp(suffix, nxt, light, brightness)
 		paramtype = "light",
 		paramtype2 = "color",
 		palette = "unifieddyes_palette_extended.png",
-		place_param2 = 240,
 		walkable = false,
 		light_source = light,
 		selection_box = tlamp_cbox,
@@ -457,14 +450,17 @@ local function reg_lamp(suffix, nxt, light, brightness)
 		groups = {cracky=2,oddly_breakable_by_hand=1, ud_param2_colorable = 1,
 			not_in_creative_inventory=((light ~= nil) and 1) or nil,
 		},
-		drop = "homedecor:table_lamp_off",
 		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 			node.name = "homedecor:table_lamp_"..repl[suffix]
 			minetest.set_node(pos, node)
 		end,
 		on_construct = unifieddyes.on_construct,
-		after_place_node = unifieddyes.recolor_on_place,
-		after_dig_node = unifieddyes.after_dig_node
+		drop = {
+			items = {
+				{items = {"homedecor:table_lamp_off"}, inherit_color = true },
+			}
+		}
+
 	})
 
 	homedecor.register("standing_lamp_"..suffix, {
@@ -480,7 +476,6 @@ local function reg_lamp(suffix, nxt, light, brightness)
 		paramtype = "light",
 		paramtype2 = "color",
 		palette = "unifieddyes_palette_extended.png",
-		place_param2 = 240,
 		walkable = false,
 		light_source = light,
 		groups = {cracky=2,oddly_breakable_by_hand=1, ud_param2_colorable = 1,
@@ -494,9 +489,12 @@ local function reg_lamp(suffix, nxt, light, brightness)
 			minetest.set_node(pos, node)
 		end,
 		on_construct = unifieddyes.on_construct,
-		after_place_node = unifieddyes.recolor_on_place,
-		after_dig_node = unifieddyes.after_dig_node,
-		expand = { top="air" },
+		--expand = { top="air" },
+		drop = {
+			items = {
+				{items = {"homedecor:standing_lamp_off"}, inherit_color = true },
+			}
+		}
 	})
 
 	-- for old maps that had the original 3dforniture mod
@@ -535,9 +533,7 @@ homedecor.register("desk_lamp", {
 	groups = {snappy=3, ud_param2_colorable = 1},
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
-	after_dig_node = unifieddyes.after_dig_node,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew
 })
 
@@ -739,28 +735,3 @@ minetest.register_lbm({
 		meta:set_string("dye", "unifieddyes:"..color)
 	end
 })
-
-minetest.register_lbm({
-	name = "homedecor:recolor_lighting",
-	label = "Convert some kinds of lights to use UD extended palette",
-	run_at_every_load = false,
-	nodenames = {
-		"homedecor:table_lamp_off",
-		"homedecor:table_lamp_low",
-		"homedecor:table_lamp_med",
-		"homedecor:table_lamp_hi",
-		"homedecor:table_lamp_max",
-		"homedecor:standing_lamp_off",
-		"homedecor:standing_lamp_low",
-		"homedecor:standing_lamp_med",
-		"homedecor:standing_lamp_hi",
-		"homedecor:standing_lamp_max",
-	},
-	action = function(pos, node)
-		local meta = minetest.get_meta(pos)
-		if meta:get_string("palette") ~= "ext" then
-			minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] })
-			meta:set_string("palette", "ext")
-		end
-	end
-})

homedecor/misc-nodes.lua

@@ -483,23 +483,19 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
 		local name, matdesc, tile1, tile2 = unpack(mat)
 		local nodename = "banister_"..name.."_"..side
 
-		local groups = { snappy = 3, not_in_creative_inventory = 1 }
 		local cbox = {
 			type = "fixed",
 			fixed = { -9/16, -3/16, 5/16, 9/16, 24/16, 8/16 }
 		}
 
 		if side == "horizontal" then
-			groups = { snappy = 3 }
 			cbox = {
 				type = "fixed",
 				fixed = { -8/16, -8/16, 5/16, 8/16, 8/16, 8/16 }
 			}
-		else
-			minetest.register_alias(string.gsub("homedecor:"..nodename, "diagonal_", ""), "homedecor:"..nodename)
 		end
 
-		homedecor.register(nodename, {
+		local def = {
 			description = S("Banister for Stairs (@1, @2)", matdesc, sidedesc),
 			mesh = "homedecor_banister_"..side..".obj",
 			tiles = {
@@ -507,12 +503,37 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
 				tile2,
 			},
 			inventory_image = "homedecor_banister_"..name.."_inv.png",
-			groups = groups,
 			selection_box = cbox,
 			collision_box = cbox,
+			groups = { snappy = 3},
 			on_place = homedecor.place_banister,
 			drop = "homedecor:banister_"..name.."_horizontal",
-		})
+		}
+
+		if side ~= "horizontal" then
+			def.groups.not_in_creative_inventory = 1 
+		end
+
+		if name == "wood" then
+			def.palette = "unifieddyes_palette_greys.png"
+			def.airbrush_replacement_node = "homedecor:banister_wood_"..side.."_grey"
+			def.groups.ud_param2_colorable = 1
+			def.paramtype2 = "colorfacedir"
+		end
+		homedecor.register(nodename, def)
+
+		if name == "wood" then
+			local nn = "homedecor:"..nodename
+			local def2 = table.copy(minetest.registered_items[nn])
+			def2.tiles = {
+				homedecor.white_wood,
+				homedecor.white_wood
+			}
+			def2.inventory_image = "homedecor_banister_wood_colored_inv.png"
+			def2.groups.not_in_creative_inventory = 1 
+
+			unifieddyes.generate_split_palette_nodes(nn, def2, "homedecor:banister_"..name.."_horizontal")
+		end
 	end
 end
 

homedecor/shutters.lua

@@ -34,16 +34,14 @@ homedecor.register("shutter", {
 	wield_image = inv,
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
-	ud_replacement_node = "homedecor:shutter_colored",
+	airbrush_replacement_node = "homedecor:shutter_colored",
 	groups = { snappy = 3, ud_param2_colorable = 1 },
 	sounds = default.node_sound_wood_defaults(),
 	selection_box = shutter_cbox,
 	node_box = shutter_cbox,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
-	after_dig_node = unifieddyes.after_dig_node
 })
 
 homedecor.register("shutter_colored", {
@@ -60,10 +58,7 @@ homedecor.register("shutter_colored", {
 	node_box = shutter_cbox,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
-	after_dig_node = unifieddyes.after_dig_node,
-	drop = "homedecor:shutter"
 })
 
 minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet")

homedecor/wardrobe.lua

@@ -6,6 +6,75 @@ local wd_cbox = {
 	fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 }
 }
 
+-- cache set_textures function (fallback to old version)
+-- default.player_set_textures is deprecated and will be removed in future
+local set_player_textures =
+	minetest.get_modpath("player_api") and player_api.set_textures
+	or default.player_set_textures
+
+local armor_mod_path = minetest.get_modpath("3d_armor")
+
+local skinslist = {"male1", "male2", "male3", "male4", "male5"}
+local default_skin = "character.png"
+
+local skinsdb_mod_path = minetest.get_modpath("skinsdb")
+if skinsdb_mod_path then
+	for _, shrt in ipairs(skinslist) do
+		for _, prefix in ipairs({"", "fe"}) do
+			local skin_name = prefix..shrt
+			local skin_obj = skins.new("homedecor_clothes_"..skin_name..".png") -- Texture PNG file as key to be compatible in set_player_skin
+			skin_obj:set_preview("homedecor_clothes_"..skin_name.."_preview.png")
+			skin_obj:set_texture("homedecor_clothes_"..skin_name..".png")
+			skin_obj:set_meta("name", "Wardrobe "..skin_name)
+			skin_obj:set_meta("author", 'Calinou and Jordach')
+			skin_obj:set_meta("license", 'WTFPL')
+			local file = io.open(homedecor.modpath.."/textures/homedecor_clothes_"..skin_name..".png", "r")
+			skin_obj:set_meta("format", skins.get_skin_format(file))
+			file:close()
+			skin_obj:set_meta("in_inventory_list", false)
+		end
+	end
+end
+
+function homedecor.get_player_skin(player)
+	local skin = player:get_attribute("homedecor:player_skin")
+	if not skin or skin == "" then
+		return default_skin, true
+	end
+	return skin, false
+end
+
+function homedecor.set_player_skin(player, skin, save)
+	skin = skin or default_skin
+	if skinsdb_mod_path then
+		skins.set_player_skin(player, skin)
+	elseif armor_mod_path then -- if 3D_armor's installed, let it set the skin
+		armor.textures[player:get_player_name()].skin = skin
+		armor:update_player_visuals(player)
+	else
+		set_player_textures(player, { skin })
+	end
+
+	if save then
+		if skin == default_skin then
+			skin = "default"
+			player:set_attribute("homedecor:player_skin", "")
+		else
+			player:set_attribute("homedecor:player_skin", skin)
+		end
+		if save == "player" then -- if player action
+			minetest.log("verbose",
+				S("player @1 sets skin to @2", player:get_player_name(), skin) ..
+				(armor_mod_path and ' [3d_armor]' or '')
+			)
+		end
+	end
+end
+
+function homedecor.unset_player_skin(player)
+	homedecor.set_player_skin(player, nil, true)
+end
+
 homedecor.register("wardrobe", {
 	mesh = "homedecor_bedroom_wardrobe.obj",
 	tiles = {
@@ -27,16 +96,16 @@ homedecor.register("wardrobe", {
 	},
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
-		local skins = {"male1", "male2", "male3", "male4", "male5"}
 		-- textures made by the Minetest community (mostly Calinou and Jordach)
 		local clothes_strings = ""
 		for i = 1,5 do
 			clothes_strings = clothes_strings..
-			  "image_button_exit["..(i-1)..".5,0;1.1,2;homedecor_clothes_"..skins[i].."_preview.png;"..skins[i]..";]"..
-			  "image_button_exit["..(i-1)..".5,2;1.1,2;homedecor_clothes_fe"..skins[i].."_preview.png;fe"..skins[i]..";]"
+			  "image_button_exit["..(i-1)..".5,0;1.1,2;homedecor_clothes_"..skinslist[i].."_preview.png;"..skinslist[i]..";]"..
+			  "image_button_exit["..(i-1)..".5,2;1.1,2;homedecor_clothes_fe"..skinslist[i].."_preview.png;fe"..skinslist[i]..";]"
 		end
 		meta:set_string("formspec", "size[5.5,8.5]"..default.gui_bg..default.gui_bg_img..default.gui_slots..
 			"vertlabel[0,0.5;"..minetest.formspec_escape(S("Clothes")).."]"..
+			"button_exit[0,3.29;0.6,0.6;default;x]"..
 			clothes_strings..
 			"vertlabel[0,5.2;"..minetest.formspec_escape(S("Storage")).."]"..
 			"list[current_name;main;0.5,4.5;5,2;]"..
@@ -44,26 +113,17 @@ homedecor.register("wardrobe", {
 			"listring[]")
 	end,
 	on_receive_fields = function(pos, formname, fields, sender)
-		local skins = {"male1", "male2", "male3", "male4", "male5"}
-		local playerName = sender:get_player_name()
-		local armor_mod = minetest.get_modpath("3d_armor")
+		if fields.default then
+			homedecor.set_player_skin(sender, nil, "player")
+			return
+		end
 
 		for i = 1,5 do
-			if fields[skins[i]] then
-				if armor_mod then -- if 3D_armor's installed, let it set the skin
-					armor.textures[playerName].skin = "homedecor_clothes_"..skins[i]..".png"
-					armor:update_player_visuals(sender)
-					break
-				end
-				default.player_set_textures(sender, { "homedecor_clothes_"..skins[i]..".png" })
+			if fields[skinslist[i]] then
+				homedecor.set_player_skin(sender, "homedecor_clothes_"..skinslist[i]..".png", "player")
 				break
-			elseif fields["fe"..skins[i]] then
-				if armor_mod then
-					armor.textures[playerName].skin = "homedecor_clothes_fe"..skins[i]..".png"
-					armor:update_player_visuals(sender)
-					break
-				end
-				default.player_set_textures(sender, { skin = "homedecor_clothes_fe"..skins[i]..".png" })
+			elseif fields["fe"..skinslist[i]] then
+				homedecor.set_player_skin(sender, "homedecor_clothes_fe"..skinslist[i]..".png", "player")
 				break
 			end
 		end
@@ -72,3 +132,14 @@ homedecor.register("wardrobe", {
 
 minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe")
 minetest.register_alias("homedecor:wardrobe_top", "air")
+
+minetest.register_on_joinplayer(function(player)
+	local skin = player:get_attribute("homedecor:player_skin")
+
+	if skin and skin ~= "" then
+		-- setting player skin on connect has no effect, so delay skin change
+		minetest.after(1, function(player, skin)
+			homedecor.set_player_skin(player, skin)
+		end, player, skin)
+	end
+end)

homedecor/window_treatments.lua

@@ -112,10 +112,8 @@ minetest.register_node("homedecor:curtain_closed", {
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
 	selection_box = { type = "wallmounted" },
-	after_dig_node = unifieddyes.after_dig_node,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z})
@@ -141,10 +139,8 @@ minetest.register_node("homedecor:curtain_open", {
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
 	selection_box = { type = "wallmounted" },
-	after_dig_node = unifieddyes.after_dig_node,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z})

homedecor_i18n/locale/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-03 20:37+0200\n"
+"POT-Creation-Date: 2017-11-14 03:47+0800\n"
 "PO-Revision-Date: 2017-08-13 13:26+0200\n"
 "Last-Translator: Wuzzy <almikes@aol.com>\n"
 "Language-Team: German\n"
@@ -18,148 +18,84 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.2\n"
 
-#: ../building_blocks/init.lua
-msgid "Adobe"
-msgstr "Adobe"
+#: ../building_blocks/alias.lua
+msgid "Granite"
+msgstr "Granit"
 
-#: ../building_blocks/init.lua
-msgid "Roof block"
-msgstr "Dachblock"
-
-#: ../building_blocks/init.lua
-msgid "Streak Free Glass"
-msgstr "Schlierenfreies Glas"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Grate"
 msgstr "Rost"
 
-#: ../building_blocks/init.lua
-msgid "Fireplace"
-msgstr "Kamin"
+#: ../building_blocks/node_stairs.lua
+msgid "Streak Free Glass"
+msgstr "Schlierenfreies Glas"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Wood Framed Glass"
 msgstr "Holzrahmenglas"
 
-#: ../building_blocks/init.lua
-msgid "Terrycloth towel"
-msgstr "Frottiertuch"
+#: ../building_blocks/node_stairs.lua
+msgid "Adobe"
+msgstr "Adobe"
 
-#: ../building_blocks/init.lua
-msgid "Tarmac Spread"
-msgstr "Asphaltboden"
-
-#: ../building_blocks/init.lua
-msgid "Chess board tiling"
-msgstr "Schachbrettkacheln"
-
-#. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
-#. Translate however you see fit.
-#: ../building_blocks/init.lua
-msgid "Brobble Spread"
-msgstr "Ziesterboden"
-
-#: ../building_blocks/init.lua
-msgid "Gravel Spread"
-msgstr "Kiesboden"
-
-#: ../building_blocks/init.lua
-msgid "Hardwood"
-msgstr "Hartholz"
-
-#: ../building_blocks/init.lua
-msgid "Marble"
-msgstr "Marmor"
-
-#: ../building_blocks/init.lua
-msgid "Grass"
-msgstr "Gras"
-
-#: ../building_blocks/init.lua
-msgid "Tar"
-msgstr "Teer"
-
-#: ../building_blocks/init.lua
-msgid "Roofing"
-msgstr "Dachdeckung"
-
-#: ../building_blocks/init.lua
-msgid "Marble stair"
-msgstr "Marmortreppe"
-
-#: ../building_blocks/init.lua
-msgid "Marble slab"
-msgstr "Marmorstufe"
-
-#: ../building_blocks/init.lua
-msgid "Hardwood stair"
-msgstr "Hartholztreppe"
-
-#: ../building_blocks/init.lua
-msgid "Hardwood slab"
-msgstr "Hartholzstufe"
-
-#: ../building_blocks/init.lua
-msgid "Grass stair"
-msgstr "Grastreppe"
-
-#: ../building_blocks/init.lua
-msgid "Grass slab"
-msgstr "Grasstufe"
-
-#: ../building_blocks/init.lua
-msgid "Tar stair"
-msgstr "Teertreppe"
-
-#: ../building_blocks/init.lua
-msgid "Tar slab"
-msgstr "Teerstufe"
-
-#: ../building_blocks/init.lua
-msgid "Grate Stair"
-msgstr "Rosttreppe"
-
-#: ../building_blocks/init.lua
-msgid "Grate Slab"
-msgstr "Roststufe"
-
-#: ../building_blocks/init.lua
-msgid "Adobe stair"
-msgstr "Adobetreppe"
-
-#: ../building_blocks/init.lua
-msgid "Adobe slab"
-msgstr "Adobestufe"
-
-#: ../building_blocks/init.lua
-msgid "Roofing stair"
-msgstr "Dachtreppe"
-
-#: ../building_blocks/init.lua
-msgid "Roofing slab"
-msgstr "Dachstufe"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Fake Grass"
 msgstr "Falsches Gras"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
+msgid "Hardwood"
+msgstr "Hartholz"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Roof block"
+msgstr "Dachblock"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Tar"
+msgstr "Teer"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Marble"
+msgstr "Marmor"
+
+#. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
+#. Translate however you see fit.
+#: ../building_blocks/node_stairs.lua
+msgid "Brobble Spread"
+msgstr "Ziesterboden"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Gravel Spread"
+msgstr "Kiesboden"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Tarmac Spread"
+msgstr "Asphaltboden"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Terrycloth towel"
+msgstr "Frottiertuch"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Chess board tiling"
+msgstr "Schachbrettkacheln"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Fireplace"
+msgstr "Kamin"
+
+#: ../building_blocks/others.lua
 msgid "Small bundle of sticks"
 msgstr "Kleines Bündel Stöcke"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar base"
 msgstr "Teerbase"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar Knife"
 msgstr "Teermesser"
 
-#: ../building_blocks/init.lua
-msgid "Granite"
-msgstr "Granit"
-
 #: ../chains/init.lua
 msgid "Hanging chain (wrought iron)"
 msgstr "Hängende Kette (Schmiedeeisen)"
@@ -244,10 +180,6 @@ msgstr "Tetris-Arkadeautomat"
 msgid "No room for place the Arcade!"
 msgstr "Kein Platz, um den Arkadeautomaten zu platzieren!"
 
-#: ../fake_fire/init.lua
-msgid "Fake fire"
-msgstr "Falsches Feuer"
-
 #: ../fake_fire/init.lua
 msgid "Ice fire"
 msgstr "Eisfeuer"
@@ -268,14 +200,6 @@ msgstr "Steinschornsteinaufsatz"
 msgid "Sandstone chimney top"
 msgstr "Sandsteinschornsteinaufsatz"
 
-#: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr "Feuerstein und Stahl"
-
-#: ../fake_fire/init.lua
-msgid "This area is protected!"
-msgstr "Dieses Gebiet ist geschützt!"
-
 #: ../homedecor/bathroom_furniture.lua
 msgid "Bathroom/kitchen tiles (dark)"
 msgstr "Badezimmer-/Küchenkacheln (dunkel)"
@@ -368,6 +292,30 @@ msgstr "Nachttisch mit zwei Schubladen (@1)"
 msgid "Two-drawer Nightstand"
 msgstr "Nachttisch mit zwei Schubladen"
 
+#: ../homedecor/books.lua ../homedecor/exterior.lua
+msgid "red"
+msgstr "rot"
+
+#: ../homedecor/books.lua ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
+msgid "green"
+msgstr "grün"
+
+#: ../homedecor/books.lua
+msgid "blue"
+msgstr "blau"
+
+#: ../homedecor/books.lua
+msgid "violet"
+msgstr "violett"
+
+#: ../homedecor/books.lua
+msgid "grey"
+msgstr "grau"
+
+#: ../homedecor/books.lua
+msgid "brown"
+msgstr "braun"
+
 #: ../homedecor/books.lua
 msgid "Writable Book (@1)"
 msgstr "Schreibbares Buch (@1)"
@@ -524,6 +472,10 @@ msgstr "Messingbarren"
 msgid "Small Flower Pot"
 msgstr "Kleiner Blumentopf"
 
+#: ../homedecor/crafts.lua
+msgid "coin crafting is disabled!"
+msgstr "Fertigung der Münzen ist ausgeschaltet!"
+
 #: ../homedecor/doors_and_gates.lua
 msgid "Mahogany Closet Door (@1 opening)"
 msgstr "Mahagoniwandschranktür (@1öffnend)"
@@ -684,6 +636,10 @@ msgstr "Gartenbank (2. Stil)"
 msgid "Deck Chair"
 msgstr "Badeliege"
 
+#: ../homedecor/exterior.lua
+msgid "Deck Chair (blue striped)"
+msgstr ""
+
 #: ../homedecor/exterior.lua
 msgid "Doghouse"
 msgstr "Hundehütte"
@@ -726,18 +682,15 @@ msgstr "Baumschaukel"
 msgid "Water well"
 msgstr "Wasserbrunnen"
 
-#: ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
-msgid "green"
-msgstr "grün"
-
-#: ../homedecor/exterior.lua
-msgid "red"
-msgstr "rot"
-
 #: ../homedecor/exterior.lua
 msgid "yellow"
 msgstr "gelb"
 
+#: ../homedecor/exterior.lua
+#, fuzzy
+msgid "Shrubbery (large, @1)"
+msgstr "Gebüsch (@1)"
+
 #: ../homedecor/exterior.lua
 msgid "Shrubbery (@1)"
 msgstr "Gebüsch (@1)"
@@ -1294,13 +1247,10 @@ msgid "Metal tool cabinet and work table"
 msgstr "Metallwerkzeugschrank und Arbeitstisch"
 
 #: ../homedecor/misc-nodes.lua
-msgid "Picture Frame 1"
+#, fuzzy
+msgid "Picture Frame "
 msgstr "Bilderrahmen 1"
 
-#: ../homedecor/misc-nodes.lua
-msgid "Picture Frame 2"
-msgstr "Bilderrahmen 2"
-
 #: ../homedecor/misc-nodes.lua
 msgid "Decorative painting #@1"
 msgstr "Dekoratives Gemälde Nr. @1"
@@ -1485,6 +1435,11 @@ msgstr "Jalousie (dünn)"
 msgid "Curtains"
 msgstr "Gardinen"
 
+#: ../homedecor/window_treatments.lua
+#, fuzzy
+msgid "Curtains (open)"
+msgstr "Gardinen"
+
 #: ../homedecor/window_treatments.lua
 msgid "Curtain Rod (@1)"
 msgstr "Gardinenstange (@1)"
@@ -1547,7 +1502,9 @@ msgstr "Jemanden gehört schon die Stelle, wo das andere Ende hingehen würde."
 
 #: ../lrfurn/init.lua
 msgid "Someone else owns the spot where the middle or far end goes!"
-msgstr "Jemanden gehört schon die Stelle, wo das mittlere oder ferne Stück hingehen würde."
+msgstr ""
+"Jemanden gehört schon die Stelle, wo das mittlere oder ferne Stück hingehen "
+"würde."
 
 #: ../lrfurn/init.lua
 msgid "Someone else owns the spot where the other end goes!"
@@ -1577,23 +1534,77 @@ msgstr "Plasmafernseher"
 msgid "Plasma TV (off)"
 msgstr "Plasmafernseher (aus)"
 
-msgid "Tumble dryer"
-msgstr "Wäschetrockner"
+#~ msgid "Grass"
+#~ msgstr "Gras"
 
-msgid "Ironing board"
-msgstr "Bügelbrett"
+#~ msgid "Roofing"
+#~ msgstr "Dachdeckung"
 
-msgid "Spiral Staircase"
-msgstr "Wendeltreppe"
+#~ msgid "Marble stair"
+#~ msgstr "Marmortreppe"
 
-msgid "Washing Machine"
-msgstr "Waschmaschine"
+#~ msgid "Marble slab"
+#~ msgstr "Marmorstufe"
 
-msgid "blue"
-msgstr "blau"
+#~ msgid "Hardwood stair"
+#~ msgstr "Hartholztreppe"
 
-msgid "brown"
-msgstr "braun"
+#~ msgid "Hardwood slab"
+#~ msgstr "Hartholzstufe"
+
+#~ msgid "Grass stair"
+#~ msgstr "Grastreppe"
+
+#~ msgid "Grass slab"
+#~ msgstr "Grasstufe"
+
+#~ msgid "Tar stair"
+#~ msgstr "Teertreppe"
+
+#~ msgid "Tar slab"
+#~ msgstr "Teerstufe"
+
+#~ msgid "Grate Stair"
+#~ msgstr "Rosttreppe"
+
+#~ msgid "Grate Slab"
+#~ msgstr "Roststufe"
+
+#~ msgid "Adobe stair"
+#~ msgstr "Adobetreppe"
+
+#~ msgid "Adobe slab"
+#~ msgstr "Adobestufe"
+
+#~ msgid "Roofing stair"
+#~ msgstr "Dachtreppe"
+
+#~ msgid "Roofing slab"
+#~ msgstr "Dachstufe"
+
+#~ msgid "Fake fire"
+#~ msgstr "Falsches Feuer"
+
+#~ msgid "Flint and steel"
+#~ msgstr "Feuerstein und Stahl"
+
+#~ msgid "This area is protected!"
+#~ msgstr "Dieses Gebiet ist geschützt!"
+
+#~ msgid "Picture Frame 2"
+#~ msgstr "Bilderrahmen 2"
+
+#~ msgid "Tumble dryer"
+#~ msgstr "Wäschetrockner"
+
+#~ msgid "Ironing board"
+#~ msgstr "Bügelbrett"
+
+#~ msgid "Spiral Staircase"
+#~ msgstr "Wendeltreppe"
+
+#~ msgid "Washing Machine"
+#~ msgstr "Waschmaschine"
 
 #~ msgid "white"
 #~ msgstr "weiß"
@@ -1601,12 +1612,6 @@ msgstr "braun"
 #~ msgid "pink"
 #~ msgstr "rosa"
 
-msgid "violet"
-msgstr "violett"
-
-msgid "grey"
-msgstr "grau"
-
 #~ msgid "dark green"
 #~ msgstr "dunkelgrün"
 
@@ -1656,7 +1661,8 @@ msgstr "grau"
 #~ msgstr "%s nimmt etwas aus dem Kuechenschrank bei %s"
 
 #~ msgid "Not enough space above that spot to place a door! "
-#~ msgstr "Es gibt nicht genug Raum ueber dieser Stelle um die Tuer zu platzieren!"
+#~ msgstr ""
+#~ "Es gibt nicht genug Raum ueber dieser Stelle um die Tuer zu platzieren!"
 
 #~ msgid "Bucket of white paint "
 #~ msgstr "Eimer mit weisser Farbe"

homedecor_i18n/locale/es.po

@@ -2,12 +2,12 @@
 # Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2017.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-03 20:37+0200\n"
+"POT-Creation-Date: 2017-11-14 03:47+0800\n"
 "PO-Revision-Date: 2017-01-24 20:24-0300\n"
 "Last-Translator: Diego Martínez <kaeza@users.noreply.github.com>\n"
 "Language-Team: Spanish\n"
@@ -17,150 +17,84 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../building_blocks/init.lua
-msgid "Adobe"
-msgstr "Adobe"
+#: ../building_blocks/alias.lua
+msgid "Granite"
+msgstr "Granito"
 
-#: ../building_blocks/init.lua
-msgid "Roof block"
-msgstr "Bloque de techo"
-
-#: ../building_blocks/init.lua
-msgid "Streak Free Glass"
-msgstr "Vídrio sin rayas"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Grate"
 msgstr "Reja"
 
-#: ../building_blocks/init.lua
-msgid "Fireplace"
-msgstr "Chimenea"
+#: ../building_blocks/node_stairs.lua
+msgid "Streak Free Glass"
+msgstr "Vídrio sin rayas"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Wood Framed Glass"
 msgstr "Vídrio enmarcado en madera"
 
-#: ../building_blocks/init.lua
-msgid "Terrycloth towel"
-msgstr "Toalla"
+#: ../building_blocks/node_stairs.lua
+msgid "Adobe"
+msgstr "Adobe"
 
-#: ../building_blocks/init.lua
-msgid "Tarmac Spread"
-msgstr "Mezcla de asfalto"
-
-#: ../building_blocks/init.lua
-msgid "Chess board tiling"
-msgstr "Azulejos de ajedrez"
-
-#. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
-#. Translate however you see fit.
-#: ../building_blocks/init.lua
-msgid "Brobble Spread"
-msgstr "Mezcla de Ladroquines"
-
-#: ../building_blocks/init.lua
-msgid "Gravel Spread"
-msgstr "Mezcla de gravilla"
-
-#: ../building_blocks/init.lua
-msgid "Hardwood"
-msgstr "Madera dura"
-
-#: ../building_blocks/init.lua
-msgid "Marble"
-msgstr "Mármol"
-
-#: ../building_blocks/init.lua
-#, fuzzy
-msgid "Grass"
-msgstr "latón"
-
-#: ../building_blocks/init.lua
-msgid "Tar"
-msgstr "Alquitrán"
-
-#: ../building_blocks/init.lua
-#, fuzzy
-msgid "Roofing"
-msgstr "Losa de techo"
-
-#: ../building_blocks/init.lua
-msgid "Marble stair"
-msgstr "Escaleras de mármol"
-
-#: ../building_blocks/init.lua
-msgid "Marble slab"
-msgstr "Losa de mármol"
-
-#: ../building_blocks/init.lua
-msgid "Hardwood stair"
-msgstr "Escaleras de madera dura"
-
-#: ../building_blocks/init.lua
-msgid "Hardwood slab"
-msgstr "Losa de madera dura"
-
-#: ../building_blocks/init.lua
-msgid "Grass stair"
-msgstr "Escaleras de hierba"
-
-#: ../building_blocks/init.lua
-msgid "Grass slab"
-msgstr "Losa de hierba"
-
-#: ../building_blocks/init.lua
-msgid "Tar stair"
-msgstr "Escaleras de alquitrán"
-
-#: ../building_blocks/init.lua
-msgid "Tar slab"
-msgstr "Losa de alquitrán"
-
-#: ../building_blocks/init.lua
-msgid "Grate Stair"
-msgstr "Escaleras de rejas"
-
-#: ../building_blocks/init.lua
-msgid "Grate Slab"
-msgstr "Losa de rejas"
-
-#: ../building_blocks/init.lua
-msgid "Adobe stair"
-msgstr "Escaleras de adobe"
-
-#: ../building_blocks/init.lua
-msgid "Adobe slab"
-msgstr "Losa de adobe"
-
-#: ../building_blocks/init.lua
-msgid "Roofing stair"
-msgstr "Escaleras de techo"
-
-#: ../building_blocks/init.lua
-msgid "Roofing slab"
-msgstr "Losa de techo"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Fake Grass"
 msgstr "Hierba falsa"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
+msgid "Hardwood"
+msgstr "Madera dura"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Roof block"
+msgstr "Bloque de techo"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Tar"
+msgstr "Alquitrán"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Marble"
+msgstr "Mármol"
+
+#. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
+#. Translate however you see fit.
+#: ../building_blocks/node_stairs.lua
+msgid "Brobble Spread"
+msgstr "Mezcla de Ladroquines"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Gravel Spread"
+msgstr "Mezcla de gravilla"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Tarmac Spread"
+msgstr "Mezcla de asfalto"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Terrycloth towel"
+msgstr "Toalla"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Chess board tiling"
+msgstr "Azulejos de ajedrez"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Fireplace"
+msgstr "Chimenea"
+
+#: ../building_blocks/others.lua
 msgid "Small bundle of sticks"
 msgstr "Manojo de palitos"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar base"
 msgstr "Base de alquitrán"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar Knife"
 msgstr "Cuchillo de alquitrán"
 
-#: ../building_blocks/init.lua
-msgid "Granite"
-msgstr "Granito"
-
 #: ../chains/init.lua
 msgid "Hanging chain (wrought iron)"
 msgstr "Cadena colgante (hierro forjado)"
@@ -245,10 +179,6 @@ msgstr "Arcade Tetris"
 msgid "No room for place the Arcade!"
 msgstr "¡No hay lugar para colocar el arcade!"
 
-#: ../fake_fire/init.lua
-msgid "Fake fire"
-msgstr "Fuego falso"
-
 #: ../fake_fire/init.lua
 msgid "Ice fire"
 msgstr "Fuego de hielo"
@@ -269,14 +199,6 @@ msgstr "Chimenea de piedra"
 msgid "Sandstone chimney top"
 msgstr "Chimenea de arenisca"
 
-#: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr "Pedernal y acero"
-
-#: ../fake_fire/init.lua
-msgid "This area is protected!"
-msgstr "¡Ésta área está protegida!"
-
 #: ../homedecor/bathroom_furniture.lua
 msgid "Bathroom/kitchen tiles (dark)"
 msgstr "Azulejo de baño/cocina (tonos oscuros)"
@@ -369,8 +291,33 @@ msgstr "Mesa de luz con dos cajones (@1)"
 msgid "Two-drawer Nightstand"
 msgstr "Mesa de luz con dos cajones"
 
+#: ../homedecor/books.lua ../homedecor/exterior.lua
+msgid "red"
+msgstr "roja"
+
+#: ../homedecor/books.lua ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
+msgid "green"
+msgstr "verde"
+
 #: ../homedecor/books.lua
-msgid "Writable Book"
+msgid "blue"
+msgstr "azul"
+
+#: ../homedecor/books.lua
+msgid "violet"
+msgstr "violeta"
+
+#: ../homedecor/books.lua
+msgid "grey"
+msgstr "gris"
+
+#: ../homedecor/books.lua
+msgid "brown"
+msgstr "marrón"
+
+#: ../homedecor/books.lua
+#, fuzzy
+msgid "Writable Book (@1)"
 msgstr "Libro"
 
 #: ../homedecor/books.lua
@@ -685,6 +632,10 @@ msgstr "Banco de jardín (estilo 2)"
 msgid "Deck Chair"
 msgstr "Tumbona"
 
+#: ../homedecor/exterior.lua
+msgid "Deck Chair (blue striped)"
+msgstr ""
+
 #: ../homedecor/exterior.lua
 msgid "Doghouse"
 msgstr "Casa de perros"
@@ -727,18 +678,15 @@ msgstr "Columpio"
 msgid "Water well"
 msgstr "Pozo de agua"
 
-#: ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
-msgid "green"
-msgstr "verde"
-
-#: ../homedecor/exterior.lua
-msgid "red"
-msgstr "roja"
-
 #: ../homedecor/exterior.lua
 msgid "yellow"
 msgstr "amarilla"
 
+#: ../homedecor/exterior.lua
+#, fuzzy
+msgid "Shrubbery (large, @1)"
+msgstr "Arbustos (@1)"
+
 #: ../homedecor/exterior.lua
 msgid "Shrubbery (@1)"
 msgstr "Arbustos (@1)"
@@ -1295,7 +1243,8 @@ msgid "Metal tool cabinet and work table"
 msgstr "Mesa de trabajo y gabinete en hierro"
 
 #: ../homedecor/misc-nodes.lua
-msgid "Picture Frame"
+#, fuzzy
+msgid "Picture Frame "
 msgstr "Marco de fotografía"
 
 #: ../homedecor/misc-nodes.lua
@@ -1482,6 +1431,11 @@ msgstr "Persianas (finas)"
 msgid "Curtains"
 msgstr "Cortinas"
 
+#: ../homedecor/window_treatments.lua
+#, fuzzy
+msgid "Curtains (open)"
+msgstr "Cortinas"
+
 #: ../homedecor/window_treatments.lua
 msgid "Curtain Rod (@1)"
 msgstr "Palo de cortinas (@1)"
@@ -1577,8 +1531,64 @@ msgstr "Televisión de plasma"
 msgid "Plasma TV (off)"
 msgstr "Televisión de plasma (apagada)"
 
-#~ msgid "blue"
-#~ msgstr "azul"
+#, fuzzy
+#~ msgid "Grass"
+#~ msgstr "latón"
+
+#, fuzzy
+#~ msgid "Roofing"
+#~ msgstr "Losa de techo"
+
+#~ msgid "Marble stair"
+#~ msgstr "Escaleras de mármol"
+
+#~ msgid "Marble slab"
+#~ msgstr "Losa de mármol"
+
+#~ msgid "Hardwood stair"
+#~ msgstr "Escaleras de madera dura"
+
+#~ msgid "Hardwood slab"
+#~ msgstr "Losa de madera dura"
+
+#~ msgid "Grass stair"
+#~ msgstr "Escaleras de hierba"
+
+#~ msgid "Grass slab"
+#~ msgstr "Losa de hierba"
+
+#~ msgid "Tar stair"
+#~ msgstr "Escaleras de alquitrán"
+
+#~ msgid "Tar slab"
+#~ msgstr "Losa de alquitrán"
+
+#~ msgid "Grate Stair"
+#~ msgstr "Escaleras de rejas"
+
+#~ msgid "Grate Slab"
+#~ msgstr "Losa de rejas"
+
+#~ msgid "Adobe stair"
+#~ msgstr "Escaleras de adobe"
+
+#~ msgid "Adobe slab"
+#~ msgstr "Losa de adobe"
+
+#~ msgid "Roofing stair"
+#~ msgstr "Escaleras de techo"
+
+#~ msgid "Roofing slab"
+#~ msgstr "Losa de techo"
+
+#~ msgid "Fake fire"
+#~ msgstr "Fuego falso"
+
+#~ msgid "Flint and steel"
+#~ msgstr "Pedernal y acero"
+
+#~ msgid "This area is protected!"
+#~ msgstr "¡Ésta área está protegida!"
 
 #~ msgid "white"
 #~ msgstr "blanca"
@@ -1586,9 +1596,6 @@ msgstr "Televisión de plasma (apagada)"
 #~ msgid "pink"
 #~ msgstr "rosa"
 
-#~ msgid "violet"
-#~ msgstr "violeta"
-
 #~ msgid "plain"
 #~ msgstr "liso"
 
@@ -1598,12 +1605,6 @@ msgstr "Televisión de plasma (apagada)"
 #~ msgid "Expansion placeholder (you hacker you!)"
 #~ msgstr "Marcador temporal de expansión (¡Tu, hacker!)"
 
-#~ msgid "grey"
-#~ msgstr "gris"
-
-#~ msgid "brown"
-#~ msgstr "marrón"
-
 #~ msgid "white/grey"
 #~ msgstr "blanco/gris"
 

homedecor_i18n/locale/fr.po

@@ -2,12 +2,12 @@
 # Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2017.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-03 20:37+0200\n"
+"POT-Creation-Date: 2017-11-14 03:47+0800\n"
 "PO-Revision-Date: 2017-08-06 07:59+0200\n"
 "Last-Translator: fat115 <fat115@framasoft.org>\n"
 "Language-Team: French\n"
@@ -18,148 +18,84 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.8.12\n"
 
-#: ../building_blocks/init.lua
-msgid "Adobe"
-msgstr "Pisé"
+#: ../building_blocks/alias.lua
+msgid "Granite"
+msgstr "Granit"
 
-#: ../building_blocks/init.lua
-msgid "Roof block"
-msgstr "Bloc de toit"
-
-#: ../building_blocks/init.lua
-msgid "Streak Free Glass"
-msgstr "Verre anti-rayures"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Grate"
 msgstr "Grille"
 
-#: ../building_blocks/init.lua
-msgid "Fireplace"
-msgstr "Cheminée"
+#: ../building_blocks/node_stairs.lua
+msgid "Streak Free Glass"
+msgstr "Verre anti-rayures"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Wood Framed Glass"
 msgstr "Verre encadré de bois"
 
-#: ../building_blocks/init.lua
-msgid "Terrycloth towel"
-msgstr "Serviette éponge"
+#: ../building_blocks/node_stairs.lua
+msgid "Adobe"
+msgstr "Pisé"
 
-#: ../building_blocks/init.lua
-msgid "Tarmac Spread"
-msgstr "Tapis de goudron"
-
-#: ../building_blocks/init.lua
-msgid "Chess board tiling"
-msgstr "Dalles en échiquier"
-
-#. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
-#. Translate however you see fit.
-#: ../building_blocks/init.lua
-msgid "Brobble Spread"
-msgstr "Tapis rouge"
-
-#: ../building_blocks/init.lua
-msgid "Gravel Spread"
-msgstr "Tapis de gravier"
-
-#: ../building_blocks/init.lua
-msgid "Hardwood"
-msgstr "Bois dur (feuillu)"
-
-#: ../building_blocks/init.lua
-msgid "Marble"
-msgstr "Marbre"
-
-#: ../building_blocks/init.lua
-msgid "Grass"
-msgstr "Herbe"
-
-#: ../building_blocks/init.lua
-msgid "Tar"
-msgstr "Goudron"
-
-#: ../building_blocks/init.lua
-msgid "Roofing"
-msgstr "Toiture"
-
-#: ../building_blocks/init.lua
-msgid "Marble stair"
-msgstr "Marche en marbre"
-
-#: ../building_blocks/init.lua
-msgid "Marble slab"
-msgstr "Dalle en marbre"
-
-#: ../building_blocks/init.lua
-msgid "Hardwood stair"
-msgstr "Marche en bois dur (feuillu)"
-
-#: ../building_blocks/init.lua
-msgid "Hardwood slab"
-msgstr "Dalle en bois dur (feuillu)"
-
-#: ../building_blocks/init.lua
-msgid "Grass stair"
-msgstr "Marche en herbe"
-
-#: ../building_blocks/init.lua
-msgid "Grass slab"
-msgstr "Dalle en herbe"
-
-#: ../building_blocks/init.lua
-msgid "Tar stair"
-msgstr "Marche en goudron"
-
-#: ../building_blocks/init.lua
-msgid "Tar slab"
-msgstr "Dalle en goudron"
-
-#: ../building_blocks/init.lua
-msgid "Grate Stair"
-msgstr "Marche en métal déployé"
-
-#: ../building_blocks/init.lua
-msgid "Grate Slab"
-msgstr "Dalle en métal déployé"
-
-#: ../building_blocks/init.lua
-msgid "Adobe stair"
-msgstr "Marche en pisé"
-
-#: ../building_blocks/init.lua
-msgid "Adobe slab"
-msgstr "Dalle en pisé"
-
-#: ../building_blocks/init.lua
-msgid "Roofing stair"
-msgstr "Marche de toiture"
-
-#: ../building_blocks/init.lua
-msgid "Roofing slab"
-msgstr "Dalle de toiture"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Fake Grass"
 msgstr "Herbe synthétique"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
+msgid "Hardwood"
+msgstr "Bois dur (feuillu)"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Roof block"
+msgstr "Bloc de toit"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Tar"
+msgstr "Goudron"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Marble"
+msgstr "Marbre"
+
+#. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
+#. Translate however you see fit.
+#: ../building_blocks/node_stairs.lua
+msgid "Brobble Spread"
+msgstr "Tapis rouge"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Gravel Spread"
+msgstr "Tapis de gravier"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Tarmac Spread"
+msgstr "Tapis de goudron"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Terrycloth towel"
+msgstr "Serviette éponge"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Chess board tiling"
+msgstr "Dalles en échiquier"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Fireplace"
+msgstr "Cheminée"
+
+#: ../building_blocks/others.lua
 msgid "Small bundle of sticks"
 msgstr "Petit fagot de brindilles"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar base"
 msgstr "Pâte de goudron"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar Knife"
 msgstr "Couteau à goudron"
 
-#: ../building_blocks/init.lua
-msgid "Granite"
-msgstr "Granit"
-
 #: ../chains/init.lua
 msgid "Hanging chain (wrought iron)"
 msgstr "Chaine suspendue (fer forgé)"
@@ -244,10 +180,6 @@ msgstr "Borne Tetris"
 msgid "No room for place the Arcade!"
 msgstr "Pas assez de place pour placer la borne d'arcade !"
 
-#: ../fake_fire/init.lua
-msgid "Fake fire"
-msgstr "Feu illusoire"
-
 #: ../fake_fire/init.lua
 msgid "Ice fire"
 msgstr "Feu glacé"
@@ -268,14 +200,6 @@ msgstr "Haut de cheminée en pierre"
 msgid "Sandstone chimney top"
 msgstr "Haut de cheminée en grès"
 
-#: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr "Silex et acier"
-
-#: ../fake_fire/init.lua
-msgid "This area is protected!"
-msgstr "Cette zone est protégée !"
-
 #: ../homedecor/bathroom_furniture.lua
 msgid "Bathroom/kitchen tiles (dark)"
 msgstr "Carreaux de salle de bain ou cuisine (foncées)"
@@ -368,8 +292,36 @@ msgstr "Meuble de chevet avec deux tiroirs (@1)"
 msgid "Two-drawer Nightstand"
 msgstr "Meuble de chevet avec deux tiroirs"
 
+#: ../homedecor/books.lua ../homedecor/exterior.lua
+msgid "red"
+msgstr "rouge"
+
+#: ../homedecor/books.lua ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
+msgid "green"
+msgstr "vert"
+
 #: ../homedecor/books.lua
-msgid "Writable Book"
+#, fuzzy
+msgid "blue"
+msgstr "bleues"
+
+#: ../homedecor/books.lua
+#, fuzzy
+msgid "violet"
+msgstr "violettes"
+
+#: ../homedecor/books.lua
+#, fuzzy
+msgid "grey"
+msgstr "vertes"
+
+#: ../homedecor/books.lua
+msgid "brown"
+msgstr ""
+
+#: ../homedecor/books.lua
+#, fuzzy
+msgid "Writable Book (@1)"
 msgstr "Livre inscriptible"
 
 #: ../homedecor/books.lua
@@ -684,6 +636,10 @@ msgstr "Banc de jardin (style 2)"
 msgid "Deck Chair"
 msgstr "Chaise longue"
 
+#: ../homedecor/exterior.lua
+msgid "Deck Chair (blue striped)"
+msgstr ""
+
 #: ../homedecor/exterior.lua
 msgid "Doghouse"
 msgstr "Niche"
@@ -726,18 +682,15 @@ msgstr "Balançoire"
 msgid "Water well"
 msgstr "Puits"
 
-#: ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
-msgid "green"
-msgstr "vert"
-
-#: ../homedecor/exterior.lua
-msgid "red"
-msgstr "rouge"
-
 #: ../homedecor/exterior.lua
 msgid "yellow"
 msgstr "jaune"
 
+#: ../homedecor/exterior.lua
+#, fuzzy
+msgid "Shrubbery (large, @1)"
+msgstr "Arbustes (@1)"
+
 #: ../homedecor/exterior.lua
 msgid "Shrubbery (@1)"
 msgstr "Arbustes (@1)"
@@ -1294,7 +1247,8 @@ msgid "Metal tool cabinet and work table"
 msgstr "Établi pour le travail du métal"
 
 #: ../homedecor/misc-nodes.lua
-msgid "Picture Frame"
+#, fuzzy
+msgid "Picture Frame "
 msgstr "Cadre photo"
 
 #: ../homedecor/misc-nodes.lua
@@ -1481,6 +1435,11 @@ msgstr "Store (fin)"
 msgid "Curtains"
 msgstr "Rideaux"
 
+#: ../homedecor/window_treatments.lua
+#, fuzzy
+msgid "Curtains (open)"
+msgstr "Rideaux"
+
 #: ../homedecor/window_treatments.lua
 msgid "Curtain Rod (@1)"
 msgstr "Tringle à rideaux (@1)"
@@ -1575,9 +1534,62 @@ msgstr "Écran TV géant"
 msgid "Plasma TV (off)"
 msgstr "Écran TV géant (éteint)"
 
-#, fuzzy
-#~ msgid "blue"
-#~ msgstr "bleues"
+#~ msgid "Grass"
+#~ msgstr "Herbe"
+
+#~ msgid "Roofing"
+#~ msgstr "Toiture"
+
+#~ msgid "Marble stair"
+#~ msgstr "Marche en marbre"
+
+#~ msgid "Marble slab"
+#~ msgstr "Dalle en marbre"
+
+#~ msgid "Hardwood stair"
+#~ msgstr "Marche en bois dur (feuillu)"
+
+#~ msgid "Hardwood slab"
+#~ msgstr "Dalle en bois dur (feuillu)"
+
+#~ msgid "Grass stair"
+#~ msgstr "Marche en herbe"
+
+#~ msgid "Grass slab"
+#~ msgstr "Dalle en herbe"
+
+#~ msgid "Tar stair"
+#~ msgstr "Marche en goudron"
+
+#~ msgid "Tar slab"
+#~ msgstr "Dalle en goudron"
+
+#~ msgid "Grate Stair"
+#~ msgstr "Marche en métal déployé"
+
+#~ msgid "Grate Slab"
+#~ msgstr "Dalle en métal déployé"
+
+#~ msgid "Adobe stair"
+#~ msgstr "Marche en pisé"
+
+#~ msgid "Adobe slab"
+#~ msgstr "Dalle en pisé"
+
+#~ msgid "Roofing stair"
+#~ msgstr "Marche de toiture"
+
+#~ msgid "Roofing slab"
+#~ msgstr "Dalle de toiture"
+
+#~ msgid "Fake fire"
+#~ msgstr "Feu illusoire"
+
+#~ msgid "Flint and steel"
+#~ msgstr "Silex et acier"
+
+#~ msgid "This area is protected!"
+#~ msgstr "Cette zone est protégée !"
 
 #, fuzzy
 #~ msgid "white"
@@ -1587,10 +1599,6 @@ msgstr "Écran TV géant (éteint)"
 #~ msgid "pink"
 #~ msgstr "roses"
 
-#, fuzzy
-#~ msgid "violet"
-#~ msgstr "violettes"
-
 #, fuzzy
 #~ msgid "dark green"
 #~ msgstr "vertes"
@@ -1615,10 +1623,6 @@ msgstr "Écran TV géant (éteint)"
 #~ msgid "light blue"
 #~ msgstr "droite"
 
-#, fuzzy
-#~ msgid "dark_grey"
-#~ msgstr "vertes"
-
 #, fuzzy
 #~ msgid "dark_green"
 #~ msgstr "vertes"

homedecor_i18n/locale/it.po

@@ -2,12 +2,12 @@
 # Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2017.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-03 20:37+0200\n"
+"POT-Creation-Date: 2017-11-14 03:47+0800\n"
 "PO-Revision-Date: 2017-01-25 00:03-0300\n"
 "Last-Translator: Emon <?>\n"
 "Language-Team: Italian\n"
@@ -17,150 +17,84 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../building_blocks/init.lua
-msgid "Adobe"
+#: ../building_blocks/alias.lua
+msgid "Granite"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Roof block"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Streak Free Glass"
-msgstr ""
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Grate"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Fireplace"
+#: ../building_blocks/node_stairs.lua
+msgid "Streak Free Glass"
 msgstr ""
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Wood Framed Glass"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Terrycloth towel"
+#: ../building_blocks/node_stairs.lua
+msgid "Adobe"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Tarmac Spread"
+#: ../building_blocks/node_stairs.lua
+msgid "Fake Grass"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Chess board tiling"
+#: ../building_blocks/node_stairs.lua
+msgid "Hardwood"
+msgstr ""
+
+#: ../building_blocks/node_stairs.lua
+msgid "Roof block"
+msgstr ""
+
+#: ../building_blocks/node_stairs.lua
+msgid "Tar"
+msgstr ""
+
+#: ../building_blocks/node_stairs.lua
+msgid "Marble"
 msgstr ""
 
 #. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
 #. Translate however you see fit.
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Brobble Spread"
 msgstr ""
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Gravel Spread"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Hardwood"
+#: ../building_blocks/node_stairs.lua
+msgid "Tarmac Spread"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Marble"
+#: ../building_blocks/node_stairs.lua
+msgid "Terrycloth towel"
 msgstr ""
 
-#: ../building_blocks/init.lua
-#, fuzzy
-msgid "Grass"
-msgstr "Palo di ottone"
-
-#: ../building_blocks/init.lua
-msgid "Tar"
+#: ../building_blocks/node_stairs.lua
+msgid "Chess board tiling"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Roofing"
+#: ../building_blocks/node_stairs.lua
+msgid "Fireplace"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Marble stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Marble slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Hardwood stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Hardwood slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Grass stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-#, fuzzy
-msgid "Grass slab"
-msgstr "Palo di ottone"
-
-#: ../building_blocks/init.lua
-msgid "Tar stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Tar slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Grate Stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Grate Slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Adobe stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Adobe slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Roofing stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Roofing slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Fake Grass"
-msgstr ""
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Small bundle of sticks"
 msgstr ""
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar base"
 msgstr ""
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar Knife"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Granite"
-msgstr ""
-
 #: ../chains/init.lua
 #, fuzzy
 msgid "Hanging chain (wrought iron)"
@@ -250,10 +184,6 @@ msgstr ""
 msgid "No room for place the Arcade!"
 msgstr ""
 
-#: ../fake_fire/init.lua
-msgid "Fake fire"
-msgstr ""
-
 #: ../fake_fire/init.lua
 msgid "Ice fire"
 msgstr ""
@@ -274,14 +204,6 @@ msgstr ""
 msgid "Sandstone chimney top"
 msgstr ""
 
-#: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr ""
-
-#: ../fake_fire/init.lua
-msgid "This area is protected!"
-msgstr ""
-
 #: ../homedecor/bathroom_furniture.lua
 msgid "Bathroom/kitchen tiles (dark)"
 msgstr ""
@@ -384,10 +306,40 @@ msgstr "Comodino in quercia con due cassetti"
 msgid "Two-drawer Nightstand"
 msgstr "Comodino a doppio cassetto"
 
+#: ../homedecor/books.lua ../homedecor/exterior.lua
+#, fuzzy
+msgid "red"
+msgstr "rosso"
+
+#: ../homedecor/books.lua ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
+#, fuzzy
+msgid "green"
+msgstr "verde"
+
 #: ../homedecor/books.lua
-msgid "Writable Book"
+#, fuzzy
+msgid "blue"
+msgstr "blu"
+
+#: ../homedecor/books.lua
+#, fuzzy
+msgid "violet"
+msgstr "viola"
+
+#: ../homedecor/books.lua
+#, fuzzy
+msgid "grey"
+msgstr "verde scuro"
+
+#: ../homedecor/books.lua
+msgid "brown"
 msgstr ""
 
+#: ../homedecor/books.lua
+#, fuzzy
+msgid "Writable Book (@1)"
+msgstr "Gambe in ottone del tavolo"
+
 #: ../homedecor/books.lua
 msgid "@1 has written in a book (title: \"@2\"): \"@3\" at location @4"
 msgstr ""
@@ -733,6 +685,10 @@ msgstr ""
 msgid "Deck Chair"
 msgstr "Sedia"
 
+#: ../homedecor/exterior.lua
+msgid "Deck Chair (blue striped)"
+msgstr ""
+
 #: ../homedecor/exterior.lua
 msgid "Doghouse"
 msgstr ""
@@ -776,20 +732,14 @@ msgstr ""
 msgid "Water well"
 msgstr ""
 
-#: ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
-#, fuzzy
-msgid "green"
-msgstr "verde"
-
-#: ../homedecor/exterior.lua
-#, fuzzy
-msgid "red"
-msgstr "rosso"
-
 #: ../homedecor/exterior.lua
 msgid "yellow"
 msgstr ""
 
+#: ../homedecor/exterior.lua
+msgid "Shrubbery (large, @1)"
+msgstr ""
+
 #: ../homedecor/exterior.lua
 msgid "Shrubbery (@1)"
 msgstr ""
@@ -1404,7 +1354,7 @@ msgid "Metal tool cabinet and work table"
 msgstr ""
 
 #: ../homedecor/misc-nodes.lua
-msgid "Picture Frame"
+msgid "Picture Frame "
 msgstr ""
 
 #: ../homedecor/misc-nodes.lua
@@ -1610,6 +1560,11 @@ msgstr "Luce fosforescente bianca (sottile)"
 msgid "Curtains"
 msgstr "Tende (%s)"
 
+#: ../homedecor/window_treatments.lua
+#, fuzzy
+msgid "Curtains (open)"
+msgstr "Tende (%s)"
+
 #: ../homedecor/window_treatments.lua
 #, fuzzy
 msgid "Curtain Rod (@1)"
@@ -1709,8 +1664,12 @@ msgid "Plasma TV (off)"
 msgstr ""
 
 #, fuzzy
-#~ msgid "blue"
-#~ msgstr "blu"
+#~ msgid "Grass"
+#~ msgstr "Palo di ottone"
+
+#, fuzzy
+#~ msgid "Grass slab"
+#~ msgstr "Palo di ottone"
 
 #, fuzzy
 #~ msgid "white"
@@ -1720,10 +1679,6 @@ msgstr ""
 #~ msgid "pink"
 #~ msgstr "rosa"
 
-#, fuzzy
-#~ msgid "violet"
-#~ msgstr "viola"
-
 #, fuzzy
 #~ msgid "dark green"
 #~ msgstr "verde scuro"
@@ -1744,10 +1699,6 @@ msgstr ""
 #~ msgid "white/tan"
 #~ msgstr "bianco"
 
-#, fuzzy
-#~ msgid "dark grey"
-#~ msgstr "verde scuro"
-
 #, fuzzy
 #~ msgid "light blue"
 #~ msgstr "destra"

homedecor_i18n/locale/pt.po

@@ -1,16 +1,16 @@
 # Portuguese translations for homedecor package.
 # Translations distributed under CC-BY-SA license.
-#
+# 
 # Translators and reviewers (updates):
 # BrunoMine <borgesdossantosbruno@gmail.com> [2017]
 # Aracnus <frederico@teia.bio.br>, 2017.
 # Updated on 27/07/2017 by caiorrs <caiorrs@gmail.com>
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-03 20:37+0200\n"
+"POT-Creation-Date: 2017-11-14 03:47+0800\n"
 "PO-Revision-Date: 2017-01-29 00:21-0200\n"
 "Last-Translator: Caiorrs <caiorrs@gmail.com>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -21,158 +21,91 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: ../building_blocks/init.lua
-msgid "Adobe"
-msgstr "Argila"
+#: ../building_blocks/alias.lua
+#, fuzzy
+msgid "Granite"
+msgstr "Granito"
 
-#: ../building_blocks/init.lua
-msgid "Roof block"
-msgstr "Bloco de telhado"
+#: ../building_blocks/node_stairs.lua
+msgid "Grate"
+msgstr "Grelha"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 #, fuzzy
 msgid "Streak Free Glass"
 msgstr "Vidro Sem Riscos"
 
-#: ../building_blocks/init.lua
-msgid "Grate"
-msgstr "Grelha"
-
-#: ../building_blocks/init.lua
-msgid "Fireplace"
-msgstr "Lareira"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 #, fuzzy
 msgid "Wood Framed Glass"
 msgstr "Vidro com Bordas de Madeira"
 
-#: ../building_blocks/init.lua
-#, fuzzy
-msgid "Terrycloth towel"
-msgstr "Toalha de Roupinha"
+#: ../building_blocks/node_stairs.lua
+msgid "Adobe"
+msgstr "Argila"
 
-#: ../building_blocks/init.lua
-msgid "Tarmac Spread"
-msgstr "Espalhamento das Estradas"
+#: ../building_blocks/node_stairs.lua
+msgid "Fake Grass"
+msgstr "Grama Falsa"
 
-#: ../building_blocks/init.lua
-msgid "Chess board tiling"
-msgstr "Revestimento de xadrez"
-
-#. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
-#. Translate however you see fit.
-#: ../building_blocks/init.lua
-msgid "Brobble Spread"
-msgstr "Calçado"
-
-#: ../building_blocks/init.lua
-msgid "Gravel Spread"
-msgstr "Espalhamento de Cascalho"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 #, fuzzy
 msgid "Hardwood"
 msgstr "Madeira"
 
-#: ../building_blocks/init.lua
-#, fuzzy
-msgid "Marble"
-msgstr "Mármore"
+#: ../building_blocks/node_stairs.lua
+msgid "Roof block"
+msgstr "Bloco de telhado"
 
-#: ../building_blocks/init.lua
-#, fuzzy
-msgid "Grass"
-msgstr "latão"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 #, fuzzy
 msgid "Tar"
 msgstr "Alcatrão"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 #, fuzzy
-msgid "Roofing"
-msgstr "Placa de telhado"
+msgid "Marble"
+msgstr "Mármore"
 
-#: ../building_blocks/init.lua
-msgid "Marble stair"
-msgstr "Escada de mármore"
+#. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
+#. Translate however you see fit.
+#: ../building_blocks/node_stairs.lua
+msgid "Brobble Spread"
+msgstr "Calçado"
 
-#: ../building_blocks/init.lua
-msgid "Marble slab"
-msgstr "Placa de Mármore"
+#: ../building_blocks/node_stairs.lua
+msgid "Gravel Spread"
+msgstr "Espalhamento de Cascalho"
 
-#: ../building_blocks/init.lua
-msgid "Hardwood stair"
-msgstr "Escada de madeira"
+#: ../building_blocks/node_stairs.lua
+msgid "Tarmac Spread"
+msgstr "Espalhamento das Estradas"
 
-#: ../building_blocks/init.lua
-msgid "Hardwood slab"
-msgstr "Placa de madeira"
-
-#: ../building_blocks/init.lua
-msgid "Grass stair"
-msgstr "Escada de grama"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 #, fuzzy
-msgid "Grass slab"
-msgstr "Placa de grama"
+msgid "Terrycloth towel"
+msgstr "Toalha de Roupinha"
 
-#: ../building_blocks/init.lua
-msgid "Tar stair"
-msgstr "Escada de alcatrão"
+#: ../building_blocks/node_stairs.lua
+msgid "Chess board tiling"
+msgstr "Revestimento de xadrez"
 
-#: ../building_blocks/init.lua
-msgid "Tar slab"
-msgstr "Placa de alcatrão"
+#: ../building_blocks/node_stairs.lua
+msgid "Fireplace"
+msgstr "Lareira"
 
-#: ../building_blocks/init.lua
-msgid "Grate Stair"
-msgstr "Escade de Grelha"
-
-#: ../building_blocks/init.lua
-msgid "Grate Slab"
-msgstr "Placa de Grelha"
-
-#: ../building_blocks/init.lua
-msgid "Adobe stair"
-msgstr "Escada de Argila"
-
-#: ../building_blocks/init.lua
-msgid "Adobe slab"
-msgstr "Placa de argila"
-
-#: ../building_blocks/init.lua
-msgid "Roofing stair"
-msgstr "Escada de telhado"
-
-#: ../building_blocks/init.lua
-msgid "Roofing slab"
-msgstr "Placa de telhado"
-
-#: ../building_blocks/init.lua
-msgid "Fake Grass"
-msgstr "Grama Falsa"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Small bundle of sticks"
 msgstr "Pequeno amontoado de gravetos"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar base"
 msgstr "Base para alcatrão"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar Knife"
 msgstr "Faca de Alcatrão"
 
-#: ../building_blocks/init.lua
-#, fuzzy
-msgid "Granite"
-msgstr "Granito"
-
 #: ../chains/init.lua
 #, fuzzy
 msgid "Hanging chain (wrought iron)"
@@ -262,10 +195,6 @@ msgstr "Fliperama Tetris"
 msgid "No room for place the Arcade!"
 msgstr "Sem espaço para colocar o Fliperama!"
 
-#: ../fake_fire/init.lua
-msgid "Fake fire"
-msgstr "Fogo falso"
-
 #: ../fake_fire/init.lua
 msgid "Ice fire"
 msgstr "Fogo de gelo"
@@ -286,14 +215,6 @@ msgstr "Topo de chaminé de pedra"
 msgid "Sandstone chimney top"
 msgstr "Topo de chaminé de arenito"
 
-#: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr "Pederneira e aço"
-
-#: ../fake_fire/init.lua
-msgid "This area is protected!"
-msgstr "Esta área é protegida"
-
 #: ../homedecor/bathroom_furniture.lua
 #, fuzzy
 msgid "Bathroom/kitchen tiles (dark)"
@@ -391,9 +312,33 @@ msgstr "Mesa de Cabeceira com Duas Gavetas (@1)"
 msgid "Two-drawer Nightstand"
 msgstr "Mesinha de Duas Gavetas"
 
+#: ../homedecor/books.lua ../homedecor/exterior.lua
+msgid "red"
+msgstr "vermelho"
+
+#: ../homedecor/books.lua ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
+msgid "green"
+msgstr "verde"
+
+#: ../homedecor/books.lua
+msgid "blue"
+msgstr "azul"
+
+#: ../homedecor/books.lua
+msgid "violet"
+msgstr "violeta"
+
+#: ../homedecor/books.lua
+msgid "grey"
+msgstr "cinza"
+
+#: ../homedecor/books.lua
+msgid "brown"
+msgstr "marrom"
+
 #: ../homedecor/books.lua
 #, fuzzy
-msgid "Writable Book"
+msgid "Writable Book (@1)"
 msgstr "Livro que pode ser escrito (@1)"
 
 #: ../homedecor/books.lua
@@ -709,6 +654,10 @@ msgstr "Banco de Jardim (estilo 2)"
 msgid "Deck Chair"
 msgstr "Cadeira de Praia"
 
+#: ../homedecor/exterior.lua
+msgid "Deck Chair (blue striped)"
+msgstr ""
+
 #: ../homedecor/exterior.lua
 msgid "Doghouse"
 msgstr "Casa de Cachorro"
@@ -751,18 +700,15 @@ msgstr "Balancinho de árvore"
 msgid "Water well"
 msgstr "Poço de agua"
 
-#: ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
-msgid "green"
-msgstr "verde"
-
-#: ../homedecor/exterior.lua
-msgid "red"
-msgstr "vermelho"
-
 #: ../homedecor/exterior.lua
 msgid "yellow"
 msgstr "amarelo"
 
+#: ../homedecor/exterior.lua
+#, fuzzy
+msgid "Shrubbery (large, @1)"
+msgstr "Matagal (@1)"
+
 #: ../homedecor/exterior.lua
 msgid "Shrubbery (@1)"
 msgstr "Matagal (@1)"
@@ -1333,7 +1279,8 @@ msgid "Metal tool cabinet and work table"
 msgstr "Gabinete de ferramentas metálicas e mesa de trabalho"
 
 #: ../homedecor/misc-nodes.lua
-msgid "Picture Frame"
+#, fuzzy
+msgid "Picture Frame "
 msgstr "Quadro de Foto"
 
 #: ../homedecor/misc-nodes.lua
@@ -1524,6 +1471,11 @@ msgstr "Persiana (fina)"
 msgid "Curtains"
 msgstr "Cortinas"
 
+#: ../homedecor/window_treatments.lua
+#, fuzzy
+msgid "Curtains (open)"
+msgstr "Cortinas"
+
 #: ../homedecor/window_treatments.lua
 msgid "Curtain Rod (@1)"
 msgstr "Suporte de Cortina (@1)"
@@ -1627,8 +1579,65 @@ msgstr "TV de Plasma"
 msgid "Plasma TV (off)"
 msgstr "TV de Plasma (desligada)"
 
-#~ msgid "blue"
-#~ msgstr "azul"
+#, fuzzy
+#~ msgid "Grass"
+#~ msgstr "latão"
+
+#, fuzzy
+#~ msgid "Roofing"
+#~ msgstr "Placa de telhado"
+
+#~ msgid "Marble stair"
+#~ msgstr "Escada de mármore"
+
+#~ msgid "Marble slab"
+#~ msgstr "Placa de Mármore"
+
+#~ msgid "Hardwood stair"
+#~ msgstr "Escada de madeira"
+
+#~ msgid "Hardwood slab"
+#~ msgstr "Placa de madeira"
+
+#~ msgid "Grass stair"
+#~ msgstr "Escada de grama"
+
+#, fuzzy
+#~ msgid "Grass slab"
+#~ msgstr "Placa de grama"
+
+#~ msgid "Tar stair"
+#~ msgstr "Escada de alcatrão"
+
+#~ msgid "Tar slab"
+#~ msgstr "Placa de alcatrão"
+
+#~ msgid "Grate Stair"
+#~ msgstr "Escade de Grelha"
+
+#~ msgid "Grate Slab"
+#~ msgstr "Placa de Grelha"
+
+#~ msgid "Adobe stair"
+#~ msgstr "Escada de Argila"
+
+#~ msgid "Adobe slab"
+#~ msgstr "Placa de argila"
+
+#~ msgid "Roofing stair"
+#~ msgstr "Escada de telhado"
+
+#~ msgid "Roofing slab"
+#~ msgstr "Placa de telhado"
+
+#~ msgid "Fake fire"
+#~ msgstr "Fogo falso"
+
+#~ msgid "Flint and steel"
+#~ msgstr "Pederneira e aço"
+
+#~ msgid "This area is protected!"
+#~ msgstr "Esta área é protegida"
 
 #~ msgid "white"
 #~ msgstr "branco"
@@ -1636,21 +1645,12 @@ msgstr "TV de Plasma (desligada)"
 #~ msgid "pink"
 #~ msgstr "rosa"
 
-#~ msgid "violet"
-#~ msgstr "violeta"
-
 #~ msgid "plain"
 #~ msgstr "Sem Acabamento"
 
 #~ msgid "dark green"
 #~ msgstr "verde escuro"
 
-#~ msgid "grey"
-#~ msgstr "cinza"
-
-#~ msgid "brown"
-#~ msgstr "marrom"
-
 #~ msgid "white/grey"
 #~ msgstr "branco/cinza"
 

homedecor_i18n/locale/pt_BR.po

@@ -1,16 +1,16 @@
 # Portuguese translations for homedecor package.
 # Translations distributed under CC-BY-SA license.
-#
+# 
 # Translators and reviewers (updates):
 # BrunoMine <borgesdossantosbruno@gmail.com> [2017]
 # Aracnus <frederico@teia.bio.br>, 2017.
 # Updated on 27/07/2017 by caiorrs <caiorrs@gmail.com>
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-03 20:37+0200\n"
+"POT-Creation-Date: 2017-11-14 03:47+0800\n"
 "PO-Revision-Date: 2017-01-29 00:21-0200\n"
 "Last-Translator: Caiorrs <caiorrs@gmail.com>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -21,158 +21,91 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: ../building_blocks/init.lua
-msgid "Adobe"
-msgstr "Argila"
+#: ../building_blocks/alias.lua
+#, fuzzy
+msgid "Granite"
+msgstr "Granito"
 
-#: ../building_blocks/init.lua
-msgid "Roof block"
-msgstr "Bloco de telhado"
+#: ../building_blocks/node_stairs.lua
+msgid "Grate"
+msgstr "Grelha"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 #, fuzzy
 msgid "Streak Free Glass"
 msgstr "Vidro Sem Riscos"
 
-#: ../building_blocks/init.lua
-msgid "Grate"
-msgstr "Grelha"
-
-#: ../building_blocks/init.lua
-msgid "Fireplace"
-msgstr "Lareira"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 #, fuzzy
 msgid "Wood Framed Glass"
 msgstr "Vidro com Bordas de Madeira"
 
-#: ../building_blocks/init.lua
-#, fuzzy
-msgid "Terrycloth towel"
-msgstr "Toalha de Roupinha"
+#: ../building_blocks/node_stairs.lua
+msgid "Adobe"
+msgstr "Argila"
 
-#: ../building_blocks/init.lua
-msgid "Tarmac Spread"
-msgstr "Espalhamento das Estradas"
+#: ../building_blocks/node_stairs.lua
+msgid "Fake Grass"
+msgstr "Grama Falsa"
 
-#: ../building_blocks/init.lua
-msgid "Chess board tiling"
-msgstr "Revestimento de xadrez"
-
-#. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
-#. Translate however you see fit.
-#: ../building_blocks/init.lua
-msgid "Brobble Spread"
-msgstr "Calçado"
-
-#: ../building_blocks/init.lua
-msgid "Gravel Spread"
-msgstr "Espalhamento de Cascalho"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 #, fuzzy
 msgid "Hardwood"
 msgstr "Madeira"
 
-#: ../building_blocks/init.lua
-#, fuzzy
-msgid "Marble"
-msgstr "Mármore"
+#: ../building_blocks/node_stairs.lua
+msgid "Roof block"
+msgstr "Bloco de telhado"
 
-#: ../building_blocks/init.lua
-#, fuzzy
-msgid "Grass"
-msgstr "latão"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 #, fuzzy
 msgid "Tar"
 msgstr "Alcatrão"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 #, fuzzy
-msgid "Roofing"
-msgstr "Placa de telhado"
+msgid "Marble"
+msgstr "Mármore"
 
-#: ../building_blocks/init.lua
-msgid "Marble stair"
-msgstr "Escada de mármore"
+#. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
+#. Translate however you see fit.
+#: ../building_blocks/node_stairs.lua
+msgid "Brobble Spread"
+msgstr "Calçado"
 
-#: ../building_blocks/init.lua
-msgid "Marble slab"
-msgstr "Placa de Mármore"
+#: ../building_blocks/node_stairs.lua
+msgid "Gravel Spread"
+msgstr "Espalhamento de Cascalho"
 
-#: ../building_blocks/init.lua
-msgid "Hardwood stair"
-msgstr "Escada de madeira"
+#: ../building_blocks/node_stairs.lua
+msgid "Tarmac Spread"
+msgstr "Espalhamento das Estradas"
 
-#: ../building_blocks/init.lua
-msgid "Hardwood slab"
-msgstr "Placa de madeira"
-
-#: ../building_blocks/init.lua
-msgid "Grass stair"
-msgstr "Escada de grama"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 #, fuzzy
-msgid "Grass slab"
-msgstr "Placa de grama"
+msgid "Terrycloth towel"
+msgstr "Toalha de Roupinha"
 
-#: ../building_blocks/init.lua
-msgid "Tar stair"
-msgstr "Escada de alcatrão"
+#: ../building_blocks/node_stairs.lua
+msgid "Chess board tiling"
+msgstr "Revestimento de xadrez"
 
-#: ../building_blocks/init.lua
-msgid "Tar slab"
-msgstr "Placa de alcatrão"
+#: ../building_blocks/node_stairs.lua
+msgid "Fireplace"
+msgstr "Lareira"
 
-#: ../building_blocks/init.lua
-msgid "Grate Stair"
-msgstr "Escade de Grelha"
-
-#: ../building_blocks/init.lua
-msgid "Grate Slab"
-msgstr "Placa de Grelha"
-
-#: ../building_blocks/init.lua
-msgid "Adobe stair"
-msgstr "Escada de Argila"
-
-#: ../building_blocks/init.lua
-msgid "Adobe slab"
-msgstr "Placa de argila"
-
-#: ../building_blocks/init.lua
-msgid "Roofing stair"
-msgstr "Escada de telhado"
-
-#: ../building_blocks/init.lua
-msgid "Roofing slab"
-msgstr "Placa de telhado"
-
-#: ../building_blocks/init.lua
-msgid "Fake Grass"
-msgstr "Grama Falsa"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Small bundle of sticks"
 msgstr "Pequeno amontoado de gravetos"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar base"
 msgstr "Base para alcatrão"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar Knife"
 msgstr "Faca de Alcatrão"
 
-#: ../building_blocks/init.lua
-#, fuzzy
-msgid "Granite"
-msgstr "Granito"
-
 #: ../chains/init.lua
 #, fuzzy
 msgid "Hanging chain (wrought iron)"
@@ -262,10 +195,6 @@ msgstr "Fliperama Tetris"
 msgid "No room for place the Arcade!"
 msgstr "Sem espaço para colocar o Fliperama!"
 
-#: ../fake_fire/init.lua
-msgid "Fake fire"
-msgstr "Fogo falso"
-
 #: ../fake_fire/init.lua
 msgid "Ice fire"
 msgstr "Fogo de gelo"
@@ -286,14 +215,6 @@ msgstr "Topo de chaminé de pedra"
 msgid "Sandstone chimney top"
 msgstr "Topo de chaminé de arenito"
 
-#: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr "Pederneira e aço"
-
-#: ../fake_fire/init.lua
-msgid "This area is protected!"
-msgstr "Esta área é protegida"
-
 #: ../homedecor/bathroom_furniture.lua
 #, fuzzy
 msgid "Bathroom/kitchen tiles (dark)"
@@ -391,9 +312,33 @@ msgstr "Mesa de Cabeceira com Duas Gavetas (@1)"
 msgid "Two-drawer Nightstand"
 msgstr "Mesinha de Duas Gavetas"
 
+#: ../homedecor/books.lua ../homedecor/exterior.lua
+msgid "red"
+msgstr "vermelho"
+
+#: ../homedecor/books.lua ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
+msgid "green"
+msgstr "verde"
+
+#: ../homedecor/books.lua
+msgid "blue"
+msgstr "azul"
+
+#: ../homedecor/books.lua
+msgid "violet"
+msgstr "violeta"
+
+#: ../homedecor/books.lua
+msgid "grey"
+msgstr "cinza"
+
+#: ../homedecor/books.lua
+msgid "brown"
+msgstr "marrom"
+
 #: ../homedecor/books.lua
 #, fuzzy
-msgid "Writable Book"
+msgid "Writable Book (@1)"
 msgstr "Livro que pode ser escrito (@1)"
 
 #: ../homedecor/books.lua
@@ -709,6 +654,10 @@ msgstr "Banco de Jardim (estilo 2)"
 msgid "Deck Chair"
 msgstr "Cadeira de Praia"
 
+#: ../homedecor/exterior.lua
+msgid "Deck Chair (blue striped)"
+msgstr ""
+
 #: ../homedecor/exterior.lua
 msgid "Doghouse"
 msgstr "Casa de Cachorro"
@@ -751,18 +700,15 @@ msgstr "Balancinho de árvore"
 msgid "Water well"
 msgstr "Poço de agua"
 
-#: ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
-msgid "green"
-msgstr "verde"
-
-#: ../homedecor/exterior.lua
-msgid "red"
-msgstr "vermelho"
-
 #: ../homedecor/exterior.lua
 msgid "yellow"
 msgstr "amarelo"
 
+#: ../homedecor/exterior.lua
+#, fuzzy
+msgid "Shrubbery (large, @1)"
+msgstr "Matagal (@1)"
+
 #: ../homedecor/exterior.lua
 msgid "Shrubbery (@1)"
 msgstr "Matagal (@1)"
@@ -1333,7 +1279,8 @@ msgid "Metal tool cabinet and work table"
 msgstr "Gabinete de ferramentas metálicas e mesa de trabalho"
 
 #: ../homedecor/misc-nodes.lua
-msgid "Picture Frame"
+#, fuzzy
+msgid "Picture Frame "
 msgstr "Quadro de Foto"
 
 #: ../homedecor/misc-nodes.lua
@@ -1524,6 +1471,11 @@ msgstr "Persiana (fina)"
 msgid "Curtains"
 msgstr "Cortinas"
 
+#: ../homedecor/window_treatments.lua
+#, fuzzy
+msgid "Curtains (open)"
+msgstr "Cortinas"
+
 #: ../homedecor/window_treatments.lua
 msgid "Curtain Rod (@1)"
 msgstr "Suporte de Cortina (@1)"
@@ -1627,8 +1579,65 @@ msgstr "TV de Plasma"
 msgid "Plasma TV (off)"
 msgstr "TV de Plasma (desligada)"
 
-#~ msgid "blue"
-#~ msgstr "azul"
+#, fuzzy
+#~ msgid "Grass"
+#~ msgstr "latão"
+
+#, fuzzy
+#~ msgid "Roofing"
+#~ msgstr "Placa de telhado"
+
+#~ msgid "Marble stair"
+#~ msgstr "Escada de mármore"
+
+#~ msgid "Marble slab"
+#~ msgstr "Placa de Mármore"
+
+#~ msgid "Hardwood stair"
+#~ msgstr "Escada de madeira"
+
+#~ msgid "Hardwood slab"
+#~ msgstr "Placa de madeira"
+
+#~ msgid "Grass stair"
+#~ msgstr "Escada de grama"
+
+#, fuzzy
+#~ msgid "Grass slab"
+#~ msgstr "Placa de grama"
+
+#~ msgid "Tar stair"
+#~ msgstr "Escada de alcatrão"
+
+#~ msgid "Tar slab"
+#~ msgstr "Placa de alcatrão"
+
+#~ msgid "Grate Stair"
+#~ msgstr "Escade de Grelha"
+
+#~ msgid "Grate Slab"
+#~ msgstr "Placa de Grelha"
+
+#~ msgid "Adobe stair"
+#~ msgstr "Escada de Argila"
+
+#~ msgid "Adobe slab"
+#~ msgstr "Placa de argila"
+
+#~ msgid "Roofing stair"
+#~ msgstr "Escada de telhado"
+
+#~ msgid "Roofing slab"
+#~ msgstr "Placa de telhado"
+
+#~ msgid "Fake fire"
+#~ msgstr "Fogo falso"
+
+#~ msgid "Flint and steel"
+#~ msgstr "Pederneira e aço"
+
+#~ msgid "This area is protected!"
+#~ msgstr "Esta área é protegida"
 
 #~ msgid "white"
 #~ msgstr "branco"
@@ -1636,21 +1645,12 @@ msgstr "TV de Plasma (desligada)"
 #~ msgid "pink"
 #~ msgstr "rosa"
 
-#~ msgid "violet"
-#~ msgstr "violeta"
-
 #~ msgid "plain"
 #~ msgstr "Sem Acabamento"
 
 #~ msgid "dark green"
 #~ msgstr "verde escuro"
 
-#~ msgid "grey"
-#~ msgstr "cinza"
-
-#~ msgid "brown"
-#~ msgstr "marrom"
-
 #~ msgid "white/grey"
 #~ msgstr "branco/cinza"
 

homedecor_i18n/locale/ru.po

@@ -7,159 +7,96 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-03 20:37+0200\n"
+"POT-Creation-Date: 2017-11-14 03:47+0800\n"
 "PO-Revision-Date: 2017-08-21 16:17+0300\n"
+"Last-Translator: inpos <inpos@yandex.ru>\n"
 "Language-Team: \n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.3\n"
-"Last-Translator: inpos <inpos@yandex.ru>\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../building_blocks/init.lua
-msgid "Adobe"
-msgstr "Саман"
+#: ../building_blocks/alias.lua
+msgid "Granite"
+msgstr "Гранит"
 
-#: ../building_blocks/init.lua
-msgid "Roof block"
-msgstr "Кровельный блок"
-
-#: ../building_blocks/init.lua
-msgid "Streak Free Glass"
-msgstr "Стекло без стыков"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Grate"
 msgstr "Каминная решётка"
 
-#: ../building_blocks/init.lua
-msgid "Fireplace"
-msgstr "Камин"
+#: ../building_blocks/node_stairs.lua
+msgid "Streak Free Glass"
+msgstr "Стекло без стыков"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Wood Framed Glass"
 msgstr "Деревянное окно"
 
-#: ../building_blocks/init.lua
-msgid "Terrycloth towel"
-msgstr "Махровое полотенце"
+#: ../building_blocks/node_stairs.lua
+msgid "Adobe"
+msgstr "Саман"
 
-#: ../building_blocks/init.lua
-msgid "Tarmac Spread"
-msgstr "Покрытие гудронной смолой"
-
-#: ../building_blocks/init.lua
-msgid "Chess board tiling"
-msgstr "Шахматная плитка"
-
-#. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
-#. Translate however you see fit.
-#: ../building_blocks/init.lua
-msgid "Brobble Spread"
-msgstr "Настил кирпичного булыжника"
-
-#: ../building_blocks/init.lua
-msgid "Gravel Spread"
-msgstr "Настил гравия"
-
-#: ../building_blocks/init.lua
-msgid "Hardwood"
-msgstr "Твёрдая древесина"
-
-#: ../building_blocks/init.lua
-msgid "Marble"
-msgstr "Мрамор"
-
-#: ../building_blocks/init.lua
-msgid "Grass"
-msgstr "Трава"
-
-#: ../building_blocks/init.lua
-msgid "Tar"
-msgstr "Смола"
-
-#: ../building_blocks/init.lua
-msgid "Roofing"
-msgstr "Кровля"
-
-#: ../building_blocks/init.lua
-msgid "Marble stair"
-msgstr "Мраморная ступенька"
-
-#: ../building_blocks/init.lua
-msgid "Marble slab"
-msgstr "Мраморная блита"
-
-#: ../building_blocks/init.lua
-msgid "Hardwood stair"
-msgstr "Ступенька из твёрдой древесины"
-
-#: ../building_blocks/init.lua
-msgid "Hardwood slab"
-msgstr "Плита из твёрдой древесины"
-
-#: ../building_blocks/init.lua
-msgid "Grass stair"
-msgstr "Ступенька из травы"
-
-#: ../building_blocks/init.lua
-msgid "Grass slab"
-msgstr "Плита из травы"
-
-#: ../building_blocks/init.lua
-msgid "Tar stair"
-msgstr "Ступенька из смолы"
-
-#: ../building_blocks/init.lua
-msgid "Tar slab"
-msgstr "Плита из смолы"
-
-#: ../building_blocks/init.lua
-msgid "Grate Stair"
-msgstr "Решётчатая ступенька"
-
-#: ../building_blocks/init.lua
-msgid "Grate Slab"
-msgstr "Решётчатая плита"
-
-#: ../building_blocks/init.lua
-msgid "Adobe stair"
-msgstr "Саманная ступенька"
-
-#: ../building_blocks/init.lua
-msgid "Adobe slab"
-msgstr "Саманная плита"
-
-#: ../building_blocks/init.lua
-msgid "Roofing stair"
-msgstr "Ступенька из кровли"
-
-#: ../building_blocks/init.lua
-msgid "Roofing slab"
-msgstr "Плита из кровли"
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Fake Grass"
 msgstr "Псевдо трава"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
+msgid "Hardwood"
+msgstr "Твёрдая древесина"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Roof block"
+msgstr "Кровельный блок"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Tar"
+msgstr "Смола"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Marble"
+msgstr "Мрамор"
+
+#. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
+#. Translate however you see fit.
+#: ../building_blocks/node_stairs.lua
+msgid "Brobble Spread"
+msgstr "Настил кирпичного булыжника"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Gravel Spread"
+msgstr "Настил гравия"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Tarmac Spread"
+msgstr "Покрытие гудронной смолой"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Terrycloth towel"
+msgstr "Махровое полотенце"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Chess board tiling"
+msgstr "Шахматная плитка"
+
+#: ../building_blocks/node_stairs.lua
+msgid "Fireplace"
+msgstr "Камин"
+
+#: ../building_blocks/others.lua
 msgid "Small bundle of sticks"
 msgstr "Небольшая связка палок"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar base"
 msgstr "Смоляная основа"
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar Knife"
 msgstr "Смоляной нож"
 
-#: ../building_blocks/init.lua
-msgid "Granite"
-msgstr "Гранит"
-
 #: ../chains/init.lua
 msgid "Hanging chain (wrought iron)"
 msgstr "Висящая цепь (кованое железо)"
@@ -244,10 +181,6 @@ msgstr "Игровой автомат Тетрис"
 msgid "No room for place the Arcade!"
 msgstr "Недостаточно места для размещения игрового автомата!"
 
-#: ../fake_fire/init.lua
-msgid "Fake fire"
-msgstr "Псевдо огонь"
-
 #: ../fake_fire/init.lua
 msgid "Ice fire"
 msgstr "Ледяной огонь"
@@ -268,14 +201,6 @@ msgstr "Каменный дымоход на крышу"
 msgid "Sandstone chimney top"
 msgstr "Дымоход из песчаника на крышу"
 
-#: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr "Кремень и сталь"
-
-#: ../fake_fire/init.lua
-msgid "This area is protected!"
-msgstr "Эта область защищена!"
-
 #: ../homedecor/bathroom_furniture.lua
 msgid "Bathroom/kitchen tiles (dark)"
 msgstr "Плитка для ванной/кухни (тёмная)"
@@ -368,8 +293,33 @@ msgstr "Тумба с двумя ящиками (@1)"
 msgid "Two-drawer Nightstand"
 msgstr "Тумба с двумя ящиками"
 
+#: ../homedecor/books.lua ../homedecor/exterior.lua
+msgid "red"
+msgstr "красный"
+
+#: ../homedecor/books.lua ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
+msgid "green"
+msgstr "зелёный"
+
 #: ../homedecor/books.lua
-msgid "Writable Book"
+msgid "blue"
+msgstr ""
+
+#: ../homedecor/books.lua
+msgid "violet"
+msgstr ""
+
+#: ../homedecor/books.lua
+msgid "grey"
+msgstr ""
+
+#: ../homedecor/books.lua
+msgid "brown"
+msgstr ""
+
+#: ../homedecor/books.lua
+#, fuzzy
+msgid "Writable Book (@1)"
 msgstr "Записная книга"
 
 #: ../homedecor/books.lua
@@ -526,6 +476,10 @@ msgstr "Слиток латуни"
 msgid "Small Flower Pot"
 msgstr "Маленький цветочный горшок"
 
+#: ../homedecor/crafts.lua
+msgid "coin crafting is disabled!"
+msgstr "Крафт монет отключен!"
+
 #: ../homedecor/doors_and_gates.lua
 msgid "Mahogany Closet Door (@1 opening)"
 msgstr "Дверь стенного шкафа из красного дерева (открывается @1)"
@@ -686,6 +640,10 @@ msgstr "Садовая скамья (2й стиль)"
 msgid "Deck Chair"
 msgstr "Шезлонг"
 
+#: ../homedecor/exterior.lua
+msgid "Deck Chair (blue striped)"
+msgstr ""
+
 #: ../homedecor/exterior.lua
 msgid "Doghouse"
 msgstr "Собачья будка"
@@ -728,18 +686,15 @@ msgstr "Качели для дерева"
 msgid "Water well"
 msgstr "Колодец с водой"
 
-#: ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
-msgid "green"
-msgstr "зелёный"
-
-#: ../homedecor/exterior.lua
-msgid "red"
-msgstr "красный"
-
 #: ../homedecor/exterior.lua
 msgid "yellow"
 msgstr "жёлтый"
 
+#: ../homedecor/exterior.lua
+#, fuzzy
+msgid "Shrubbery (large, @1)"
+msgstr "Кустарник (@1)"
+
 #: ../homedecor/exterior.lua
 msgid "Shrubbery (@1)"
 msgstr "Кустарник (@1)"
@@ -1296,7 +1251,8 @@ msgid "Metal tool cabinet and work table"
 msgstr "Шкаф с металлическим инструментом и рабочий стол"
 
 #: ../homedecor/misc-nodes.lua
-msgid "Picture Frame"
+#, fuzzy
+msgid "Picture Frame "
 msgstr "Рамка для картины"
 
 #: ../homedecor/misc-nodes.lua
@@ -1483,6 +1439,11 @@ msgstr "Жалюзи (узкие)"
 msgid "Curtains"
 msgstr "Шторы"
 
+#: ../homedecor/window_treatments.lua
+#, fuzzy
+msgid "Curtains (open)"
+msgstr "Шторы"
+
 #: ../homedecor/window_treatments.lua
 msgid "Curtain Rod (@1)"
 msgstr "Карниз для штор (@1)"
@@ -1545,7 +1506,8 @@ msgstr "Кому-то другому принадлежит точка, где
 
 #: ../lrfurn/init.lua
 msgid "Someone else owns the spot where the middle or far end goes!"
-msgstr "Кому-то другому принадлежит точка, куда выходит средний или дальний конец!"
+msgstr ""
+"Кому-то другому принадлежит точка, куда выходит средний или дальний конец!"
 
 #: ../lrfurn/init.lua
 msgid "Someone else owns the spot where the other end goes!"
@@ -1574,3 +1536,60 @@ msgstr "Плазменный телевизор"
 #: ../plasmascreen/init.lua
 msgid "Plasma TV (off)"
 msgstr "Плазменный телевизор (выключен)"
+
+#~ msgid "Grass"
+#~ msgstr "Трава"
+
+#~ msgid "Roofing"
+#~ msgstr "Кровля"
+
+#~ msgid "Marble stair"
+#~ msgstr "Мраморная ступенька"
+
+#~ msgid "Marble slab"
+#~ msgstr "Мраморная блита"
+
+#~ msgid "Hardwood stair"
+#~ msgstr "Ступенька из твёрдой древесины"
+
+#~ msgid "Hardwood slab"
+#~ msgstr "Плита из твёрдой древесины"
+
+#~ msgid "Grass stair"
+#~ msgstr "Ступенька из травы"
+
+#~ msgid "Grass slab"
+#~ msgstr "Плита из травы"
+
+#~ msgid "Tar stair"
+#~ msgstr "Ступенька из смолы"
+
+#~ msgid "Tar slab"
+#~ msgstr "Плита из смолы"
+
+#~ msgid "Grate Stair"
+#~ msgstr "Решётчатая ступенька"
+
+#~ msgid "Grate Slab"
+#~ msgstr "Решётчатая плита"
+
+#~ msgid "Adobe stair"
+#~ msgstr "Саманная ступенька"
+
+#~ msgid "Adobe slab"
+#~ msgstr "Саманная плита"
+
+#~ msgid "Roofing stair"
+#~ msgstr "Ступенька из кровли"
+
+#~ msgid "Roofing slab"
+#~ msgstr "Плита из кровли"
+
+#~ msgid "Fake fire"
+#~ msgstr "Псевдо огонь"
+
+#~ msgid "Flint and steel"
+#~ msgstr "Кремень и сталь"
+
+#~ msgid "This area is protected!"
+#~ msgstr "Эта область защищена!"

homedecor_i18n/locale/template.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-03 20:37+0200\n"
+"POT-Creation-Date: 2017-11-14 03:47+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,148 +17,84 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../building_blocks/init.lua
-msgid "Adobe"
+#: ../building_blocks/alias.lua
+msgid "Granite"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Roof block"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Streak Free Glass"
-msgstr ""
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Grate"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Fireplace"
+#: ../building_blocks/node_stairs.lua
+msgid "Streak Free Glass"
 msgstr ""
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Wood Framed Glass"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Terrycloth towel"
+#: ../building_blocks/node_stairs.lua
+msgid "Adobe"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Tarmac Spread"
+#: ../building_blocks/node_stairs.lua
+msgid "Fake Grass"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Chess board tiling"
+#: ../building_blocks/node_stairs.lua
+msgid "Hardwood"
+msgstr ""
+
+#: ../building_blocks/node_stairs.lua
+msgid "Roof block"
+msgstr ""
+
+#: ../building_blocks/node_stairs.lua
+msgid "Tar"
+msgstr ""
+
+#: ../building_blocks/node_stairs.lua
+msgid "Marble"
 msgstr ""
 
 #. Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
 #. Translate however you see fit.
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Brobble Spread"
 msgstr ""
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/node_stairs.lua
 msgid "Gravel Spread"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Hardwood"
+#: ../building_blocks/node_stairs.lua
+msgid "Tarmac Spread"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Marble"
+#: ../building_blocks/node_stairs.lua
+msgid "Terrycloth towel"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Grass"
+#: ../building_blocks/node_stairs.lua
+msgid "Chess board tiling"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Tar"
+#: ../building_blocks/node_stairs.lua
+msgid "Fireplace"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Roofing"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Marble stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Marble slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Hardwood stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Hardwood slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Grass stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Grass slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Tar stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Tar slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Grate Stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Grate Slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Adobe stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Adobe slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Roofing stair"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Roofing slab"
-msgstr ""
-
-#: ../building_blocks/init.lua
-msgid "Fake Grass"
-msgstr ""
-
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Small bundle of sticks"
 msgstr ""
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar base"
 msgstr ""
 
-#: ../building_blocks/init.lua
+#: ../building_blocks/others.lua
 msgid "Tar Knife"
 msgstr ""
 
-#: ../building_blocks/init.lua
-msgid "Granite"
-msgstr ""
-
 #: ../chains/init.lua
 msgid "Hanging chain (wrought iron)"
 msgstr ""
@@ -243,10 +179,6 @@ msgstr ""
 msgid "No room for place the Arcade!"
 msgstr ""
 
-#: ../fake_fire/init.lua
-msgid "Fake fire"
-msgstr ""
-
 #: ../fake_fire/init.lua
 msgid "Ice fire"
 msgstr ""
@@ -267,14 +199,6 @@ msgstr ""
 msgid "Sandstone chimney top"
 msgstr ""
 
-#: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr ""
-
-#: ../fake_fire/init.lua
-msgid "This area is protected!"
-msgstr ""
-
 #: ../homedecor/bathroom_furniture.lua
 msgid "Bathroom/kitchen tiles (dark)"
 msgstr ""
@@ -367,8 +291,32 @@ msgstr ""
 msgid "Two-drawer Nightstand"
 msgstr ""
 
+#: ../homedecor/books.lua ../homedecor/exterior.lua
+msgid "red"
+msgstr ""
+
+#: ../homedecor/books.lua ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
+msgid "green"
+msgstr ""
+
 #: ../homedecor/books.lua
-msgid "Writable Book"
+msgid "blue"
+msgstr ""
+
+#: ../homedecor/books.lua
+msgid "violet"
+msgstr ""
+
+#: ../homedecor/books.lua
+msgid "grey"
+msgstr ""
+
+#: ../homedecor/books.lua
+msgid "brown"
+msgstr ""
+
+#: ../homedecor/books.lua
+msgid "Writable Book (@1)"
 msgstr ""
 
 #: ../homedecor/books.lua
@@ -523,6 +471,10 @@ msgstr ""
 msgid "Small Flower Pot"
 msgstr ""
 
+#: ../homedecor/crafts.lua
+msgid "coin crafting is disabled!"
+msgstr ""
+
 #: ../homedecor/doors_and_gates.lua
 msgid "Mahogany Closet Door (@1 opening)"
 msgstr ""
@@ -683,6 +635,10 @@ msgstr ""
 msgid "Deck Chair"
 msgstr ""
 
+#: ../homedecor/exterior.lua
+msgid "Deck Chair (blue striped)"
+msgstr ""
+
 #: ../homedecor/exterior.lua
 msgid "Doghouse"
 msgstr ""
@@ -725,18 +681,14 @@ msgstr ""
 msgid "Water well"
 msgstr ""
 
-#: ../homedecor/exterior.lua ../homedecor/misc-nodes.lua
-msgid "green"
-msgstr ""
-
-#: ../homedecor/exterior.lua
-msgid "red"
-msgstr ""
-
 #: ../homedecor/exterior.lua
 msgid "yellow"
 msgstr ""
 
+#: ../homedecor/exterior.lua
+msgid "Shrubbery (large, @1)"
+msgstr ""
+
 #: ../homedecor/exterior.lua
 msgid "Shrubbery (@1)"
 msgstr ""
@@ -1293,7 +1245,7 @@ msgid "Metal tool cabinet and work table"
 msgstr ""
 
 #: ../homedecor/misc-nodes.lua
-msgid "Picture Frame"
+msgid "Picture Frame "
 msgstr ""
 
 #: ../homedecor/misc-nodes.lua
@@ -1478,6 +1430,10 @@ msgstr ""
 msgid "Curtains"
 msgstr ""
 
+#: ../homedecor/window_treatments.lua
+msgid "Curtains (open)"
+msgstr ""
+
 #: ../homedecor/window_treatments.lua
 msgid "Curtain Rod (@1)"
 msgstr ""

itemframes/init.lua

@@ -32,6 +32,25 @@ minetest.register_entity("itemframes:item",{
 		if self.nodename == "itemframes:pedestal" then
 			self.object:set_properties({automatic_rotate = 1})
 		end
+		if self.texture ~= nil and self.nodename ~= nil then
+			local entity_pos = vector.round(self.object:get_pos())
+			local objs = minetest.get_objects_inside_radius(entity_pos, 0.5)
+			for _, obj in ipairs(objs) do
+				if obj ~= self.object and
+				   obj:get_luaentity() and
+				   obj:get_luaentity().name == "itemframes:item" and
+				   obj:get_luaentity().nodename == self.nodename and
+				   obj:get_properties() and
+				   obj:get_properties().textures and
+				   obj:get_properties().textures[1] == self.texture then
+					minetest.log("action","[itemframes] Removing extra " ..
+						self.texture .. " found in " .. self.nodename .. " at " ..
+						minetest.pos_to_string(entity_pos))
+					self.object:remove()
+					break
+				end
+			end
+		end
 	end,
 	get_staticdata = function(self)
 		if self.nodename ~= nil and self.texture ~= nil then
@@ -119,7 +138,7 @@ minetest.register_node("itemframes:frame",{
 	sunlight_propagates = true,
 	groups = {choppy = 2, dig_immediate = 2},
 	legacy_wallmounted = true,
-	sounds = default.node_sound_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack)
 		local meta = minetest.get_meta(pos)
@@ -182,7 +201,7 @@ minetest.register_node("itemframes:pedestal",{
 	tiles = {"itemframes_pedestal.png"},
 	paramtype = "light",
 	groups = {cracky = 3},
-	sounds = default.node_sound_defaults(),
+	sounds = default.node_sound_stone_defaults(),
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack)
 		local meta = minetest.get_meta(pos)
@@ -228,24 +247,31 @@ minetest.register_node("itemframes:pedestal",{
 
 -- automatically restore entities lost from frames/pedestals
 -- due to /clearobjects or similar
-
-minetest.register_abm({
+minetest.register_lbm({
+	label = "Maintain itemframe and pedestal entities",
+	name = "itemframes:maintain_entities",
 	nodenames = {"itemframes:frame", "itemframes:pedestal"},
-	interval = 15,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		local num
-
-		if node.name == "itemframes:frame" then
-			num = #minetest.get_objects_inside_radius(pos, 0.5)
-		elseif node.name == "itemframes:pedestal" then
-			pos.y = pos.y + 1
-			num = #minetest.get_objects_inside_radius(pos, 0.5)
-			pos.y = pos.y - 1
-		end
-
-		if num > 0 then return end
-		update_item(pos, node)
+	run_at_every_load = true,
+	action = function(pos, node)
+		minetest.after(0,
+			function(pos, node)
+				local meta = minetest.get_meta(pos)
+				local itemstring = meta:get_string("item")
+				if itemstring ~= "" then
+					local entity_pos = pos
+					if node.name == "itemframes:pedestal" then
+						entity_pos = {x=pos.x,y=pos.y+1,z=pos.z}
+					end
+					local objs = minetest.get_objects_inside_radius(entity_pos, 0.5)
+					if #objs == 0 then
+						minetest.log("action","[itemframes] Replacing missing " ..
+							itemstring .. " in " .. node.name .. " at " ..
+							minetest.pos_to_string(pos))
+						update_item(pos, node)
+					end
+				end
+			end,
+		pos, node)
 	end
 })
 
@@ -273,4 +299,4 @@ minetest.register_craft({
 if minetest.get_modpath("mesecons_mvps") then
 	mesecon.register_mvps_stopper("itemframes:frame")
 	mesecon.register_mvps_stopper("itemframes:pedestal")
-end
+end

lavalamp/init.lua

@@ -28,7 +28,6 @@ minetest.register_node("lavalamp:lavalamp", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
-	place_param2 = 240,
 	sunlight_propagates = true,
 	walkable = false,
 	light_source = 14,
@@ -39,8 +38,6 @@ minetest.register_node("lavalamp:lavalamp", {
 	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_glass_defaults(),
 	on_construct = unifieddyes.on_construct,
-	after_place_node = unifieddyes.recolor_on_place,
-	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		node.name = "lavalamp:lavalamp_off"
 		minetest.swap_node(pos, node)
@@ -59,7 +56,6 @@ minetest.register_node("lavalamp:lavalamp_off", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
-	place_param2 = 240,
 	sunlight_propagates = true,
 	walkable = false,
 	selection_box = {
@@ -70,13 +66,16 @@ minetest.register_node("lavalamp:lavalamp_off", {
 	sounds = default.node_sound_glass_defaults(),
 	drop = "lavalamp:lavalamp",
 	on_construct = unifieddyes.on_construct,
-	after_place_node = unifieddyes.recolor_on_place,
-	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		node.name = "lavalamp:lavalamp"
 		minetest.swap_node(pos, node)
 		return itemstack
 	end,
+	drop = {
+		items = {
+			{items = {"lavalamp:lavalamp"}, inherit_color = true },
+		}
+	}
 })
 
 minetest.register_craft({
@@ -88,6 +87,17 @@ minetest.register_craft({
 	}
 })
 
+unifieddyes.register_color_craft({
+	output = "lavalamp:lavalamp",
+	palette = "extended",
+	type = "shapeless",
+	neutral_node = "lavalamp:lavalamp",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 -- convert to param2 coloring
 
 local colors = {
@@ -136,20 +146,3 @@ minetest.register_lbm({
 
 	end
 })
-
-minetest.register_lbm({
-	name = "lavalamp:recolor",
-	label = "Convert 89-color lamps to use UD extended palette",
-	run_at_every_load = false,
-	nodenames = {
-		"lavalamp:lavalamp",
-		"lavalamp:lavalamp_off"
-	},
-	action = function(pos, node)
-		local meta = minetest.get_meta(pos)
-		if meta:get_string("palette") ~= "ext" then
-			minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] })
-			meta:set_string("palette", "ext")
-		end
-	end
-})

lrfurn/armchairs.lua

@@ -25,9 +25,7 @@ minetest.register_node("lrfurn:armchair", {
 	node_box = armchair_cbox,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
-	after_dig_node = unifieddyes.after_dig_node,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		if not clicker:is_player() then
@@ -58,13 +56,23 @@ minetest.register_craft({
 	}
 })
 
+unifieddyes.register_color_craft({
+	output = "lrfurn:armchair",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "lrfurn:armchair",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 -- convert old static nodes to param2 color
 
 lrfurn.old_static_armchairs = {}
 
 for _, color in ipairs(lrfurn.colors) do
 	table.insert(lrfurn.old_static_armchairs, "lrfurn:armchair_"..color)
-	print("lrfurn:armchair_"..color)
 end
 
 minetest.register_lbm({

lrfurn/init.lua

@@ -1,3 +1,4 @@
+local S = homedecor_i18n.gettext
 
 lrfurn = {}
 screwdriver = screwdriver or {}
@@ -60,10 +61,11 @@ end
 
 function lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing)
 	local node = minetest.get_node(pos)
+	local colorbits = node.param2 - (node.param2 % 8)
 	local yaw = placer:get_look_yaw()
 	local dir = minetest.yaw_to_dir(yaw-1.5)
 	local fdir = minetest.dir_to_wallmounted(dir)
-	minetest.swap_node(pos, { name = node.name, param2 = fdir })
+	minetest.swap_node(pos, { name = node.name, param2 = fdir+colorbits })
 end
 
 dofile(minetest.get_modpath("lrfurn").."/longsofas.lua")

lrfurn/longsofas.lua

@@ -26,7 +26,6 @@ minetest.register_node("lrfurn:longsofa", {
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 		local playername = placer:get_player_name()
 		if minetest.is_protected(pos, placer:get_player_name()) then return true end
 
@@ -42,7 +41,6 @@ minetest.register_node("lrfurn:longsofa", {
 		end
 		return itemstack
 	end,
-	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		if not clicker:is_player() then
 			return itemstack
@@ -72,6 +70,17 @@ minetest.register_craft({
 	}
 })
 
+unifieddyes.register_color_craft({
+	output = "lrfurn:longsofa",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "lrfurn:longsofa",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 -- convert old static nodes to param2 colorization
 
 lrfurn.old_static_longsofas = {}

lrfurn/sofas.lua

@@ -26,7 +26,6 @@ minetest.register_node("lrfurn:sofa", {
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 		local playername = placer:get_player_name()
 		if minetest.is_protected(pos, placer:get_player_name()) then return true end
 
@@ -42,7 +41,6 @@ minetest.register_node("lrfurn:sofa", {
 		end
 		return itemstack
 	end,
-	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		if not clicker:is_player() then
 			return itemstack
@@ -72,6 +70,17 @@ minetest.register_craft({
 	}
 })
 
+unifieddyes.register_color_craft({
+	output = "lrfurn:sofa",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "lrfurn:sofa",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 -- convert old static nodes to param2 color
 
 lrfurn.old_static_sofas = {}