Merge remote-tracking branch 'upstream/master'

Add Chinese Translation

See merge request VanessaE/homedecor_modpack!10

building_blocks/init.lua

@@ -5,3 +5,6 @@ dofile(modpath.."/alias.lua")
 dofile(modpath.."/node_stairs.lua")
 dofile(modpath.."/others.lua")
 dofile(modpath.."/recipes.lua")
+
+minetest.log("action", "[building_blocks] loaded.")
+

computer/computers.lua

@@ -258,33 +258,6 @@ minetest.register_node("computer:tower", {
 
 minetest.register_alias("computer:tower_on", "computer:tower")
 
--- Printer/scaner combo
-minetest.register_node("computer:printer", {
-	description = S("Printer-Scanner Combo"),
-	inventory_image = "computer_printer_inv.png",
-	tiles = {"computer_printer_t.png","computer_printer_bt.png","computer_printer_l.png",
-			"computer_printer_r.png","computer_printer_b.png","computer_printer_f.png"},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	walkable = true,
-	groups = {snappy=3},
-	sound = default.node_sound_wood_defaults(),
-	drawtype = "nodebox",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.4375, -0.3125, -0.125, 0.4375, -0.0625, 0.375},
-			{-0.4375, -0.5, -0.125, 0.4375, -0.4375, 0.375},
-			{-0.4375, -0.5, -0.125, -0.25, -0.0625, 0.375},
-			{0.25, -0.5, -0.125, 0.4375, -0.0625, 0.375},
-			{-0.4375, -0.5, -0.0625, 0.4375, -0.0625, 0.375},
-			{-0.375, -0.4375, 0.25, 0.375, -0.0625, 0.4375},
-			{-0.25, -0.25, 0.4375, 0.25, 0.0625, 0.5},
-			{-0.25, -0.481132, -0.3125, 0.25, -0.4375, 0}
-		},
-	},
-})
-
 --Rack Server
 minetest.register_node("computer:server", {
 	drawtype = "nodebox",

computer/depends.txt

@@ -1,2 +1,4 @@
 default
 homedecor_common
+basic_materials
+unifieddyes

computer/init.lua

@@ -94,6 +94,8 @@ end
 
 local MODPATH = minetest.get_modpath("computer")
 dofile(MODPATH.."/computers.lua")
-dofile(MODPATH.."/miscitems.lua")
+dofile(MODPATH.."/printers.lua")
 dofile(MODPATH.."/recipes.lua")
 dofile(MODPATH.."/tetris.lua")
+
+minetest.log("action", "[computer] loaded.")

computer/miscitems.lua

@@ -1,68 +0,0 @@
--- Copyright (C) 2012-2013 Diego Martínez <kaeza@users.sf.net>
-
--- This file defines some items in order to not have to depend on other mods.
-
-local S = homedecor.gettext
-
-if (not minetest.get_modpath("homedecor")) then
-
-	minetest.register_craftitem(":basic_materials:plastic_sheet", {
-		description = S("Plastic sheet"),
-		inventory_image = "homedecor_plastic_sheeting.png",
-	})
-
-	minetest.register_craftitem(":homedecor:plastic_base", {
-		description = S("Unprocessed Plastic base"),
-		wield_image = "homedecor_plastic_base.png",
-		inventory_image = "homedecor_plastic_base_inv.png",
-	})
-
-	minetest.register_craft({
-		type = "shapeless",
-		output = 'homedecor:plastic_base 6',
-		recipe = { "default:junglegrass",
-		   "default:junglegrass",
-		   "default:junglegrass"
-		}
-	})
-
-	minetest.register_craft({
-		type = "shapeless",
-		output = 'homedecor:plastic_base 3',
-		recipe = { "default:dry_shrub",
-		   "default:dry_shrub",
-		   "default:dry_shrub"
-		},
-	})
-
-	minetest.register_craft({
-		type = "shapeless",
-		output = 'homedecor:plastic_base 4',
-		recipe = { "default:leaves",
-			   "default:leaves",
-			   "default:leaves",
-			   "default:leaves",
-			   "default:leaves",
-			   "default:leaves"
-		}
-	})
-
-	minetest.register_craft({
-		type = "cooking",
-		output = "basic_materials:plastic_sheet",
-		recipe = "homedecor:plastic_base",
-	})
-
-	minetest.register_craft({
-		type = 'fuel',
-		recipe = 'homedecor:plastic_base',
-		burntime = 30,
-	})
-
-	minetest.register_craft({
-		type = 'fuel',
-		recipe = 'basic_materials:plastic_sheet',
-		burntime = 30,
-	})
-
-end -- not homedecor

computer/printers.lua

@@ -0,0 +1,61 @@
+-- Printers of some kind or another
+
+local S = homedecor.gettext
+
+minetest.register_node("computer:printer", {
+	description = S("Printer-Scanner Combo"),
+	inventory_image = "computer_printer_inv.png",
+	tiles = {"computer_printer_t.png","computer_printer_bt.png","computer_printer_l.png",
+			"computer_printer_r.png","computer_printer_b.png","computer_printer_f.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = true,
+	groups = {snappy=3},
+	sound = default.node_sound_wood_defaults(),
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.4375, -0.3125, -0.125, 0.4375, -0.0625, 0.375},
+			{-0.4375, -0.5, -0.125, 0.4375, -0.4375, 0.375},
+			{-0.4375, -0.5, -0.125, -0.25, -0.0625, 0.375},
+			{0.25, -0.5, -0.125, 0.4375, -0.0625, 0.375},
+			{-0.4375, -0.5, -0.0625, 0.4375, -0.0625, 0.375},
+			{-0.375, -0.4375, 0.25, 0.375, -0.0625, 0.4375},
+			{-0.25, -0.25, 0.4375, 0.25, 0.0625, 0.5},
+			{-0.25, -0.481132, -0.3125, 0.25, -0.4375, 0}
+		},
+	},
+})
+
+-- "bedflinger" style 3D Printer (Prusa i3 or equivalent)
+
+local cbox = {
+	type = "fixed",
+	fixed = {-0.25, -0.25, -0.5, 0.3, 0.3, 0.25 }
+}
+
+minetest.register_node("computer:3dprinter_bedflinger", {
+	description = S('3D Printer ("bedflinger")'),
+	inventory_image = "computer_3dprinter_bedflinger_inv.png",
+	tiles = {
+		{ name = "computer_3dprinter_bedflinger.png", color = 0xffffffff },
+		"computer_3dprinter_filament.png"
+	},
+	paramtype = "light",
+	walkable = true,
+	groups = {snappy=3, ud_param2_colorable = 1},
+	sound = default.node_sound_wood_defaults(),
+	drawtype = "mesh",
+	mesh = "computer_3dprinter_bedflinger.obj",
+	paramtype2 = "colorwallmounted",
+	palette = "unifieddyes_palette_colorwallmounted.png",
+	selection_box = cbox,
+	collision_box = cbox,
+	after_place_node = function(pos, placer, itemstack, pointed_thing)
+		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
+	end,
+	on_dig = unifieddyes.on_dig,
+	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
+})
+

computer/tetris.lua

@@ -1,4 +1,3 @@
-
 local S = homedecor.gettext
 
 local shapes = {
@@ -220,10 +219,10 @@ local function step(pos, fields)
 	if fields then
 		if fields.new then
 			new_game(pos)
-		else
+		elseif t then
 			key(fields)
 		end
-	else
+	elseif t then
 		run = tick()
 	end
 

fake_fire/init.lua

@@ -3,7 +3,80 @@ local S = homedecor.gettext
 
 screwdriver = screwdriver or {}
 
-local function start_smoke(pos, node, clicker, chimney)
+local function fire_particles_on(pos) -- 3 layers of fire
+	local meta = minetest.get_meta(pos)
+	local id = minetest.add_particlespawner({ -- 1 layer big particles fire
+		amount = 9,
+		time = 0,
+		minpos = {x = pos.x - 0.2, y = pos.y - 0.4, z = pos.z - 0.2},
+		maxpos = {x = pos.x + 0.2, y = pos.y - 0.1, z = pos.z + 0.2},
+		minvel = {x= 0, y= 0, z= 0},
+		maxvel = {x= 0, y= 0.1, z= 0},
+		minacc = {x= 0, y= 0, z= 0},
+		maxacc = {x= 0, y= 0.7, z= 0},
+		minexptime = 0.5,
+		maxexptime = 0.7,
+		minsize = 2,
+		maxsize = 5,
+		collisiondetection = false,
+		vertical = true,
+		texture = "fake_fire_particle_anim_fire.png",
+		animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length = 0.8,},
+	})
+	meta:set_int("layer_1", id)
+
+	local id = minetest.add_particlespawner({ -- 2 layer smol particles fire
+		amount = 1,
+		time = 0,
+		minpos = {x = pos.x - 0.1, y = pos.y, z = pos.z - 0.1},
+		maxpos = {x = pos.x + 0.1, y = pos.y + 0.4, z = pos.z + 0.1},
+		minvel = {x= 0, y= 0, z= 0},
+		maxvel = {x= 0, y= 0.1, z= 0},
+		minacc = {x= 0, y= 0, z= 0},
+		maxacc = {x= 0, y= 1, z= 0},
+		minexptime = 0.4,
+		maxexptime = 0.6,
+		minsize = 0.5,
+		maxsize = 0.7,
+		collisiondetection = false,
+		vertical = true,
+		texture = "fake_fire_particle_anim_fire.png",
+		animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length = 0.7,},
+	})
+	meta:set_int("layer_2", id)
+
+	local id = minetest.add_particlespawner({ --3 layer smoke
+		amount = 1,
+		time = 0,
+		minpos = {x = pos.x - 0.1, y = pos.y - 0.2, z = pos.z - 0.1},
+		maxpos = {x = pos.x + 0.2, y = pos.y + 0.4, z = pos.z + 0.2},
+		minvel = {x= 0, y= 0, z= 0},
+		maxvel = {x= 0, y= 0.1, z= 0},
+		minacc = {x= 0, y= 0, z= 0},
+		maxacc = {x= 0, y= 1, z= 0},
+		minexptime = 0.6,
+		maxexptime = 0.8,
+		minsize = 2,
+		maxsize = 4,
+		collisiondetection = true,
+		vertical = true,
+		texture = "fake_fire_particle_anim_smoke.png",
+		animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length = 0.9,},
+	})
+	meta:set_int("layer_3", id)
+end
+
+local function fire_particles_off(pos)
+	local meta = minetest.get_meta(pos)
+	local id_1 = meta:get_int("layer_1");
+	local id_2 = meta:get_int("layer_2");
+	local id_3 = meta:get_int("layer_3");
+	minetest.delete_particlespawner(id_1)
+	minetest.delete_particlespawner(id_2)
+	minetest.delete_particlespawner(id_3)
+end
+
+local function start_fire_effects(pos, node, clicker, chimney)
 	local this_spawner_meta = minetest.get_meta(pos)
 	local id = this_spawner_meta:get_int("smoky")
 	local s_handle = this_spawner_meta:get_int("sound")
@@ -41,7 +114,7 @@ local function start_smoke(pos, node, clicker, chimney)
 				max_hear_distance = 5,
 				loop = true
 			})
-			this_spawner_meta:set_int("smoky", id)
+			fire_particles_on(pos)
 			this_spawner_meta:set_int("sound", s_handle)
 		end
 	end
@@ -83,7 +156,7 @@ minetest.register_node("fake_fire:ice_fire", {
 		aspect_w=16, aspect_h=16, length=1.5}},
 	},
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		start_smoke(pos, node, clicker)
+		start_fire_effects(pos, node, clicker)
 		return itemstack
 	end,
 	on_destruct = function (pos)
@@ -97,42 +170,54 @@ minetest.register_node("fake_fire:ice_fire", {
 
 minetest.register_alias("fake_fire:fake_fire", "fire:permanent_flame")
 
+local sbox = {
+	type = 'fixed',
+	fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16},
+}
+
 minetest.register_node("fake_fire:fancy_fire", {
-		inventory_image = "fancy_fire_inv.png",
-		description = S("Fancy Fire"),
-		drawtype = "mesh",
-		mesh = "fancy_fire.obj",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {dig_immediate=3},
-		sunlight_propagates = true,
-		light_source = 14,
-		walkable = false,
-		damage_per_second = 4,
-		on_rotate = screwdriver.rotate_simple,
-		tiles = {
-		{name="fake_fire_animated.png",
-		animation={type='vertical_frames', aspect_w=16, aspect_h=16, length=1}}, {name='fake_fire_logs.png'}},
-		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-			start_smoke(pos, node, clicker)
-			return itemstack
-		end,
-		on_destruct = function (pos)
-			stop_smoke(pos)
-			minetest.sound_play("fire_extinguish", {
-				pos = pos, max_hear_distance = 5
-			})
-		end,
-		drop = {
-			max_items = 3,
-			items = {
-				{
-					items = { "default:torch", "default:torch", "building_blocks:sticks" },
-					rarity = 1,
-				}
+	inventory_image = "fancy_fire_inv.png",
+	description = S("Fancy Fire"),
+	drawtype = "mesh",
+	mesh = "fancy_fire.obj",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {oddly_breakable_by_hand=3, flammable=0},
+	sunlight_propagates = true,
+	light_source = 13,
+	walkable = false,
+	buildable_to = false,
+	damage_per_second = 3,
+	selection_box = sbox,
+	tiles = {
+		"basic_materials_concrete_block.png",
+		"default_junglewood.png",
+		"fake_fire_empty_tile.png"
+	},
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		fire_particles_on(pos)
+		return itemstack
+	end,
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		fire_particles_on(pos)
+	end,
+	on_destruct = function(pos, oldnode, oldmetadata, digger)
+		fire_particles_off(pos)
+		minetest.sound_play("fire_extinguish", {
+			pos = pos, max_hear_distance = 5
+		})
+	end,
+	drop = {
+		max_items = 3,
+		items = {
+			{
+				items = { "default:torch", "default:torch", "building_blocks:sticks" },
+				rarity = 1,
 			}
 		}
-	})
+	}
+})
 
 -- EMBERS
 minetest.register_node("fake_fire:embers", {
@@ -168,7 +253,7 @@ for _, mat in ipairs(materials) do
 		},
 		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 			local chimney = 1
-			start_smoke(pos, node, clicker, chimney)
+			start_fire_effects(pos, node, clicker, chimney)
 			return itemstack
 		end,
 		on_destruct = function (pos)
@@ -209,8 +294,24 @@ minetest.register_craft({
 })
 
 -- ALIASES
+
 minetest.register_alias("fake_fire:smokeless_fire", "fake_fire:fake_fire")
 minetest.register_alias("fake_fire:smokeless_ice_fire", "fake_fire:ice_fire")
 minetest.register_alias("fake_fire:smokeless_chimney_top_stone", "fake_fire:chimney_top_stone")
 minetest.register_alias("fake_fire:smokeless_chimney_top_sandstone", "fake_fire:chimney_top_sandstone")
 minetest.register_alias("fake_fire:flint", "fake_fire:flint_and_steel")
+
+-- OTHER
+
+minetest.register_lbm({
+	name = "fake_fire:reload_particles",
+	label = "restart fire particles on reload",
+	nodenames = {"fake_fire:fancy_fire"},
+	run_at_every_load = true,
+	action = function(pos, node)
+		fire_particles_off(pos)
+		fire_particles_on(pos)
+	end
+})
+
+minetest.log("action", "[fake_fire] loaded.")

homedecor_3d_extras/init.lua

@@ -121,3 +121,6 @@ if minetest.get_modpath("doors") then
 	end
 
 end
+
+minetest.log("action", "[homedecor_3d_extra] loaded.")
+

homedecor_bathroom/init.lua

@@ -15,6 +15,7 @@ minetest.register_node(":homedecor:bathroom_tiles_dark", {
 	groups = {cracky=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = unifieddyes.on_construct,
+	on_dig = unifieddyes.on_dig,
 })
 
 minetest.register_node(":homedecor:bathroom_tiles_medium", {
@@ -31,6 +32,7 @@ minetest.register_node(":homedecor:bathroom_tiles_medium", {
 	groups = {cracky=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = unifieddyes.on_construct,
+	on_dig = unifieddyes.on_dig,
 })
 
 minetest.register_node(":homedecor:bathroom_tiles_light", {
@@ -47,6 +49,7 @@ minetest.register_node(":homedecor:bathroom_tiles_light", {
 	groups = {cracky=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = unifieddyes.on_construct,
+	on_dig = unifieddyes.on_dig,
 })
 
 local tr_cbox = {

homedecor_bedroom/init.lua

@@ -59,6 +59,7 @@ homedecor.register("bed_regular", {
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)
 		homedecor.unextend_bed(pos)
 	end,
+	on_dig = unifieddyes.on_dig,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local itemname = itemstack:get_name()
 		if itemname == "homedecor:bed_regular" then
@@ -92,6 +93,7 @@ homedecor.register("bed_extended", {
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)
 		homedecor.unextend_bed(pos)
 	end,
+	on_dig = unifieddyes.on_dig,
 --	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 --		homedecor.beds_on_rightclick(pos, node, clicker)
 --		return itemstack
@@ -128,6 +130,7 @@ homedecor.register("bed_kingsize", {
 			inv:add_item("main", "homedecor:bed_regular 2")
 		end
 	end,
+	on_dig = unifieddyes.on_dig,
 --	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 --		homedecor.beds_on_rightclick(pos, node, clicker)
 --		return itemstack

homedecor_cobweb/init.lua

@@ -25,7 +25,7 @@ minetest.register_node(":homedecor:cobweb_corner", {
 	end
 })
 
-minetest.register_node(":Lhomedecor:cobweb_centered", {
+minetest.register_node(":homedecor:cobweb_centered", {
 	description = S("Cobweb"),
 	drawtype = "nodebox",
 	tiles = { "homedecor_cobweb.png" },

homedecor_common/furnaces.lua

@@ -80,7 +80,7 @@ local furnace_can_dig = function(pos,player)
 end
 
 function homedecor.register_furnace(name, furnacedef)
-	furnacedef.fire_fg = furnacedef.fire_bg or "default_furnace_fire_fg.png"
+	furnacedef.fire_fg = furnacedef.fire_fg or "default_furnace_fire_fg.png"
 	furnacedef.fire_bg = furnacedef.fire_bg or "default_furnace_fire_bg.png"
 
 	furnacedef.output_slots = furnacedef.output_slots or 4

homedecor_common/init.lua

@@ -77,6 +77,6 @@ dofile(modpath.."/mt_game_beds_functions.lua")
 dofile(modpath.."/sit.lua")
 dofile(modpath.."/crafts.lua")
 
-if minetest.settings:get_bool("log_mod") then
+if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "[HomeDecor API] " .. S("Loaded!"))
 end

homedecor_common/locale/zh_CN.po

@@ -0,0 +1,770 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: lastet\n"
+"Report-Msgid-Bugs-To: pevernow\n"
+"POT-Creation-Date: 2017-11-14 03:47+0800\n"
+"PO-Revision-Date: 2020-04-18 12:47+0800\n"
+"Last-Translator: pevernow <3450354617@qq.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+msgid "Granite"
+msgstr "花岗岩"
+msgid "Grate"
+msgstr "磨碎"
+msgid "Streak Free Glass"
+msgstr "无条纹玻璃"
+msgid "Wood Framed Glass"
+msgstr "木框玻璃"
+msgid "Adobe"
+msgstr "土砖"
+msgid "Fake Grass"
+msgstr "塑料草"
+msgid "Hardwood"
+msgstr "硬木"
+msgid "Roof block"
+msgstr "天台"
+msgid "Tar"
+msgstr "焦油"
+msgid "Marble"
+msgstr "大理石"
+msgid "Brobble Spread"
+msgstr "石砖路面"
+msgid "Gravel Spread"
+msgstr "碎石路面"
+msgid "Tarmac Spread"
+msgstr "柏油路面"
+msgid "Terrycloth towel"
+msgstr "毛巾"
+msgid "Chess board tiling"
+msgstr "棋盘铺贴"
+msgid "Fireplace"
+msgstr "壁炉"
+msgid "Small bundle of sticks"
+msgstr "小捆棍子"
+msgid "Tar base"
+msgstr "焦油基"
+msgid "Tar Knife"
+msgstr "焦油刀"
+msgid "Hanging chain (wrought iron)"
+msgstr "吊链（锻铁）"
+msgid "Hanging chain (brass)"
+msgstr "吊链（黄铜）"
+msgid "Hanging chain (ceiling mount, wrought iron)"
+msgstr "锻铁吊链"
+msgid "Hanging chain (ceiling mount, brass)"
+msgstr "黄铜吊链"
+msgid "Chandelier (wrought iron)"
+msgstr "锻铁吊灯"
+msgid "Chandelier (brass)"
+msgstr "黄铜吊灯"
+msgid "Monitor and keyboard"
+msgstr "显示器和键盘"
+msgid "WIFI Router"
+msgstr "无线路由器"
+msgid "Computer Tower"
+msgstr "计算机箱"
+msgid "Printer-Scanner Combo"
+msgstr "打印扫描一体机"
+msgid "Rack Server"
+msgstr "机架式服务器"
+msgid "Not enough vertical space to place a server!"
+msgstr "高度不足，无法放置服务器！"
+msgid "Plastic sheet"
+msgstr "塑料板"
+msgid "Unprocessed Plastic base"
+msgstr "未加工的塑料基板"
+msgid "L"
+msgstr "左"
+msgid "R"
+msgstr "右"
+msgid "New Game"
+msgstr "新游戏"
+msgid "Next..."
+msgstr "下一个。。。"
+msgid "Score: "
+msgstr "分数："
+msgid "Tetris Arcade"
+msgstr "俄罗斯方块游戏机"
+msgid "No room for place the Arcade!"
+msgstr "没有地方放游戏机！"
+msgid "Ice fire"
+msgstr "冰火"
+msgid "Fancy Fire"
+msgstr "花式火"
+msgid "Glowing Embers"
+msgstr "发光的余烬"
+msgid "Stone chimney top"
+msgstr "鹅卵石烟囱顶部"
+msgid "Sandstone chimney top"
+msgstr "砂石烟囱顶部"
+msgid "Bathroom/kitchen tiles (dark)"
+msgstr "深色浴室/厨房瓷砖"
+msgid "Bathroom/kitchen tiles (medium)"
+msgstr "浴室/厨房瓷砖"
+msgid "Bathroom/kitchen tiles (light)"
+msgstr "浅色浴室/厨房瓷砖"
+msgid "Towel rod with towel"
+msgstr "毛巾杆"
+msgid "Medicine cabinet"
+msgstr "药柜"
+msgid "Toilet"
+msgstr "卫生间"
+msgid "Toilet paper"
+msgstr "厕纸"
+msgid "Bathroom Sink"
+msgstr "浴室水槽"
+msgid "Bathroom taps/faucet"
+msgstr "浴室水龙头"
+msgid "Bathroom taps/faucet (brass)"
+msgstr "黄铜浴室水龙头"
+msgid "Shower Tray"
+msgstr "淋浴盆"
+msgid "Shower Head"
+msgstr "淋浴喷头"
+msgid "Bathtub, clawfoot, with brass taps"
+msgstr "带黄铜水龙头的浴缸"
+msgid "Bathtub, clawfoot, with chrome taps"
+msgstr "带镀铬水龙头的浴缸"
+msgid "Bathroom sundries set"
+msgstr "浴室杂物套装"
+msgid "Bed"
+msgstr "床"
+msgid "Bed (king sized)"
+msgstr "双人床"
+msgid "mahogany"
+msgstr "桃花心木"
+msgid "oak"
+msgstr "橡木"
+msgid "Nightstand with One Drawer (@1)"
+msgstr "带一个抽屉的床头柜(@1)"
+msgid "One-drawer Nightstand"
+msgstr "单抽屉床头柜"
+msgid "Nightstand with Two Drawers (@1)"
+msgstr "带两个抽屉的床头柜(@1)"
+msgid "Two-drawer Nightstand"
+msgstr "两抽屉床头柜"
+msgid "red"
+msgstr "红色"
+msgid "green"
+msgstr "绿色"
+msgid "blue"
+msgstr "蓝色"
+msgid "violet"
+msgstr "紫罗兰"
+msgid "grey"
+msgstr "灰色"
+msgid "brown"
+msgstr "棕色的"
+msgid "Writable Book (@1)"
+msgstr "可写书（@1）"
+msgid "@1 has written in a book (title: \"@2\"): \"@3\" at location @4"
+msgstr "@我在一本书中写过（书名：\@2\）：\@3\，地点@4"
+msgid "Air Conditioner"
+msgstr "空调"
+msgid "Desk Fan"
+msgstr "台扇"
+msgid "Ceiling Fan"
+msgstr "吊扇"
+msgid "Space heater"
+msgstr "暖气机"
+msgid "Radiator heater"
+msgstr "散热器加热器"
+msgid "Plastic analog clock"
+msgstr "塑料时钟"
+msgid "Wooden analog clock"
+msgstr "木钟"
+msgid "Digital clock"
+msgstr "数字时钟"
+msgid "Alarm clock"
+msgstr "闹钟"
+msgid "Grandfather Clock"
+msgstr "祖父钟"
+msgid "Cobweb"
+msgstr "蛛网"
+msgid "Uncooked Terracotta Base"
+msgstr "生陶底座"
+msgid "Terracotta Roof Tile"
+msgstr "陶土屋顶瓦"
+msgid "Oil extract"
+msgstr "油萃取物"
+msgid "Unprocessed paraffin"
+msgstr "未加工石蜡"
+msgid "Plastic strips"
+msgstr "塑料条"
+msgid "Small Wooden Drawer"
+msgstr "小的木抽屉"
+msgid "Simple Integrated Circuit"
+msgstr "简单集成电路"
+msgid "Heating element"
+msgstr "加热元件"
+msgid "Motor"
+msgstr "电动机"
+msgid "Power Crystal"
+msgstr "功率晶体"
+msgid "Blank Canvas"
+msgstr "空白画布"
+msgid "VCR"
+msgstr "录像机"
+msgid "DVD Player"
+msgstr "光盘播放机"
+msgid "Spool of copper wire"
+msgstr "铜线卷轴"
+msgid "Spool of steel wire"
+msgstr "钢丝卷轴"
+msgid "Speaker driver"
+msgstr "扬声器"
+msgid "Fan blades"
+msgstr "风扇叶片"
+msgid "Copper Strip"
+msgstr "铜带"
+msgid "Steel Strip"
+msgstr "钢带"
+msgid "Steel chainlink"
+msgstr "钢链节"
+msgid "Brass chainlink"
+msgstr "黄铜链节"
+msgid "Soda Can"
+msgstr "易拉罐"
+msgid "Gold Coin (for soda vending machine)"
+msgstr "金币（汽水贩卖机专用）"
+msgid "Silicon lump"
+msgstr "硅块"
+msgid "Brass Ingot"
+msgstr "铜锭"
+msgid "Small Flower Pot"
+msgstr "小花盆"
+msgid "coin crafting is disabled!"
+msgstr "无法进行硬币制作！"
+msgid "Mahogany Closet Door (@1 opening)"
+msgstr "桃花心木壁橱门（@1开）"
+msgid "Oak Closet Door (@1 opening)"
+msgstr "橡木壁橱门（@1开）"
+msgid "Fancy Wood/Glass Door (@1 opening)"
+msgstr "花式木门/玻璃门（@1开）"
+msgid "Glass Office Door (@1 opening)"
+msgstr "玻璃办公门（@1开）"
+msgid "Glass and Wood, Oak-colored (@1 opening)"
+msgstr "橡木色玻璃和木材（@1开口）"
+msgid "Glass and Wood, Mahogany-colored (@1 opening)"
+msgstr "桃花心木色玻璃和木材（@1开口）"
+msgid "Glass and Wood, White (@1 opening)"
+msgstr "玻璃和木材，白色（@1开口）"
+msgid "Plain Wooden Door (@1 opening)"
+msgstr "普通木门（@1开）"
+msgid "White Bedroom Door (@1 opening)"
+msgstr "白色卧室门（@1开）"
+msgid "Wrought Iron Gate/Door (@1 opening)"
+msgstr "铁门（1开）"
+msgid "Wooden door with glass insert (@1 opening)"
+msgstr "带玻璃嵌件的木门（@1开）"
+msgid "Wooden door with glass insert, type 2 (@1 opening)"
+msgstr "带玻璃嵌件的木门，2型（1个开口处）"
+msgid "left"
+msgstr "左边"
+msgid "right"
+msgstr "正确的"
+msgid "Unpainted Picket Fence Gate"
+msgstr "未上漆的尖桩栅栏门"
+msgid "White Picket Fence Gate"
+msgstr "白色尖桩栅栏门"
+msgid "Barbed Wire Fence Gate"
+msgstr "铁丝网栅栏门"
+msgid "Chainlink Fence Gate"
+msgstr "铁链栅栏门"
+msgid "\"Half\" Door"
+msgstr "\半门"
+msgid "\"Half\" Door (white)"
+msgstr "\半门（白色）"
+msgid "Japanese wall (top)"
+msgstr "日本墙（上）"
+msgid "Japanese wall"
+msgstr "日本墙"
+msgid "Japanese wall (bottom)"
+msgstr "日本墙（下）"
+msgid "Japanese tatami"
+msgstr "日本榻榻米"
+msgid "Japanese-style door"
+msgstr "日式门"
+msgid "Power Outlet"
+msgstr "电源插座"
+msgid "Light switch"
+msgstr "灯光开关"
+msgid "Doorbell"
+msgstr "门铃"
+msgid "Large Stereo Speaker"
+msgstr "大型立体声扬声器"
+msgid "Large Stereo Speaker, open front"
+msgstr "开放式大立体声扬声器"
+msgid "Small Surround Speaker"
+msgstr "小型环绕扬声器"
+msgid "Stereo Receiver"
+msgstr "立体声接收机"
+msgid "Projection Screen Material"
+msgstr "投影屏幕材料"
+msgid "Small CRT Television"
+msgstr "小型CRT电视"
+msgid "DVD and VCR"
+msgstr "DVD和VCR"
+msgid "Telephone"
+msgstr "电话"
+msgid "Barbecue"
+msgstr "烧烤"
+msgid "Garden Bench (style 1)"
+msgstr "花园长凳（样式1）"
+msgid "Garden Bench (style 2)"
+msgstr "花园长凳（样式2）"
+msgid "Deck Chair"
+msgstr "躺椅"
+msgid "Deck Chair (blue striped)"
+msgstr "躺椅（蓝色条纹）"
+msgid "Doghouse"
+msgstr "狗窝"
+msgid "Simple Bench"
+msgstr "简易长凳"
+msgid "Garden stone path"
+msgstr "花园石径"
+msgid "wood"
+msgstr "木材"
+msgid "white wood"
+msgstr "白木"
+msgid "wood, with vegetation"
+msgstr "带植被的木材"
+msgid "white wood, with vegetation"
+msgstr "带植被的白木"
+msgid "Garden Lattice (@1)"
+msgstr "花园格子（@1）"
+msgid "Tree's swing"
+msgstr "树的秋千"
+msgid "Water well"
+msgstr "水井"
+msgid "yellow"
+msgstr "黄色的"
+msgid "Shrubbery (large, @1)"
+msgstr "大灌木丛（@1）"
+msgid "Shrubbery (@1)"
+msgstr "灌木丛（@1）"
+msgid "brass"
+msgstr "黄铜"
+msgid "wrought iron"
+msgstr "锻铁"
+msgid "Fence/railing (@1)"
+msgstr "围栏/栏杆（@1）"
+msgid "Fence/railing with sign (@1)"
+msgstr "带标志的围栏/栏杆（@1）"
+msgid "Unpainted Picket Fence"
+msgstr "未上漆的尖桩篱笆"
+msgid "Unpainted Picket Fence Corner"
+msgstr "未上漆的尖桩围栏角"
+msgid "White Picket Fence"
+msgstr "白色尖桩篱笆"
+msgid "White Picket Fence Corner"
+msgstr "白色尖桩篱笆角"
+msgid "Wooden Privacy Fence"
+msgstr "木质隐私围栏"
+msgid "Wooden Privacy Fence Corner"
+msgstr "木质隐私围栏角"
+msgid "Barbed Wire Fence"
+msgstr "带刺铁丝网"
+msgid "Barbed Wire Fence Corner"
+msgstr "铁丝网围栏角"
+msgid "Chainlink Fence"
+msgstr "铁丝网围栏"
+msgid "Chainlink Fence Corner"
+msgstr "铁丝网围栏角"
+msgid "Wrought Iron fence (type 2)"
+msgstr "锻铁栅栏（2型）"
+msgid "Wrought Iron fence (type 2) Corner"
+msgstr "锻铁围栏（2类）转角"
+msgid "Wall-mounted coat rack"
+msgstr "壁挂衣架"
+msgid "Coat tree"
+msgstr "种树"
+msgid "Green welcome mat"
+msgstr "绿色迎宾垫"
+msgid "Brown welcome mat"
+msgstr "棕色迎宾垫"
+msgid "Grey welcome mat"
+msgstr "灰色迎宾垫"
+msgid "Table"
+msgstr "桌子"
+msgid "Mahogany Table"
+msgstr "红木桌"
+msgid "White Table"
+msgstr "白色桌子"
+msgid "Kitchen chair"
+msgstr "厨房椅"
+msgid "Armchair"
+msgstr "扶手椅"
+msgid "Bookshelf (open-frame)"
+msgstr "书架（开架）"
+msgid "Wall Shelf"
+msgstr "墙架"
+msgid "Bars"
+msgstr "酒吧"
+msgid "Binding Bars"
+msgstr "绑扎钢筋"
+msgid "Chains"
+msgstr "链"
+msgid "Wall Torch"
+msgstr "壁灯"
+msgid "Wall Lamp"
+msgstr "壁灯"
+msgid "Cutlery set"
+msgstr "餐具套装"
+msgid "Brown bottle"
+msgstr "棕色瓶子"
+msgid "Four brown bottles"
+msgstr "四个棕色瓶子"
+msgid "Four green bottles"
+msgstr "四个绿色瓶子"
+msgid "Green bottle"
+msgstr "绿瓶"
+msgid "Four misc brown/green bottles"
+msgstr "四个其他棕色/绿色瓶子"
+msgid "Wine rack"
+msgstr "酒架"
+msgid "Dartboard"
+msgstr "飞镖板"
+msgid "Beer tap"
+msgstr "啤酒龙头"
+msgid "Ahh, a frosty cold beer - look in your inventory for it!"
+msgstr "啊，一杯冰凉的啤酒-看看你的库存吧！"
+msgid "No room in your inventory to add a beer mug!"
+msgstr "你的库存里没有地方放啤酒杯！"
+msgid "Beer mug"
+msgstr "啤酒杯"
+msgid "Soda vending machine"
+msgstr "汽水自动售货机"
+msgid "Please insert a coin in the machine."
+msgstr "请在机器里放一枚硬币。"
+msgid "Not enough room - the space for the headboard is occupied!"
+msgstr "没有足够的空间-床头板的空间被占用了！"
+msgid "Someone already owns the spot where the headboard goes."
+msgstr "有东西已经占用床头板的位置了。"
+msgid "Not enough room - the upper space is occupied!"
+msgstr "没有足够的空间-上面的空间被占用了！"
+msgid "Someone already owns that spot."
+msgstr "已经有东西占用那个地方了。"
+msgid "Furnace"
+msgstr "熔炉"
+msgid "@1 (empty)"
+msgstr "@1（空）"
+msgid "@1 (active)"
+msgstr "@1（活动）"
+msgid "@1 (active: @2%)"
+msgstr "@1（活动：@2%）"
+msgid "@1 (out of fuel)"
+msgstr "@1（燃油耗尽）"
+msgid "@1 (output bins are full)"
+msgstr "@1（输出箱已满）"
+msgid "@1 moves stuff in @2 at @3"
+msgstr "@1在@2和@3移动物品"
+msgid "@1 moves @2 to @3 at @4"
+msgstr "@1在@4移动@2到@3"
+msgid "@1 takes @2 from @3 at @4"
+msgstr "@1从@3到@4取@2"
+msgid "@1 (owned by @2)"
+msgstr "@1（归@2所有）"
+msgid "@1 tried to access a @2 belonging to @3 at @4"
+msgstr "@1试图在@4访问属于@3的@2"
+msgid "@1 (Locked)"
+msgstr "@1（锁定）"
+msgid "Loaded!"
+msgstr "加载！"
+msgid "Refrigerator (stainless steel)"
+msgstr "冰箱（不锈钢）"
+msgid "Refrigerator"
+msgstr "冰箱"
+msgid "Oven"
+msgstr "烤箱"
+msgid "Oven (stainless steel)"
+msgstr "烤箱（不锈钢）"
+msgid "Microwave Oven"
+msgstr "微波炉"
+msgid "Coffee Maker"
+msgstr "咖啡机"
+msgid "Toaster"
+msgstr "烤面包机"
+msgid "Dishwasher"
+msgstr "洗碗机"
+msgid "granite"
+msgstr "花岗岩"
+msgid "marble"
+msgstr "大理石"
+msgid "steel"
+msgstr "钢"
+msgid "Dishwasher (@1)"
+msgstr "洗碗机（@1）"
+msgid "Kitchen Cabinet"
+msgstr "厨柜"
+msgid "Kitchen Cabinet (@1 top)"
+msgstr "厨柜（@1顶）"
+msgid "Half-height Kitchen Cabinet (on ceiling)"
+msgstr "半高厨柜（悬挂式）"
+msgid "Kitchen Cabinet with sink"
+msgstr "带水槽的橱柜"
+msgid "Under-sink cabinet"
+msgstr "水槽柜下"
+msgid "Copper pans"
+msgstr "铜锅"
+msgid "Kitchen Faucet"
+msgstr "厨房水龙头"
+msgid "Paper towels"
+msgstr "纸巾"
+msgid "Thick Glowlight"
+msgstr "厚辉光"
+msgid "Thin Glowlight"
+msgstr "薄辉光"
+msgid "Small Glowlight Cube"
+msgstr "小发光体"
+msgid "Plasma Lamp"
+msgstr "等离子灯"
+msgid "Plasma Ball"
+msgstr "等离子球"
+msgid "Thick Candle"
+msgstr "粗蜡烛"
+msgid "Thin Candle"
+msgstr "薄蜡烛"
+msgid "Candlestick (wrought iron)"
+msgstr "烛台（锻铁）"
+msgid "Candlestick (brass)"
+msgstr "烛台（黄铜）"
+msgid "Wall sconce"
+msgstr "壁灯"
+msgid "Oil lamp (hurricane)"
+msgstr "油灯（飓风）"
+msgid "Oil Lamp (tabletop)"
+msgstr "油灯（桌面）"
+msgid "Ground Lantern"
+msgstr "地灯"
+msgid "Hanging Lantern"
+msgstr "吊灯"
+msgid "Ceiling Lantern"
+msgstr "吊灯"
+msgid "Lattice lantern (large)"
+msgstr "格子灯（大）"
+msgid "Lattice lantern (small)"
+msgstr "格子灯（小）"
+msgid "Table Lamp"
+msgstr "台灯"
+msgid "Standing Lamp"
+msgstr "台灯"
+msgid "Desk Lamp"
+msgstr "台灯"
+msgid "Ceiling Lamp"
+msgstr "顶灯"
+msgid "Ceiling Lamp (off)"
+msgstr "顶灯（关）"
+msgid "Textured Ceiling Paint"
+msgstr "纹理天花板漆"
+msgid "Drop-Ceiling Tile"
+msgstr "落地砖"
+msgid "small"
+msgstr "小的"
+msgid "large"
+msgstr "大的"
+msgid "persian"
+msgstr "波斯的"
+msgid "Rug (@1)"
+msgstr "地毯（@1）"
+msgid "black"
+msgstr "黑色"
+msgid "terracotta"
+msgstr "陶土"
+msgid "Flower Pot (@1)"
+msgstr "花盆（@1）"
+msgid "Rose"
+msgstr "玫瑰"
+msgid "Tulip"
+msgstr "郁金香"
+msgid "Yellow Dandelion"
+msgstr "黄色蒲公英"
+msgid "White Dandelion"
+msgstr "白色蒲公英"
+msgid "Blue Geranium"
+msgstr "蓝色天竺葵"
+msgid "Viola"
+msgstr "中提琴"
+msgid "Cactus"
+msgstr "仙人掌"
+msgid "Bonsai"
+msgstr "盆景"
+msgid "Potted flower (@1)"
+msgstr "盆花（@1）"
+msgid "Brass Pole"
+msgstr "铜柱"
+msgid "Wrought Iron Pole"
+msgstr "锻铁杆"
+msgid "Fishtank"
+msgstr "鱼缸"
+msgid "Fishtank (lighted)"
+msgstr "鱼缸（带灯光）"
+msgid "Cardboard box (big)"
+msgstr "纸箱（大）"
+msgid "Cardboard box"
+msgstr "纸箱"
+msgid "DVD/CD cabinet"
+msgstr "DVD/CD柜"
+msgid "Pool Table"
+msgstr "台球桌"
+msgid "Piano"
+msgstr "钢琴"
+msgid "Trophy"
+msgstr "奖杯"
+msgid "Sport bench"
+msgstr "运动板凳"
+msgid "Skateboard"
+msgstr "滑板"
+msgid "Metal tool cabinet and work table"
+msgstr "金属工具柜及工作台"
+msgid "Picture Frame "
+msgstr "相框"
+msgid "Decorative painting #@1"
+msgstr "装饰画 #@1"
+msgid "dark topped"
+msgstr "暗顶"
+msgid "diagonal"
+msgstr "对角线的"
+msgid "horizontal"
+msgstr "水平的"
+msgid "Banister for Stairs (@1, @2)"
+msgstr "楼梯栏杆（@1，@2）"
+msgid "not enough space"
+msgstr "空间不足"
+msgid "Filing cabinet"
+msgstr "文件柜"
+msgid "Desk"
+msgstr "办公桌"
+msgid "Desk globe"
+msgstr "台式地球仪"
+msgid "Calendar"
+msgstr "日历"
+msgid ""
+"日期 (右键更新):\n"
+"@1"
+msgstr ""
+msgid "Basic office chair"
+msgstr "办公椅"
+msgid "Upscale office chair"
+msgstr "高档办公椅"
+msgid "Glass Skylight"
+msgstr "玻璃天窗"
+msgid "Glass Skylight Frosted"
+msgstr "磨砂玻璃天窗"
+msgid "asphalt"
+msgstr "沥青"
+msgid "Shingles (@1)"
+msgstr "瓦（@1）"
+msgid "@1 (outer corner)"
+msgstr "@1（外角）"
+msgid "@1 (inner corner)"
+msgstr "@1（内角）"
+msgid "Wood Shingles"
+msgstr "木头瓦"
+msgid "Asphalt Shingles"
+msgstr "沥青瓦"
+msgid "Terracotta Shingles"
+msgstr "陶瓦"
+msgid "Glass Shingles"
+msgstr "玻璃瓦"
+msgid "Chimney"
+msgstr "烟囱"
+msgid "Wooden Shutter"
+msgstr "木快门"
+msgid "Small square glass table"
+msgstr "小方形玻璃桌"
+msgid "Small round glass table"
+msgstr "小圆形玻璃桌"
+msgid "Large glass table piece"
+msgstr "大玻璃桌片"
+msgid "Small square wooden table"
+msgstr "小方木桌"
+msgid "Small round wooden table"
+msgstr "小圆桌"
+msgid "Large wooden table piece"
+msgstr "大木桌片"
+msgid "Utility Table"
+msgstr "效用表"
+msgid "Table Legs (@1)"
+msgstr "桌腿（@1）"
+msgid "Legs for Utility Table"
+msgstr "通用桌腿"
+msgid "Green Trash Can"
+msgstr "绿色垃圾桶"
+msgid "Trash Can"
+msgstr "垃圾桶"
+msgid "Small Trash Can"
+msgstr "小垃圾桶"
+msgid "Wardrobe"
+msgstr "衣柜"
+msgid "Clothes"
+msgstr "衣服"
+msgid "Storage"
+msgstr "储藏间""
+msgid "Window (quartered)"
+msgstr "窗户（四分之一）"
+msgid "Window (plain)"
+msgstr "窗口（普通）"
+msgid "Window Blinds (thick)"
+msgstr "百叶窗（厚）"
+msgid "Window Blinds (thin)"
+msgstr "百叶窗（薄）"
+msgid "Curtains"
+msgstr "窗帘"
+msgid "Curtains (open)"
+msgstr "窗帘（打开）"
+msgid "Curtain Rod (@1)"
+msgstr "窗帘杆（@1）"
+msgid "Window flowerbox"
+msgstr "窗花箱"
+msgid "Stained Glass"
+msgstr "彩色玻璃"
+msgid "Mailbox"
+msgstr "邮箱"
+msgid "@1's Mailbox"
+msgstr "@1的邮箱"
+msgid "Item frame"
+msgstr "项目框架"
+msgid "Item frame (owned by @1)"
+msgstr "物品框架（归@1所有）"
+msgid "Pedestal"
+msgstr "底座"
+msgid "Pedestal (owned by @1)"
+msgstr "基座（归@1所有）"
+msgid "Lava Lamp"
+msgstr "岩浆灯"
+msgid "Lava Lamp (off)"
+msgstr "岩浆灯（关闭）"
+msgid "Coffee Table"
+msgstr "咖啡桌"
+msgid "No room to place the coffee table!"
+msgstr "没有地方放咖啡桌！"
+msgid "End Table"
+msgstr "结束表"
+msgid "Someone else owns the spot where other end goes!"
+msgstr "另一端去的地方是别人的！"
+msgid "Someone else owns the spot where the middle or far end goes!"
+msgstr "中间或远端去的地方是别人的！"
+msgid "Someone else owns the spot where the other end goes!"
+msgstr "另一端去的地方是别人的！"
+msgid "Long Sofa"
+msgstr "长沙发"
+msgid "No room to place the sofa!"
+msgstr "没有地方放沙发！"
+msgid "Sofa"
+msgstr "沙发"
+msgid "Plasma Screen TV Stand"
+msgstr "液晶电视架"
+msgid "Plasma TV"
+msgstr "液晶电视"
+msgid "Plasma TV (off)"
+msgstr "液晶电视（关闭）"

homedecor_doors_and_gates/init.lua

@@ -586,8 +586,8 @@ minetest.register_craft( {
         output = "doors:homedecor_french_mahogany 2",
         recipe = {
 			"dye:brown",
-			"doors:homedecor_wood_glass_oak_a",
-			"doors:homedecor_wood_glass_oak_a"
+			"doors:homedecor_french_oak",
+			"doors:homedecor_french_oak"
         },
 })
 
@@ -596,8 +596,8 @@ minetest.register_craft( {
         output = "doors:homedecor_french_white 2",
         recipe = {
 			"dye:white",
-			"doors:homedecor_wood_glass_oak_a",
-			"doors:homedecor_wood_glass_oak_a"
+			"doors:homedecor_french_oak",
+			"doors:homedecor_french_oak"
         },
 })
 
@@ -620,8 +620,8 @@ minetest.register_craft( {
 	type = "shapeless",
         output = "doors:homedecor_closet_mahogany 2",
         recipe = {
-			"doors:homedecor_closet_oak_a",
-			"doors:homedecor_closet_oak_a",
+			"doors:homedecor_closet_oak",
+			"doors:homedecor_closet_oak",
 			"dye:brown"
         },
 })
@@ -643,7 +643,7 @@ minetest.register_craft( {
 	output = "doors:homedecor_basic_panel",
 	recipe = {
 		{ "dye:white", "dye:white", "" },
-		{ "doors:homedecor_wood_plain_a", "basic_materials:brass_ingot", "" },
+		{ "doors:homedecor_wood_plain", "basic_materials:brass_ingot", "" },
 		{ "", "", "" },
 	},
 })

homedecor_electrical/init.lua

@@ -16,8 +16,6 @@ function homedecor.toggle_switch(pos, node, clicker, itemstack, pointed_thing)
 end
 
 local on_rc
-local switch_receptor
-
 if minetest.get_modpath("mesecons") then
 	on_rc = function(pos, node, clicker, itemstack, pointed_thing)
 		local t = homedecor.toggle_switch(pos, node, clicker, itemstack, pointed_thing)
@@ -28,12 +26,6 @@ if minetest.get_modpath("mesecons") then
 			mesecon.receptor_on(pos, mesecon.rules.buttonlike_get(node))
 		end
 	end
-	switch_receptor = {
-		receptor = {
-			state = mesecon.state[onoff],
-			rules = mesecon.rules.buttonlike_get
-		}
-	}
 end
 
 homedecor.register("power_outlet", {
@@ -65,6 +57,16 @@ homedecor.register("power_outlet", {
 
 for _, onoff in ipairs ({"on", "off"}) do
 
+	local switch_receptor
+	if minetest.get_modpath("mesecons") then
+		switch_receptor = {
+			receptor = {
+				state = mesecon.state[onoff],
+				rules = mesecon.rules.buttonlike_get
+			}
+		}
+	end
+
 	local model = {
 		{ -0.125,   -0.1875, 0.4375,  0.125,   0.125,  0.5 },
 		{ -0.03125,  0,      0.40625, 0.03125, 0.0625, 0.5 },

homedecor_exterior/depends.txt

@@ -2,6 +2,7 @@ homedecor_common
 default
 dye
 creative
+basic_materials
 moreblocks?
 building_blocks?
 bucket?

homedecor_exterior/init.lua

@@ -349,7 +349,7 @@ minetest.register_craft({
 	recipe = {
 		{ "","homedecor:fence_chainlink","" },
 		{ "default:steel_ingot","fake_fire:embers","default:steel_ingot" },
-		{ "homedecor:pole_wrought_iron","default:steel_ingot","homedecor:pole_wrought_iron" }
+		{ "basic_materials:steel_bar","default:steel_ingot","basic_materials:steel_bar" }
 	},
 })
 

homedecor_fences/init.lua

@@ -1,19 +1,5 @@
 -- This file adds fences of various types
 
-local signs_modpath = minetest.get_modpath("signs_lib")
-
-local sign_post_model = {
-	type = "fixed",
-	fixed = {
-			{-0.4375, -0.25, -0.1875, 0.4375, 0.375, -0.125},
-			{-0.125, -0.5, -0.125, 0.125, 0.5, 0.125},
-	}
-}
-
-if signs_modpath then
-	sign_post_model = signs_lib.sign_post_model.nodebox
-end
-
 local S = homedecor.gettext
 
 local materials = {
@@ -23,43 +9,17 @@ local materials = {
 
 for _, m in ipairs(materials) do
 
-local desc, name = unpack(m)
+	local desc, name = unpack(m)
 
-homedecor.register("fence_"..name, {
-	description = S("Fence/railing (@1)", desc),
-	drawtype = "fencelike",
-	tiles = {"homedecor_generic_metal_"..name..".png"},
-	inventory_image = "homedecor_fence_"..name..".png",
-	selection_box = homedecor.nodebox.bar_y(1/7),
-	groups = {snappy=3},
-	sounds = default.node_sound_wood_defaults(),
-})
-
--- brass/wrought iron with signs:
-
-homedecor.register("fence_"..name.."_with_sign", {
-	description = S("Fence/railing with sign (@1)", desc),
-	tiles = {
-		"homedecor_sign_"..name.."_post_top.png",
-		"homedecor_sign_"..name.."_post_bottom.png",
-		"homedecor_sign_"..name.."_post_side.png",
-		"homedecor_sign_"..name.."_post_side.png",
-		"homedecor_sign_"..name.."_post_back.png",
-		"homedecor_sign_"..name.."_post_front.png",
-	},
-	wield_image = "homedecor_sign_"..name.."_post.png",
-	node_box = sign_post_model,
-	groups = {snappy=3,not_in_creative_inventory=1},
-	sounds = default.node_sound_wood_defaults(),
-	sunlight_propagates = true,
-	drop = {
-		max_items = 2,
-		items = {
-			{ items = { "default:sign_wall" }},
-			{ items = { "homedecor:fence_"..name }},
-		},
-	},
-})
+	homedecor.register("fence_"..name, {
+		description = S("Fence/railing (@1)", desc),
+		drawtype = "fencelike",
+		tiles = {"homedecor_generic_metal_"..name..".png"},
+		inventory_image = "homedecor_fence_"..name..".png",
+		selection_box = homedecor.nodebox.bar_y(1/7),
+		groups = {snappy=3},
+		sounds = default.node_sound_wood_defaults(),
+	})
 
 end
 
@@ -303,9 +263,15 @@ homedecor.register("fence_wrought_iron_2_corner", {
 	},
 })
 
-if signs_modpath then
-	signs_lib.register_fence_with_sign("homedecor:fence_brass", "homedecor:fence_brass_with_sign")
-	signs_lib.register_fence_with_sign("homedecor:fence_wrought_iron", "homedecor:fence_wrought_iron_with_sign")
+-- insert the old wood signs-on-metal-fences into signs_lib's conversion LBM
+if minetest.get_modpath("signs_lib") then
+	table.insert(signs_lib.old_fenceposts_with_signs, "homedecor:fence_brass_with_sign")
+	signs_lib.old_fenceposts["homedecor:fence_brass_with_sign"] = "homedecor:fence_brass"
+	signs_lib.old_fenceposts_replacement_signs["homedecor:fence_brass_with_sign"] = "default:sign_wall_wood_onpole"
+
+	table.insert(signs_lib.old_fenceposts_with_signs, "homedecor:fence_wrought_iron_with_sign")
+	signs_lib.old_fenceposts["homedecor:fence_wrought_iron_with_sign"] = "homedecor:fence_wrought_iron"
+	signs_lib.old_fenceposts_replacement_signs["homedecor:fence_wrought_iron_with_sign"] = "default:sign_wall_wood_onpole"
 end
 
 -- crafting

homedecor_gastronomy/init.lua

@@ -164,18 +164,7 @@ homedecor.register("beer_mug", {
 	on_use = function(itemstack, user, pointed_thing)
 		local inv = user:get_inventory()
 		if not creative.is_enabled_for(user:get_player_name()) then
-			if inv:room_for_item("main", "vessels:drinking_glass 1") then
-				inv:add_item("main", "vessels:drinking_glass 1")
-			else
-				local pos = user:get_pos()
-				local dir = user:get_look_dir()
-				local fdir = minetest.dir_to_facedir(dir)
-				local pos_fwd = {	x = pos.x + homedecor.fdir_to_fwd[fdir+1][1],
-									y = pos.y + 1,
-									z = pos.z + homedecor.fdir_to_fwd[fdir+1][2] }
-				minetest.add_item(pos_fwd, "vessels:drinking_glass 1")
-			end
-			minetest.do_item_eat(2, nil, itemstack, user, pointed_thing)
+			minetest.do_item_eat(2, "vessels:drinking_glass 1", itemstack, user, pointed_thing)
 			return itemstack
 		end
 	end

homedecor_lighting/init.lua

@@ -98,11 +98,12 @@ local digiline_on_punch
 if minetest.get_modpath("digilines") then
 
 	local on_digiline_receive_string = function(pos, node, channel, msg)
+		if not msg or not channel then return end
 		local meta = minetest.get_meta(pos)
 		local setchan = meta:get_string("channel")
 		if setchan ~= channel then return end
 
-		if msg and msg ~= "" then
+		if msg ~= "" and (type(msg) == "string" or type(msg) == "number" ) then
 			local n = tonumber(msg)
 			local suff = word_to_bright[msg] or "invalid"
 
@@ -285,6 +286,7 @@ for brightness_level = 0, 14 do
 		after_place_node = function(pos, placer, itemstack, pointed_thing)
 			unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
 		end,
+		on_dig = unifieddyes.on_dig,
 		on_rightclick = homedecor.toggle_light,
 		drop = {
 			items = {
@@ -350,6 +352,7 @@ for brightness_level = 0, 14 do
 		after_place_node = function(pos, placer, itemstack, pointed_thing)
 			unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
 		end,
+		on_dig = unifieddyes.on_dig,
 		on_rightclick = homedecor.toggle_light,
 		drop = {
 			items = {
@@ -416,6 +419,7 @@ for brightness_level = 0, 14 do
 		after_place_node = function(pos, placer, itemstack, pointed_thing)
 			unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
 		end,
+		on_dig = unifieddyes.on_dig,
 		on_rightclick = homedecor.toggle_light,
 		drop = {
 			items = {
@@ -636,6 +640,7 @@ for brightness_level = 0, 14 do
 		after_place_node = function(pos, placer, itemstack, pointed_thing)
 			unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
 		end,
+		on_dig = unifieddyes.on_dig,
 		on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 		light_source = brightness_level,
 		on_rightclick = homedecor.toggle_light,
@@ -713,7 +718,8 @@ for brightness_level = 0, 14 do
 		digiline =      homedecor.digiline_alldir_light,
 		mesecons =      homedecor.mesecon_wall_light,
 		on_rightclick = homedecor.toggle_light,
-		on_punch =      digiline_on_punch
+		on_punch =      digiline_on_punch,
+		on_dig = unifieddyes.on_dig,
 	})
 
 	homedecor.register("standing_lamp_"..brightness_level, {
@@ -744,7 +750,8 @@ for brightness_level = 0, 14 do
 		digiline =      homedecor.digiline_alldir_light,
 		mesecons =      homedecor.mesecon_wall_light,
 		on_rightclick = homedecor.toggle_light,
-		on_punch =      digiline_on_punch
+		on_punch =      digiline_on_punch,
+		on_dig = unifieddyes.on_dig,
 	})
 end
 
@@ -1888,3 +1895,4 @@ if minetest.get_modpath("darkage") then
 	end
 end
 
+minetest.log("action", "[homedecor_lightning] loaded.")

homedecor_misc/depends.txt

@@ -5,3 +5,4 @@ unifieddyes
 building_blocks?
 technic?
 bucket?
+signs_lib?

homedecor_misc/init.lua

@@ -130,21 +130,22 @@ for _, f in ipairs(flowers_list) do
 end
 
 homedecor.register("pole_brass", {
-    description = S("Brass Pole"),
+	description = S("Brass Pole"),
 	mesh = "homedecor_round_pole.obj",
-    tiles = {"homedecor_generic_metal_brass.png^homedecor_generic_metal_lines_overlay.png",},
-    inventory_image = "homedecor_pole_brass_inv.png",
-    wield_image = "homedecor_pole_brass_inv.png",
-    selection_box = {
-            type = "fixed",
-            fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
-    },
-    collision_box = {
-            type = "fixed",
-            fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
-    },
-    groups = {snappy=3},
-    sounds = default.node_sound_wood_defaults(),
+	tiles = {"homedecor_generic_metal_brass.png^homedecor_generic_metal_lines_overlay.png",},
+	inventory_image = "homedecor_pole_brass_inv.png",
+	wield_image = "homedecor_pole_brass_inv.png",
+	selection_box = {
+		type = "fixed",
+		fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
+	},
+	collision_box = {
+		type = "fixed",
+		fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
+	},
+	groups = {snappy=3},
+	sounds = default.node_sound_wood_defaults(),
+	check_for_pole = true
 })
 
 homedecor.register("pole_wrought_iron", {
@@ -478,6 +479,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
 			def.airbrush_replacement_node = "homedecor:banister_wood_"..side.."_grey"
 			def.groups.ud_param2_colorable = 1
 			def.paramtype2 = "colorfacedir"
+			def.on_dig = unifieddyes.on_dig
 		end
 		homedecor.register(nodename, def)
 
@@ -918,7 +920,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "homedecor:sportbench",
 	recipe = {
-		{ "stairs:slab_steelblock","homedecor:pole_wrought_iron","stairs:slab_steelblock" },
+		{ "stairs:slab_steelblock","basic_materials:steel_bar","stairs:slab_steelblock" },
 		{ "default:steel_ingot","wool:black","default:steel_ingot" },
 		{ "default:steel_ingot","wool:black","default:steel_ingot" }
 	},

homedecor_seating/armchairs.lua

@@ -26,6 +26,7 @@ minetest.register_node(":lrfurn:armchair", {
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
 	end,
+	on_dig = unifieddyes.on_dig,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		if not clicker:is_player() then
@@ -51,10 +52,11 @@ homedecor.register("armchair", {
 	palette = "unifieddyes_palette_colorwallmounted.png",
 	groups = {snappy=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_wood_defaults(),
-	node_box = ac_cbox,
+	node_box = armchair_cbox,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
 	end,
+	on_dig = unifieddyes.on_dig,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 })
 

homedecor_seating/depends.txt

@@ -2,3 +2,4 @@ default
 wool
 homedecor_common
 unifieddyes
+basic_materials

homedecor_seating/init.lua

@@ -76,3 +76,5 @@ dofile(modpath.."/longsofas.lua")
 dofile(modpath.."/sofas.lua")
 dofile(modpath.."/armchairs.lua")
 dofile(modpath.."/misc.lua")
+
+minetest.log("action", "[homedecor_seating] loaded.")

homedecor_seating/longsofas.lua

@@ -41,6 +41,7 @@ minetest.register_node(":lrfurn:longsofa", {
 		end
 		return itemstack
 	end,
+	on_dig = unifieddyes.on_dig,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		if not clicker:is_player() then
 			return itemstack

homedecor_seating/misc.lua

@@ -153,6 +153,7 @@ homedecor.register("kitchen_chair_padded", {
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
 	end,
+	on_dig = unifieddyes.on_dig,
 	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 ?
@@ -211,7 +212,7 @@ minetest.register_craft( {
         recipe = {
 			{ "group:wood", "group:wood", "group:wood" },
 			{ "group:wood", "group:wood", "group:wood" },
-			{ "homedecor:pole_wrought_iron", "", "homedecor:pole_wrought_iron" }
+			{ "basic_materials:steel_bar", "", "basic_materials:steel_bar" }
         },
 })
 
@@ -315,7 +316,7 @@ minetest.register_craft({
 	recipe = {
 		{ "", "", "wool:black" },
 		{ "", "wool:black", "default:steel_ingot" },
-		{ "group:stick", "homedecor:pole_wrought_iron", "group:stick" }
+		{ "group:stick", "basic_materials:steel_bar", "group:stick" }
 	},
 })
 
@@ -324,7 +325,7 @@ minetest.register_craft({
 	recipe = {
 		{ "dye:black", "building_blocks:sticks", "group:wool" },
 		{ "basic_materials:plastic_sheet", "group:wool", "default:steel_ingot" },
-		{ "building_blocks:sticks", "homedecor:pole_wrought_iron", "building_blocks:sticks" }
+		{ "building_blocks:sticks", "basic_materials:steel_bar", "building_blocks:sticks" }
 	},
 })
 

homedecor_seating/sofas.lua

@@ -41,6 +41,7 @@ minetest.register_node(":lrfurn:sofa", {
 		end
 		return itemstack
 	end,
+	on_dig = unifieddyes.on_dig,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		if not clicker:is_player() then
 			return itemstack

homedecor_wardrobe/depends.txt

@@ -1,5 +1,7 @@
 homedecor_common
 default
+player_api
 homedecor_kitchen?
 homedecor_misc?
+3d_armor?
 skinsdb?

homedecor_windows_and_treatments/init.lua

@@ -115,6 +115,7 @@ minetest.register_node(":homedecor:curtain_closed", {
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
 	end,
+	on_dig = unifieddyes.on_dig,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		minetest.set_node(pos, { name = "homedecor:curtain_open", param2 = node.param2 })
 		return itemstack
@@ -137,6 +138,7 @@ minetest.register_node(":homedecor:curtain_open", {
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
 	end,
+	on_dig = unifieddyes.on_dig,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		minetest.set_node(pos, { name = "homedecor:curtain_closed", param2 = node.param2 })
 		return itemstack
@@ -243,6 +245,7 @@ homedecor.register("shutter", {
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
 	end,
+	on_dig = unifieddyes.on_dig,
 })
 
 homedecor.register("shutter_colored", {
@@ -260,6 +263,7 @@ homedecor.register("shutter_colored", {
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
 	end,
+	on_dig = unifieddyes.on_dig,
 })
 
 minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet")

inbox/init.lua

@@ -126,3 +126,5 @@ function inbox.get_inbox_insert_formspec(pos)
 		"listring[]"
 	return formspec
 end
+
+minetest.log("action", "[inbox] loaded.")

itemframes/init.lua

@@ -300,3 +300,5 @@ if minetest.get_modpath("mesecons_mvps") then
 	mesecon.register_mvps_stopper("itemframes:frame")
 	mesecon.register_mvps_stopper("itemframes:pedestal")
 end
+
+minetest.log("action", "[itemframes] loaded.")

lavalamp/init.lua

@@ -38,6 +38,7 @@ 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,
+	on_dig = unifieddyes.on_dig,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		node.name = "lavalamp:lavalamp_off"
 		minetest.swap_node(pos, node)

modpack.conf

@@ -0,0 +1 @@
+min_minetest_version = 5.2.0

plasmascreen/init.lua

@@ -186,3 +186,5 @@ minetest.register_craft({
 		{'group:stick', 'default:coal_lump', 'group:stick'},
 	}
 })
+
+minetest.log("action", "[plasmascreen] loaded.")