Merge remote-tracking branch 'upstream/master'

Update recipies to contain groups

See merge request VanessaE/homedecor_modpack!17

building_blocks/.luacheckrc

@@ -0,0 +1,21 @@
+unused_args = false
+allow_defined_top = true
+max_comment_line_length = 999
+
+read_globals = {
+	"DIR_DELIM",
+	"minetest", "core",
+	"unpack",
+	"dump",
+	table = { fields = { "copy", "getn" } },
+	"vector", "nodeupdate",
+	"VoxelManip", "VoxelArea",
+	"PseudoRandom", "ItemStack",
+	"stairsplus",
+	"default",
+	"stairs",
+}
+
+globals = {
+}
+

building_blocks/alias.lua

@@ -1,4 +1,4 @@
-local S = homedecor.gettext
+local S = minetest.get_translator("building_blocks")
 
 if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
 	minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar")

building_blocks/depends.txt

@@ -1,5 +0,0 @@
-default
-homedecor_common
-moreblocks?
-gloopblocks?
-stairs?

building_blocks/init.lua

@@ -1,7 +1,9 @@
-local S = homedecor.gettext
 local modpath = minetest.get_modpath("building_blocks")
 
 dofile(modpath.."/alias.lua")
 dofile(modpath.."/node_stairs.lua")
 dofile(modpath.."/others.lua")
 dofile(modpath.."/recipes.lua")
+
+minetest.log("action", "[building_blocks] loaded.")
+

building_blocks/locale/building_blocks.de.tr

@@ -0,0 +1,48 @@
+# textdomain: building_blocks
+
+
+### alias.lua ###
+
+Granite=Granit
+
+### node_stairs.lua ###
+
+Adobe=Adobe
+Adobe Slab=Adobestufe
+Adobe Stair=Adobetreppe
+Brobble Spread=Ziesterboden
+Chess board tiling=Schachbrettkacheln
+Fake Grass=Falsches Gras
+Fake Grass Slab=Falsches-Gras-Stufe
+Fake Grass Stair=Falsches-Gras-Treppe
+Fireplace=Kamin
+Grate=Rost
+Grate Slab=Roststufe
+Grate Stair=Rosttreppe
+Gravel Spread=Kiesboden
+Hardwood=Hartholz
+Hardwood Slab=Hartholzstufe
+Hardwood Stair=Hartholztreppe
+Marble=Marmor
+Marble Slab=Marmorstufe
+Marble Stair=Marmortreppe
+Roof block=Dachblock
+Roof block Slab=Dachblockstufe
+Roof block Stair=Dachblocktreppe
+Streak Free Glass=Schlierenfreies Glas
+Streak Free Glass Slab=Schlierenfreies-Glas-Stufe
+Streak Free Glass Stair=Schlierenfreies-Glas-Treppe
+Tar=Teer
+Tar Slab=Teerstufe
+Tar Stair=Teertreppe
+Tarmac Spread=Asphaltboden
+Terrycloth towel=Frottiertuch
+Wood Framed Glass=Holzrahmenglas
+Wood Framed Glass Slab=Holzrahmenglasstufe
+Wood Framed Glass Stair=Holzrahmenglastreppe
+
+### others.lua ###
+
+Small bundle of sticks=Kleines Bündel Stöcke
+Tar Knife=Teermesser
+Tar base=Teerbase

building_blocks/locale/building_blocks.es.tr

@@ -0,0 +1,48 @@
+# textdomain: building_blocks
+
+
+### alias.lua ###
+
+Granite=Granito
+
+### node_stairs.lua ###
+
+Adobe=Adobe
+Adobe Slab=Losa de adobe
+Adobe Stair=Escaleras de adobe
+Brobble Spread=Mezcla de Ladroquines
+Chess board tiling=Azulejos de ajedrez
+Fake Grass=Hierba falsa
+Fake Grass Slab=
+Fake Grass Stair=
+Fireplace=Chimenea
+Grate=Reja
+Grate Slab=Losa de rejas
+Grate Stair=Escaleras de rejas
+Gravel Spread=Mezcla de gravilla
+Hardwood=Madera dura
+Hardwood Slab=Losa de madera dura
+Hardwood Stair=Escaleras de madera dura
+Marble=Mármol
+Marble Slab=Losa de mármol
+Marble Stair=Escaleras de mármol
+Roof block=Bloque de techo
+Roof block Slab=
+Roof block Stair=
+Streak Free Glass=Vídrio sin rayas
+Streak Free Glass Slab=
+Streak Free Glass Stair=
+Tar=Alquitrán
+Tar Slab=Losa de alquitrán
+Tar Stair=Escaleras de alquitrán
+Tarmac Spread=Mezcla de asfalto
+Terrycloth towel=Toalla
+Wood Framed Glass=Vídrio enmarcado en madera
+Wood Framed Glass Slab=
+Wood Framed Glass Stair=
+
+### others.lua ###
+
+Small bundle of sticks=Manojo de palitos
+Tar Knife=Cuchillo de alquitrán
+Tar base=Base de alquitrán

building_blocks/locale/building_blocks.fr.tr

@@ -0,0 +1,48 @@
+# textdomain: building_blocks
+
+
+### alias.lua ###
+
+Granite=Granit
+
+### node_stairs.lua ###
+
+Adobe=Pisé
+Adobe Slab=Dalle en pisé
+Adobe Stair=Escalier en pisé
+Brobble Spread=Tapis rouge
+Chess board tiling=Pavage en échiquier
+Fake Grass=Herbe synthétique
+Fake Grass Slab=Dalle en herbe synthétique
+Fake Grass Stair=Escalier en herbe synthétique
+Fireplace=Cheminée
+Grate=Grille
+Grate Slab=Dalle en métal déployé
+Grate Stair=Escalier en métal déployé
+Gravel Spread=Tapis de gravier
+Hardwood=Bois dur (feuillu)
+Hardwood Slab=Dalle en bois dur (feuillu)
+Hardwood Stair=Escalier en bois dur (feuillu)
+Marble=Marbre
+Marble Slab=Dalle en marbre
+Marble Stair=Marche en marbre
+Roof block=Bloc de toit
+Roof block Slab=Dalle en bloc de toit
+Roof block Stair=Escalier en bloc de toit
+Streak Free Glass=Verre anti-rayures
+Streak Free Glass Slab=Dalle en verre anti-rayures
+Streak Free Glass Stair=Escalier en verre anti-rayures
+Tar=Goudron
+Tar Slab=Dalle en goudron
+Tar Stair=Marche en goudron
+Tarmac Spread=Tapis de goudron
+Terrycloth towel=Serviette éponge
+Wood Framed Glass=Verre encadré de bois
+Wood Framed Glass Slab=Dalle en verre encadré de bois
+Wood Framed Glass Stair=Escalier en verre encadré de bois
+
+### others.lua ###
+
+Small bundle of sticks=Petit fagot de brindilles
+Tar Knife=Couteau à goudron
+Tar base=Pâte de goudron

building_blocks/locale/building_blocks.ms.tr

@@ -0,0 +1,48 @@
+# textdomain: building_blocks
+
+
+### alias.lua ###
+
+Granite=Granit
+
+### node_stairs.lua ###
+
+Adobe=Adob
+Adobe Slab=Bidur Adob
+Adobe Stair=Tangga Adob
+Brobble Spread=Sebaran Batu Merah
+Chess board tiling=Jubin Papan Catur
+Fake Grass=Rumput Tiruan
+Fake Grass Slab=
+Fake Grass Stair=
+Fireplace=Pendiangan
+Grate=Jeriji
+Grate Slab=Bidur Jeriji
+Grate Stair=Tangga Jeriji
+Gravel Spread=Sebaran Kelikir
+Hardwood=Kayu Keras
+Hardwood Slab=Bidur Kayu Keras
+Hardwood Stair=Tangga Kayu Keras
+Marble=Marmar
+Marble Slab=Bidur Marmar
+Marble Stair=Tangga Marmar
+Roof block=Blok Bumbung
+Roof block Slab=
+Roof block Stair=
+Streak Free Glass=Kaca Bebas Calar
+Streak Free Glass Slab=
+Streak Free Glass Stair=
+Tar=Tar
+Tar Slab=Bidur Tar
+Tar Stair=Tangga Tar
+Tarmac Spread=Sebaran Tar
+Terrycloth towel=Kain Tuala
+Wood Framed Glass=Kaca Berbingkai Kayu
+Wood Framed Glass Slab=
+Wood Framed Glass Stair=
+
+### others.lua ###
+
+Small bundle of sticks=Seberkas Kecil Serpihan Kayu
+Tar Knife=Pisau Tar
+Tar base=Campuran Tar

building_blocks/locale/building_blocks.pt.tr

@@ -0,0 +1,48 @@
+# textdomain: building_blocks
+
+
+### alias.lua ###
+
+Granite=Granito
+
+### node_stairs.lua ###
+
+Adobe=Argila
+Adobe Slab=Placa de argila
+Adobe Stair=Escada de Argila
+Brobble Spread=Calçado
+Chess board tiling=Revestimento de xadrez
+Fake Grass=Grama Falsa
+Fake Grass Slab=
+Fake Grass Stair=
+Fireplace=Lareira
+Grate=Grelha
+Grate Slab=Placa de Grelha
+Grate Stair=Escade de Grelha
+Gravel Spread=Espalhamento de Cascalho
+Hardwood=Madeira
+Hardwood Slab=Placa de madeira
+Hardwood Stair=Escada de madeira
+Marble=Mármore
+Marble Slab=Placa de Mármore
+Marble Stair=Escada de mármore
+Roof block=Bloco de telhado
+Roof block Slab=
+Roof block Stair=
+Streak Free Glass=Vidro Sem Riscos
+Streak Free Glass Slab=
+Streak Free Glass Stair=
+Tar=Alcatrão
+Tar Slab=Placa de alcatrão
+Tar Stair=Escada de alcatrão
+Tarmac Spread=Espalhamento das Estradas
+Terrycloth towel=Toalha de Roupinha
+Wood Framed Glass=Vidro com Bordas de Madeira
+Wood Framed Glass Slab=
+Wood Framed Glass Stair=
+
+### others.lua ###
+
+Small bundle of sticks=Pequeno amontoado de gravetos
+Tar Knife=Faca de Alcatrão
+Tar base=Base para alcatrão

building_blocks/locale/building_blocks.pt_BR.tr

@@ -0,0 +1,48 @@
+# textdomain: building_blocks
+
+
+### alias.lua ###
+
+Granite=Granito
+
+### node_stairs.lua ###
+
+Adobe=Argila
+Adobe Slab=Placa de argila
+Adobe Stair=Escada de Argila
+Brobble Spread=Calçado
+Chess board tiling=Revestimento de xadrez
+Fake Grass=Grama Falsa
+Fake Grass Slab=
+Fake Grass Stair=
+Fireplace=Lareira
+Grate=Grelha
+Grate Slab=Placa de Grelha
+Grate Stair=Escade de Grelha
+Gravel Spread=Espalhamento de Cascalho
+Hardwood=Madeira
+Hardwood Slab=Placa de madeira
+Hardwood Stair=Escada de madeira
+Marble=Mármore
+Marble Slab=Placa de Mármore
+Marble Stair=Escada de mármore
+Roof block=Bloco de telhado
+Roof block Slab=
+Roof block Stair=
+Streak Free Glass=Vidro Sem Riscos
+Streak Free Glass Slab=
+Streak Free Glass Stair=
+Tar=Alcatrão
+Tar Slab=Placa de alcatrão
+Tar Stair=Escada de alcatrão
+Tarmac Spread=Espalhamento das Estradas
+Terrycloth towel=Toalha de Roupinha
+Wood Framed Glass=Vidro com Bordas de Madeira
+Wood Framed Glass Slab=
+Wood Framed Glass Stair=
+
+### others.lua ###
+
+Small bundle of sticks=Pequeno amontoado de gravetos
+Tar Knife=Faca de Alcatrão
+Tar base=Base para alcatrão

building_blocks/locale/building_blocks.ru.tr

@@ -0,0 +1,48 @@
+# textdomain: building_blocks
+
+
+### alias.lua ###
+
+Granite=Гранит
+
+### node_stairs.lua ###
+
+Adobe=Саман
+Adobe Slab=Саманная плита
+Adobe Stair=Саманная ступенька
+Brobble Spread=Настил кирпичного булыжника
+Chess board tiling=Шахматная плитка
+Fake Grass=Псевдо трава
+Fake Grass Slab=
+Fake Grass Stair=
+Fireplace=Камин
+Grate=Каминная решётка
+Grate Slab=Решётчатая плита
+Grate Stair=Решётчатая ступенька
+Gravel Spread=Настил гравия
+Hardwood=Твёрдая древесина
+Hardwood Slab=Плита из твёрдой древесины
+Hardwood Stair=Ступенька из твёрдой древесины
+Marble=Мрамор
+Marble Slab=Мраморная блита
+Marble Stair=Мраморная ступенька
+Roof block=Кровельный блок
+Roof block Slab=
+Roof block Stair=
+Streak Free Glass=Стекло без стыков
+Streak Free Glass Slab=
+Streak Free Glass Stair=
+Tar=Смола
+Tar Slab=Плита из смолы
+Tar Stair=Ступенька из смолы
+Tarmac Spread=Покрытие гудронной смолой
+Terrycloth towel=Махровое полотенце
+Wood Framed Glass=Деревянное окно
+Wood Framed Glass Slab=
+Wood Framed Glass Stair=
+
+### others.lua ###
+
+Small bundle of sticks=Небольшая связка палок
+Tar Knife=Смоляной нож
+Tar base=Смоляная основа

building_blocks/locale/building_blocks.zh_CN.tr

@@ -0,0 +1,48 @@
+# textdomain: building_blocks
+
+
+### alias.lua ###
+
+Granite=花岗岩
+
+### node_stairs.lua ###
+
+Adobe=土砖
+Adobe Slab=
+Adobe Stair=
+Brobble Spread=石砖路面
+Chess board tiling=棋盘铺贴
+Fake Grass=塑料草
+Fake Grass Slab=
+Fake Grass Stair=
+Fireplace=壁炉
+Grate=磨碎
+Grate Slab=
+Grate Stair=
+Gravel Spread=碎石路面
+Hardwood=硬木
+Hardwood Slab=
+Hardwood Stair=
+Marble=大理石
+Marble Slab=
+Marble Stair=
+Roof block=天台
+Roof block Slab=
+Roof block Stair=
+Streak Free Glass=无条纹玻璃
+Streak Free Glass Slab=
+Streak Free Glass Stair=
+Tar=焦油
+Tar Slab=
+Tar Stair=
+Tarmac Spread=柏油路面
+Terrycloth towel=毛巾
+Wood Framed Glass=木框玻璃
+Wood Framed Glass Slab=
+Wood Framed Glass Stair=
+
+### others.lua ###
+
+Small bundle of sticks=小捆棍子
+Tar Knife=焦油刀
+Tar base=焦油基

building_blocks/locale/template.txt

@@ -0,0 +1,48 @@
+# textdomain: building_blocks
+
+
+### alias.lua ###
+
+Granite=
+
+### node_stairs.lua ###
+
+Adobe=
+Adobe Slab=
+Adobe Stair=
+Brobble Spread=
+Chess board tiling=
+Fake Grass=
+Fake Grass Slab=
+Fake Grass Stair=
+Fireplace=
+Grate=
+Grate Slab=
+Grate Stair=
+Gravel Spread=
+Hardwood=
+Hardwood Slab=
+Hardwood Stair=
+Marble=
+Marble Slab=
+Marble Stair=
+Roof block=
+Roof block Slab=
+Roof block Stair=
+Streak Free Glass=
+Streak Free Glass Slab=
+Streak Free Glass Stair=
+Tar=
+Tar Slab=
+Tar Stair=
+Tarmac Spread=
+Terrycloth towel=
+Wood Framed Glass=
+Wood Framed Glass Slab=
+Wood Framed Glass Stair=
+
+### others.lua ###
+
+Small bundle of sticks=
+Tar Knife=
+Tar base=

building_blocks/mod.conf

@@ -0,0 +1,3 @@
+name = building_blocks
+depends = default
+optional_depends = moreblocks, gloopblocks, stairs

building_blocks/node_stairs.lua

@@ -1,4 +1,4 @@
-local S = homedecor.gettext
+local S = minetest.get_translator("building_blocks")
 
 local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"}
 
@@ -29,9 +29,11 @@ local function building_blocks_stairs(nodename, def)
 			stairs.register_stair_and_slab(name,nodename,
 				stairs_groups,
 				def.tiles,
-				("%s Stair"):format(def.description),
-				("%s Slab"):format(def.description),
+				def.stair_desc,
+				def.slab_desc,
 				def.sounds
+				--FIXME: Missing descriptions for Inner and Outer stairs
+				-- See https://github.com/minetest/minetest_game/pull/2584
 			)
 		end
 	end
@@ -40,6 +42,8 @@ end
 building_blocks_stairs("building_blocks:grate", {
 	drawtype = "glasslike",
 	description = S("Grate"),
+	stair_desc = S("Grate Stair"),
+	slab = S("Grate Slab"),
 	tiles = {"building_blocks_grate.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
@@ -50,6 +54,8 @@ building_blocks_stairs("building_blocks:grate", {
 building_blocks_stairs("building_blocks:smoothglass", {
 	drawtype = "glasslike",
 	description = S("Streak Free Glass"),
+	stair_desc = S("Streak Free Glass Stair"),
+	slab_desc = S("Streak Free Glass Slab"),
 	tiles = {"building_blocks_sglass.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
@@ -60,6 +66,8 @@ building_blocks_stairs("building_blocks:smoothglass", {
 building_blocks_stairs("building_blocks:woodglass", {
 	drawtype = "glasslike",
 	description = S("Wood Framed Glass"),
+	stair_desc = S("Wood Framed Glass Stair"),
+	slab_desc = S("Wood Framed Glass Slab"),
 	tiles = {"building_blocks_wglass.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
@@ -71,6 +79,8 @@ building_blocks_stairs("building_blocks:woodglass", {
 building_blocks_stairs("building_blocks:Adobe", {
 	tiles = {"building_blocks_Adobe.png"},
 	description = S("Adobe"),
+	stair_desc = S("Adobe Stair"),
+	slab_desc = S("Adobe Slab"),
 	is_ground_content = true,
 	groups = {crumbly=3},
 	sounds = default.node_sound_stone_defaults(),
@@ -78,6 +88,8 @@ building_blocks_stairs("building_blocks:Adobe", {
 building_blocks_stairs("building_blocks:fakegrass", {
 	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
 	description = S("Fake Grass"),
+	stair_desc = S("Fake Grass Stair"),
+	slab_desc = S("Fake Grass Slab"),
 	is_ground_content = true,
 	groups = {crumbly=3},
 	sounds = default.node_sound_dirt_defaults({
@@ -88,6 +100,8 @@ building_blocks_stairs("building_blocks:hardwood", {
 	tiles = {"building_blocks_hardwood.png"},
 	is_ground_content = true,
 	description = S("Hardwood"),
+	stair_desc = S("Hardwood Stair"),
+	slab_desc = S("Hardwood Slab"),
 	groups = {choppy=1,flammable=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -95,11 +109,15 @@ building_blocks_stairs("building_blocks:Roofing", {
 	tiles = {"building_blocks_Roofing.png"},
 	is_ground_content = true,
 	description = S("Roof block"),
+	stair_desc = S("Roof block Stair"),
+	slab_desc = S("Roof block Slab"),
 	groups = {snappy=3},
 	sounds = default.node_sound_stone_defaults(),
 })
 building_blocks_stairs("building_blocks:Tar", {
 	description = S("Tar"),
+	stair_desc = S("Tar Stair"),
+	slab_desc = S("Tar Slab"),
 	tiles = {"building_blocks_tar.png"},
 	is_ground_content = true,
 	groups = {crumbly=1, tar_block = 1},
@@ -107,6 +125,8 @@ building_blocks_stairs("building_blocks:Tar", {
 })
 building_blocks_stairs("building_blocks:Marble", {
 	description = S("Marble"),
+	stair_desc = S("Marble Stair"),
+	slab_desc = S("Marble Slab"),
 	tiles = {"building_blocks_marble.png"},
 	is_ground_content = true,
 	groups = {cracky=3, marble = 1},

building_blocks/others.lua

@@ -1,4 +1,4 @@
-local S = homedecor.gettext
+local S = minetest.get_translator("building_blocks")
 
 minetest.register_craftitem("building_blocks:sticks", {
 	description = S("Small bundle of sticks"),

building_blocks/recipes.lua

@@ -1,5 +1,3 @@
-local S = homedecor.gettext
-
 if minetest.get_modpath("moreblocks") then
 	minetest.register_craft({
 		output = 'building_blocks:sticks 2',
@@ -43,7 +41,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'building_blocks:fakegrass 2',
 	recipe = {
-		{'default:leaves'},
+		{'group:leaves'},
 		{"default:dirt"},
 	}
 })
@@ -141,7 +139,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'building_blocks:woodglass 1',
 	recipe = {
-		{"default:wood"},
+		{"group:wood"},
 		{"default:glass"},
 	}
 })

computer/.luacheckrc

@@ -0,0 +1,21 @@
+unused_args = false
+allow_defined_top = true
+max_comment_line_length = 999
+
+read_globals = {
+	"DIR_DELIM",
+	"minetest", "core",
+	"unpack",
+	"dump",
+	table = { fields = { "copy", "getn" } },
+	"vector", "nodeupdate",
+	"VoxelManip", "VoxelArea",
+	"PseudoRandom", "ItemStack",
+	"default",
+	"unifieddyes",
+	"screwdriver",
+}
+
+globals = {
+}
+

computer/computers.lua

@@ -1,9 +1,8 @@
-
-local S = homedecor.gettext
+local S = minetest.get_translator("computer")
 
 -- Amiga 500 lookalike
 computer.register("computer:shefriendSOO", {
-	description = "SheFriendSOO",
+	description = S("SheFriendSOO"),
 	tiles_off = { front=true },
 	node_box = computer.pixelnodebox(32, {
 		-- X   Y   Z   W   H   L
@@ -17,7 +16,7 @@ computer.register("computer:shefriendSOO", {
 minetest.register_node("computer:vanio", {
 	drawtype = "mesh",
 	mesh = "computer_laptop.obj",
-	description = "Pony Vanio",
+	description = S("Pony Vanio"),
 	inventory_image = "computer_laptop_inv.png",
 	tiles = {"computer_laptop.png"},
 	paramtype = "light",
@@ -58,7 +57,7 @@ minetest.register_node("computer:vanio_off", {
 
 -- Sony PlayStation lookalike
 computer.register("computer:slaystation", {
-	description = "Pony SlayStation",
+	description = S("Pony SlayStation"),
 	inventory_image = "computer_ps1_inv.png",
 	tiles_off = { top=true },
 	node_box = computer.pixelnodebox(32, {
@@ -75,7 +74,7 @@ computer.register("computer:slaystation", {
 
 -- Sony PlayStation 2 lookalike
 computer.register("computer:slaystation2", {
-	description = "Pony SlayStation 2",
+	description = S("Pony SlayStation 2"),
 	inventory_image = "computer_ps2_inv.png",
 	tiles_off = { front=true },
 	node_box = computer.pixelnodebox(32, {
@@ -93,7 +92,7 @@ computer.register("computer:slaystation2", {
 
 -- Sinclair ZX Spectrum lookalike
 computer.register("computer:specter", {
-	description = "SX Specter",
+	description = S("SX Specter"),
 	inventory_image = "computer_specter_inv.png",
 	tiles_off = { },
 	node_box = computer.pixelnodebox(32, {
@@ -105,7 +104,7 @@ computer.register("computer:specter", {
 
 -- Nintendo Wii lookalike
 computer.register("computer:wee", {
-	description = "Nientiendo Wee",
+	description = S("Nientiendo Wee"),
 	inventory_image = "computer_wii_inv.png",
 	tiles_off = { front=true },
 	node_box = computer.pixelnodebox(32, {
@@ -117,7 +116,7 @@ computer.register("computer:wee", {
 
 -- Apple iPad lookalike
 minetest.register_node("computer:piepad", {
-	description = "Snapple Piepad",
+	description = S("Snapple Piepad"),
 	drawtype = "signlike",
 	tiles = {"computer_piepad_inv.png"},
 	inventory_image = "computer_piepad_inv.png",
@@ -133,7 +132,7 @@ minetest.register_node("computer:piepad", {
 
 -- Commodore 64 lookalike
 computer.register("computer:admiral64", {
-	description = "Admiral64",
+	description = S("Admiral64"),
 	inventory_image = "computer_ad64_inv.png",
 	tiles_off = { },
 	node_box = computer.pixelnodebox(32, {
@@ -144,7 +143,7 @@ computer.register("computer:admiral64", {
 
 -- Commodore 128 lookalike
 computer.register("computer:admiral128", {
-	description = "Admiral128",
+	description = S("Admiral128"),
 	inventory_image = "computer_ad128_inv.png",
 	tiles_off = { },
 	node_box = computer.pixelnodebox(32, {
@@ -155,7 +154,7 @@ computer.register("computer:admiral128", {
 
 -- XBox lookalike
 computer.register("computer:hueg_box", {
-	description = "HUEG Box",
+	description = S("HUEG Box"),
 	tiles_off = { },
 	node_box = computer.pixelnodebox(16, {
 		-- X   Y   Z   W   H   L
@@ -217,8 +216,17 @@ minetest.register_alias("computer:monitor_desktop", "computer:monitor")
 minetest.register_node("computer:router", {
 	description = S("WIFI Router"),
 	inventory_image = "computer_router_inv.png",
-	tiles = {"computer_router_t.png","computer_router_bt.png","computer_router_l.png","computer_router_r.png","computer_router_b.png",
-			{name="computer_router_f_animated.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=1.0}},}, --"computer_router_f.png"},
+	tiles = {
+		"computer_router_t.png",
+		"computer_router_bt.png",
+		"computer_router_l.png",
+		"computer_router_r.png",
+		"computer_router_b.png",
+		{
+			name = "computer_router_f_animated.png",
+			animation = {type="vertical_frames", aspect_w=32, aspect_h=32, length=1.0}
+		},
+	}, --"computer_router_f.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
 	walkable = false,
@@ -258,33 +266,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 +0,0 @@
-default
-homedecor_common

computer/init.lua

@@ -1,5 +1,4 @@
 computer = {}
-screwdriver = screwdriver or {}
 
 computer.register = function (name, def)
 	if (name:sub(1, 1) == ":") then name = name:sub(2) end
@@ -94,6 +93,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/locale/computer.de.tr

@@ -0,0 +1,35 @@
+# textdomain: computer
+
+
+### computers.lua ###
+
+Admiral128=Admiral 128
+Admiral64=Admiral 64
+Computer Tower=Computerturm
+HUEG Box=YBOX
+Monitor and keyboard=Bildschirm und Tastatur
+Nientiendo Wee=Tinnendo iiW
+Not enough vertical space to place a server!=Es gibt nicht genug vertikalen Platz, um einen Server zu platzieren!
+Pony SlayStation=Pony Slaystation
+Pony SlayStation 2=Pony Slaystation 2
+Pony Vanio=Pony Oiva
+Rack Server=Serverschrank
+SX Specter=Z Inspektor
+SheFriendSOO=Freundin S00
+Snapple Piepad=Apfel-Ei-Pat
+WIFI Router=WiFi-Router
+
+### printers.lua ###
+
+3D Printer ("bedflinger")=3D Drucker ("Bettschubser")
+Printer-Scanner Combo=Multifunktionsdrucker
+
+### tetris.lua ###
+
+L=L
+New Game=Neues Spiel
+Next...=Nächster…
+No room for place the Arcade!=Kein Platz, um den Arkadeautomaten zu platzieren!
+R=R
+Score: =Punktzahl: 
+Tetris Arcade=Tetris-Arkadeautomat

computer/locale/computer.es.tr

@@ -0,0 +1,35 @@
+# textdomain: computer
+
+
+### computers.lua ###
+
+Admiral128=
+Admiral64=
+Computer Tower=Torre de ordenador
+HUEG Box=
+Monitor and keyboard=Monitor y teclado
+Nientiendo Wee=
+Not enough vertical space to place a server!=¡No hay suficiente espacio para colocar un servidor!
+Pony SlayStation=
+Pony SlayStation 2=
+Pony Vanio=
+Rack Server=Servidor en rack
+SX Specter=
+SheFriendSOO=
+Snapple Piepad=
+WIFI Router=Enrutador WIFI
+
+### printers.lua ###
+
+3D Printer ("bedflinger")=
+Printer-Scanner Combo=Impresora y escáner combinados
+
+### tetris.lua ###
+
+L=
+New Game=Juego Nuevo
+Next...=
+No room for place the Arcade!=¡No hay lugar para colocar el arcade!
+R=
+Score: =
+Tetris Arcade=Arcade Tetris

computer/locale/computer.fr.tr

@@ -0,0 +1,35 @@
+# textdomain: computer
+
+
+### computers.lua ###
+
+Admiral128=
+Admiral64=
+Computer Tower=Ordinateur (tour)
+HUEG Box=
+Monitor and keyboard=Écran et clavier
+Nientiendo Wee=
+Not enough vertical space to place a server!=Pas assez d'espace vertical pour placer un serveur !
+Pony SlayStation=
+Pony SlayStation 2=
+Pony Vanio=
+Rack Server=Serveur en rack
+SX Specter=
+SheFriendSOO=
+Snapple Piepad=
+WIFI Router=Routeur WiFi
+
+### printers.lua ###
+
+3D Printer ("bedflinger")=
+Printer-Scanner Combo=Imprimante multi-fonction
+
+### tetris.lua ###
+
+L=G
+New Game=Nouveau Jeu
+Next...=Suivant…
+No room for place the Arcade!=Pas assez de place pour placer la borne d'arcade !
+R=D
+Score: =Score : 
+Tetris Arcade=Borne Tetris

computer/locale/computer.it.tr

@@ -0,0 +1,35 @@
+# textdomain: computer
+
+
+### computers.lua ###
+
+Admiral128=
+Admiral64=
+Computer Tower=
+HUEG Box=
+Monitor and keyboard=
+Nientiendo Wee=
+Not enough vertical space to place a server!=Non c'è abbastanza spazio verticale per mettere un frigorifero!
+Pony SlayStation=
+Pony SlayStation 2=
+Pony Vanio=
+Rack Server=
+SX Specter=
+SheFriendSOO=
+Snapple Piepad=
+WIFI Router=
+
+### printers.lua ###
+
+3D Printer ("bedflinger")=
+Printer-Scanner Combo=
+
+### tetris.lua ###
+
+L=
+New Game=
+Next...=
+No room for place the Arcade!=
+R=
+Score: =
+Tetris Arcade=

computer/locale/computer.ms.tr

@@ -0,0 +1,35 @@
+# textdomain: computer
+
+
+### computers.lua ###
+
+Admiral128=
+Admiral64=
+Computer Tower=Sistem Unit
+HUEG Box=
+Monitor and keyboard=Monitor dan Papan Kekunci
+Nientiendo Wee=
+Not enough vertical space to place a server!=Tidak cukup ruang menegak untuk letak rak pelayan!
+Pony SlayStation=
+Pony SlayStation 2=
+Pony Vanio=
+Rack Server=Rak Pelayan
+SX Specter=
+SheFriendSOO=
+Snapple Piepad=
+WIFI Router=Penghala WIFI
+
+### printers.lua ###
+
+3D Printer ("bedflinger")=
+Printer-Scanner Combo=Pencetak Semua Dalam Satu
+
+### tetris.lua ###
+
+L=
+New Game=Main Baru
+Next...=Seterusnya...
+No room for place the Arcade!=Tiada ruang untuk letak Arked!
+R=
+Score: =Markah:
+Tetris Arcade=Arked Tetris

computer/locale/computer.pt.tr

@@ -0,0 +1,35 @@
+# textdomain: computer
+
+
+### computers.lua ###
+
+Admiral128=
+Admiral64=
+Computer Tower=Gabinete do Computador
+HUEG Box=
+Monitor and keyboard=Tela e teclado
+Nientiendo Wee=
+Not enough vertical space to place a server!=Sem espaço vertical suficiente para colocar um servidor.
+Pony SlayStation=
+Pony SlayStation 2=
+Pony Vanio=
+Rack Server=Rack para Servidor
+SX Specter=
+SheFriendSOO=
+Snapple Piepad=
+WIFI Router=Roteador WIFI
+
+### printers.lua ###
+
+3D Printer ("bedflinger")=
+Printer-Scanner Combo=Tudo em Um Impressora-Scaner
+
+### tetris.lua ###
+
+L=
+New Game=Novo Jogo
+Next...=
+No room for place the Arcade!=Sem espaço para colocar o Fliperama!
+R=
+Score: =
+Tetris Arcade=Fliperama Tetris

computer/locale/computer.pt_BR.tr

@@ -0,0 +1,35 @@
+# textdomain: computer
+
+
+### computers.lua ###
+
+Admiral128=
+Admiral64=
+Computer Tower=Gabinete do Computador
+HUEG Box=
+Monitor and keyboard=Tela e teclado
+Nientiendo Wee=
+Not enough vertical space to place a server!=Sem espaço vertical suficiente para colocar um servidor.
+Pony SlayStation=
+Pony SlayStation 2=
+Pony Vanio=
+Rack Server=Rack para Servidor
+SX Specter=
+SheFriendSOO=
+Snapple Piepad=
+WIFI Router=Roteador WIFI
+
+### printers.lua ###
+
+3D Printer ("bedflinger")=
+Printer-Scanner Combo=Tudo em Um Impressora-Scaner
+
+### tetris.lua ###
+
+L=
+New Game=Novo Jogo
+Next...=
+No room for place the Arcade!=Sem espaço para colocar o Fliperama!
+R=
+Score: =
+Tetris Arcade=Fliperama Tetris

computer/locale/computer.ru.tr

@@ -0,0 +1,35 @@
+# textdomain: computer
+
+
+### computers.lua ###
+
+Admiral128=
+Admiral64=
+Computer Tower=Системный блок
+HUEG Box=
+Monitor and keyboard=Монитор и клавиатура
+Nientiendo Wee=
+Not enough vertical space to place a server!=Недостаточно вертикального пространства для размещения сервера!
+Pony SlayStation=
+Pony SlayStation 2=
+Pony Vanio=
+Rack Server=Стоечный сервер
+SX Specter=
+SheFriendSOO=
+Snapple Piepad=
+WIFI Router=WIFI-роутер
+
+### printers.lua ###
+
+3D Printer ("bedflinger")=
+Printer-Scanner Combo=МФУ
+
+### tetris.lua ###
+
+L=
+New Game=Новая игра
+Next...=Далее...
+No room for place the Arcade!=Недостаточно места для размещения игрового автомата!
+R=
+Score: =Счёт: 
+Tetris Arcade=Игровой автомат Тетрис

computer/locale/computer.zh_CN.tr

@@ -0,0 +1,35 @@
+# textdomain: computer
+
+
+### computers.lua ###
+
+Admiral128=
+Admiral64=
+Computer Tower=计算机箱
+HUEG Box=
+Monitor and keyboard=显示器和键盘
+Nientiendo Wee=
+Not enough vertical space to place a server!=高度不足，无法放置服务器！
+Pony SlayStation=
+Pony SlayStation 2=
+Pony Vanio=
+Rack Server=机架式服务器
+SX Specter=
+SheFriendSOO=
+Snapple Piepad=
+WIFI Router=无线路由器
+
+### printers.lua ###
+
+3D Printer ("bedflinger")=
+Printer-Scanner Combo=打印扫描一体机
+
+### tetris.lua ###
+
+L=
+New Game=新游戏
+Next...=下一个。。。
+No room for place the Arcade!=没有地方放游戏机！
+R=
+Score: =分数：
+Tetris Arcade=俄罗斯方块游戏机

computer/locale/template.txt

@@ -0,0 +1,35 @@
+# textdomain: computer
+
+
+### computers.lua ###
+
+Admiral128=
+Admiral64=
+Computer Tower=
+HUEG Box=
+Monitor and keyboard=
+Nientiendo Wee=
+Not enough vertical space to place a server!=
+Pony SlayStation=
+Pony SlayStation 2=
+Pony Vanio=
+Rack Server=
+SX Specter=
+SheFriendSOO=
+Snapple Piepad=
+WIFI Router=
+
+### printers.lua ###
+
+3D Printer ("bedflinger")=
+Printer-Scanner Combo=
+
+### tetris.lua ###
+
+L=
+New Game=
+Next...=
+No room for place the Arcade!=
+R=
+Score: =
+Tetris Arcade=

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/mod.conf

@@ -0,0 +1,3 @@
+name = computer
+depends = default, basic_materials, unifieddyes
+optional_depends = screwdriver

computer/printers.lua

@@ -0,0 +1,61 @@
+-- Printers of some kind or another
+
+local S = minetest.get_translator("computer")
+
+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/recipes.lua

@@ -134,8 +134,8 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "computer:tetris_arcade",
 	recipe = {
-		{ "basic_materials:plastic_sheet", "basic_materials:energy_crystal", "basic_materials:plastic_sheet", },
+		{ "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet", },
 		{ "dye:black", "default:glass", "dye:black" },
-		{ "basic_materials:plastic_sheet", "basic_materials:energy_crystal", "basic_materials:plastic_sheet" }
+		{ "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" }
 	}
 })

computer/tetris.lua

@@ -1,5 +1,4 @@
-
-local S = homedecor.gettext
+local S = minetest.get_translator("computer")
 
 local shapes = {
    {  { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } },
@@ -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
 
@@ -251,7 +250,7 @@ minetest.register_node("computer:tetris_arcade", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=3},
-	on_rotate = screwdriver.rotate_simple,
+	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil,
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, 1.5, 0.5}

fake_fire/.luacheckrc

@@ -0,0 +1,19 @@
+unused_args = false
+allow_defined_top = true
+max_comment_line_length = 999
+
+read_globals = {
+	"DIR_DELIM",
+	"minetest", "core",
+	"unpack",
+	"dump",
+	table = { fields = { "copy", "getn" } },
+	"vector", "nodeupdate",
+	"VoxelManip", "VoxelArea",
+	"PseudoRandom", "ItemStack",
+	"default",
+}
+
+globals = {
+}
+

fake_fire/depends.txt

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

fake_fire/init.lua

@@ -1,9 +1,79 @@
+local S = minetest.get_translator("fake_fire")
 
-local S = homedecor.gettext
+local function fire_particles_on(pos) -- 3 layers of fire
+	local meta = minetest.get_meta(pos)
+	local id1 = 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", id1)
 
-screwdriver = screwdriver or {}
+	local id2 = 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", id2)
 
-local function start_smoke(pos, node, clicker, chimney)
+	local id3 = 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", id3)
+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 +111,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 +153,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 +167,53 @@ 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)
+		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 +249,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 +290,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.")

fake_fire/locale/fake_fire.de.tr

@@ -0,0 +1,10 @@
+# textdomain: fake_fire
+
+
+### init.lua ###
+
+Fancy Fire=Schönes Feuer
+Glowing Embers=Glühende Asche
+Ice fire=Eisfeuer
+Sandstone chimney top=Sandsteinschornsteinaufsatz
+Stone chimney top=Steinschornsteinaufsatz

fake_fire/locale/fake_fire.es.tr

@@ -0,0 +1,10 @@
+# textdomain: fake_fire
+
+
+### init.lua ###
+
+Fancy Fire=Fuego fantasía
+Glowing Embers=Brasas ardientes
+Ice fire=Fuego de hielo
+Sandstone chimney top=Chimenea de arenisca
+Stone chimney top=Chimenea de piedra

fake_fire/locale/fake_fire.fr.tr

@@ -0,0 +1,10 @@
+# textdomain: fake_fire
+
+
+### init.lua ###
+
+Fancy Fire=Feu décoratif
+Glowing Embers=Braises incandescentes
+Ice fire=Feu glacé
+Sandstone chimney top=Haut de cheminée en grès
+Stone chimney top=Haut de cheminée en pierre

fake_fire/locale/fake_fire.ms.tr

@@ -0,0 +1,10 @@
+# textdomain: fake_fire
+
+
+### init.lua ###
+
+Fancy Fire=Api Hiasan
+Glowing Embers=Bara Api
+Ice fire=Api Ais
+Sandstone chimney top=Kepala Serombong Batu Pasir
+Stone chimney top=Kepala Serombong Batu

fake_fire/locale/fake_fire.pt.tr

@@ -0,0 +1,10 @@
+# textdomain: fake_fire
+
+
+### init.lua ###
+
+Fancy Fire=Fogo Chique
+Glowing Embers=Brasas Brilhantes
+Ice fire=Fogo de gelo
+Sandstone chimney top=Topo de chaminé de arenito
+Stone chimney top=Topo de chaminé de pedra

fake_fire/locale/fake_fire.pt_BR.tr

@@ -0,0 +1,10 @@
+# textdomain: fake_fire
+
+
+### init.lua ###
+
+Fancy Fire=Fogo Chique
+Glowing Embers=Brasas Brilhantes
+Ice fire=Fogo de gelo
+Sandstone chimney top=Topo de chaminé de arenito
+Stone chimney top=Topo de chaminé de pedra

fake_fire/locale/fake_fire.ru.tr

@@ -0,0 +1,10 @@
+# textdomain: fake_fire
+
+
+### init.lua ###
+
+Fancy Fire=Необычный огонь
+Glowing Embers=Светящиеся угли
+Ice fire=Ледяной огонь
+Sandstone chimney top=Дымоход из песчаника на крышу
+Stone chimney top=Каменный дымоход на крышу

fake_fire/locale/fake_fire.zh_CN.tr

@@ -0,0 +1,10 @@
+# textdomain: fake_fire
+
+
+### init.lua ###
+
+Fancy Fire=花式火
+Glowing Embers=发光的余烬
+Ice fire=冰火
+Sandstone chimney top=砂石烟囱顶部
+Stone chimney top=鹅卵石烟囱顶部

fake_fire/locale/template.txt

@@ -0,0 +1,10 @@
+# textdomain: fake_fire
+
+
+### init.lua ###
+
+Fancy Fire=
+Glowing Embers=
+Ice fire=
+Sandstone chimney top=
+Stone chimney top=

fake_fire/mod.conf

@@ -0,0 +1,2 @@
+name = fake_fire
+depends = default

homedecor_3d_extras/.luacheckrc

@@ -0,0 +1,18 @@
+unused_args = false
+allow_defined_top = true
+max_comment_line_length = 999
+
+read_globals = {
+	"DIR_DELIM",
+	"minetest", "core",
+	"unpack",
+	"dump",
+	table = { fields = { "copy", "getn" } },
+	"vector", "nodeupdate",
+	"VoxelManip", "VoxelArea",
+	"PseudoRandom", "ItemStack",
+}
+
+globals = {
+}
+

homedecor_3d_extras/depends.txt

@@ -1,4 +0,0 @@
-default
-vessels?
-moreblocks?
-doors?

homedecor_3d_extras/init.lua

@@ -89,28 +89,19 @@ end
 -- 3d-ify default mtg wood and steel doors and trap doors
 
 if minetest.get_modpath("doors") then
-	local function clone_node(name)
-		local node2 = {}
-		local node = minetest.registered_nodes[name]
-		for k,v in pairs(node) do
-			node2[k]=v
-		end
-		return node2
-	end
-
 	local def
 	for _,mat in ipairs({"wood", "steel"}) do
-		def = clone_node("doors:door_"..mat.."_a")
+		def = table.copy(minetest.registered_nodes["doors:door_"..mat.."_a"])
 			def.mesh = "homedecor_3d_door_"..mat.."_a.obj"
 			minetest.register_node(":doors:door_"..mat.."_a", def)
 
-		def = clone_node("doors:door_"..mat.."_b")
+		def = table.copy(minetest.registered_nodes["doors:door_"..mat.."_b"])
 			def.mesh = "homedecor_3d_door_"..mat.."_b.obj"
 			minetest.register_node(":doors:door_"..mat.."_b", def)
 	end
 
 	for _,mat in ipairs({"", "_steel"}) do
-		def = clone_node("doors:trapdoor"..mat)
+		def = table.copy(minetest.registered_nodes["doors:trapdoor"..mat])
 			def.drawtype = "mesh"
 			def.mesh = "homedecor_3d_trapdoor"..mat..".obj"
 			def.tiles = {
@@ -119,7 +110,7 @@ if minetest.get_modpath("doors") then
 			}
 			minetest.register_node(":doors:trapdoor"..mat, def)
 
-		def = clone_node("doors:trapdoor"..mat.."_open")
+		def = table.copy(minetest.registered_nodes["doors:trapdoor"..mat.."_open"])
 			def.mesh = "homedecor_3d_trapdoor"..mat.."_open.obj"
 			def.drawtype = "mesh"
 			def.tiles = {
@@ -130,3 +121,6 @@ if minetest.get_modpath("doors") then
 	end
 
 end
+
+minetest.log("action", "[homedecor_3d_extra] loaded.")
+

homedecor_3d_extras/mod.conf

@@ -0,0 +1,4 @@
+name = homedecor_3d_extras
+description = Homedecor Mod: 3d extras
+depends = default
+optional_depends = vessels, moreblocks, doors

homedecor_bathroom/.luacheckrc

@@ -0,0 +1,22 @@
+unused_args = false
+allow_defined_top = true
+max_comment_line_length = 999
+
+read_globals = {
+	"DIR_DELIM",
+	"minetest", "core",
+	"unpack",
+	"dump",
+	table = { fields = { "copy", "getn" } },
+	"vector", "nodeupdate",
+	"VoxelManip", "VoxelArea",
+	"PseudoRandom", "ItemStack",
+	"default",
+	"homedecor",
+	"screwdriver",
+	"unifieddyes",
+}
+
+globals = {
+}
+

homedecor_bathroom/depends.txt

@@ -1,7 +0,0 @@
-homedecor_common
-default
-basic_materials
-unifieddyes
-building_blocks
-bucket?
-homedecor_fences?

homedecor_bathroom/init.lua

@@ -1,5 +1,6 @@
+local S = minetest.get_translator("homedecor_bathroom")
 
-local S = homedecor.gettext
+local sc_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil
 
 minetest.register_node(":homedecor:bathroom_tiles_dark", {
 	description = S("Bathroom/kitchen tiles (dark)"),
@@ -15,6 +16,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 +33,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 +50,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 = {
@@ -271,7 +275,7 @@ homedecor.register("taps", {
 	sounds = default.node_sound_stone_defaults(),
 	on_rightclick = taps_on_rightclick,
 	on_destruct = homedecor.stop_particle_spawner,
-	on_rotate = screwdriver.disallow
+	on_rotate = sc_disallow or nil
 })
 
 homedecor.register("taps_brass", {
@@ -294,7 +298,7 @@ homedecor.register("taps_brass", {
 	sounds = default.node_sound_stone_defaults(),
 	on_rightclick = taps_on_rightclick,
 	on_destruct = homedecor.stop_particle_spawner,
-	on_rotate = screwdriver.disallow
+	on_rotate = sc_disallow or nil,
 })
 
 --Shower Tray
@@ -344,7 +348,7 @@ homedecor.register("shower_head", {
 	groups = {snappy=3},
 	selection_box = sh_cbox,
 	walkable = false,
-	on_rotate = screwdriver.disallow,
+	on_rotate = sc_disallow or nil,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-2.0, z=pos.z})
 		if below and (
@@ -466,7 +470,7 @@ minetest.register_alias("table_lamp", "homedecor:table_lamp_off")
 
 -- convert old static nodes
 
-homedecor.old_static_bathroom_tiles = {
+local old_static_bathroom_tiles = {
 	"homedecor:tiles_1",
 	"homedecor:tiles_2",
 	"homedecor:tiles_3",
@@ -489,7 +493,7 @@ minetest.register_lbm({
 	name = ":homedecor:convert_bathroom_tiles",
 	label = "Convert bathroom tiles to use param2 color",
 	run_at_every_load = false,
-	nodenames = homedecor.old_static_bathroom_tiles,
+	nodenames = old_static_bathroom_tiles,
 	action = function(pos, node)
 		local name = node.name
 		local newname = "homedecor:bathroom_tiles_light"

homedecor_bathroom/locale/homedecor_bathroom.de.tr

@@ -0,0 +1,20 @@
+# textdomain: homedecor_bathroom
+
+
+### init.lua ###
+
+Bathroom Sink=Badezimmerwaschbecken
+Bathroom sundries set=Badezimmerkrimskrams
+Bathroom taps/faucet=Badezimmerwasserhahn
+Bathroom taps/faucet (brass)=Badezimmerwasserhahn (Messing)
+Bathroom/kitchen tiles (dark)=Badezimmer-/Küchenkacheln (dunkel)
+Bathroom/kitchen tiles (light)=Badezimmer-/Küchenkacheln (hell)
+Bathroom/kitchen tiles (medium)=Badezimmer-/Küchenkacheln (mittel)
+Bathtub, clawfoot, with brass taps=Badewanne, Krallenfuß, mit Messingwasserhähnen
+Bathtub, clawfoot, with chrome taps=Badewanne, Krallenfuß, mit Chromwasserhähnen
+Medicine cabinet=Medizinschrank
+Shower Head=Duschbrause
+Shower Tray=Duschtasse
+Toilet=Toilette
+Toilet paper=Toilettenpapier
+Towel rod with towel=Handtuchhalter mit Handtuch

homedecor_bathroom/locale/homedecor_bathroom.es.tr

@@ -0,0 +1,20 @@
+# textdomain: homedecor_bathroom
+
+
+### init.lua ###
+
+Bathroom Sink=Lavabo de baño
+Bathroom sundries set=Artículos de baño
+Bathroom taps/faucet=Grifo de baño
+Bathroom taps/faucet (brass)=Grifo de baño (latón)
+Bathroom/kitchen tiles (dark)=Azulejo de baño/cocina (tonos oscuros)
+Bathroom/kitchen tiles (light)=Azulejo de baño/cocina (tonos claros)
+Bathroom/kitchen tiles (medium)=Azulejo de baño/cocina (tonos medios)
+Bathtub, clawfoot, with brass taps=
+Bathtub, clawfoot, with chrome taps=
+Medicine cabinet=Gabinete de medicinas
+Shower Head=Ducha
+Shower Tray=Plato de ducha
+Toilet=Inodoro
+Toilet paper=Papel higiénico
+Towel rod with towel=Toallero con toalla

homedecor_bathroom/locale/homedecor_bathroom.fr.tr

@@ -0,0 +1,20 @@
+# textdomain: homedecor_bathroom
+
+
+### init.lua ###
+
+Bathroom Sink=Évier
+Bathroom sundries set=Miroir et tablette de salle de bain
+Bathroom taps/faucet=Robinetterie
+Bathroom taps/faucet (brass)=Robinetterie (laiton)
+Bathroom/kitchen tiles (dark)=Carreaux de salle de bain ou cuisine (foncées)
+Bathroom/kitchen tiles (light)=Carreaux de salle de bain ou cuisine (claires)
+Bathroom/kitchen tiles (medium)=Carreaux de salle de bain ou cuisine (moyennes)
+Bathtub, clawfoot, with brass taps=Baignoire sur pieds, avec robinetterie en laiton
+Bathtub, clawfoot, with chrome taps=Baignoire sur pieds, avec robinetterie en chrome
+Medicine cabinet=Armoire à pharmacie
+Shower Head=Pomme de douche
+Shower Tray=Bac de douche
+Toilet=Toilettes
+Toilet paper=Papier toilette
+Towel rod with towel=Porte serviette et serviette

homedecor_bathroom/locale/homedecor_bathroom.it.tr

@@ -0,0 +1,20 @@
+# textdomain: homedecor_bathroom
+
+
+### init.lua ###
+
+Bathroom Sink=
+Bathroom sundries set=
+Bathroom taps/faucet=
+Bathroom taps/faucet (brass)=
+Bathroom/kitchen tiles (dark)=
+Bathroom/kitchen tiles (light)=
+Bathroom/kitchen tiles (medium)=
+Bathtub, clawfoot, with brass taps=
+Bathtub, clawfoot, with chrome taps=
+Medicine cabinet=Armadietto sotto il lavandino
+Shower Head=Pigna della doccia
+Shower Tray=Piatto della doccia
+Toilet=Water
+Toilet paper=Water
+Towel rod with towel=

homedecor_bathroom/locale/homedecor_bathroom.ms.tr

@@ -0,0 +1,20 @@
+# textdomain: homedecor_bathroom
+
+
+### init.lua ###
+
+Bathroom Sink=Sinki Bilik Mandi
+Bathroom sundries set=Set Barangan Bilik Mandi
+Bathroom taps/faucet=Kepala Paip Bilik Mandi
+Bathroom taps/faucet (brass)=Kepala Paip Bilik Mandi (Loyang)
+Bathroom/kitchen tiles (dark)=Jubin Dapur/Bilik Mandi (Gelap)
+Bathroom/kitchen tiles (light)=Jubin Dapur/Bilik Mandi (Cerah)
+Bathroom/kitchen tiles (medium)=Jubin Dapur/Bilik Mandi (Biasa)
+Bathtub, clawfoot, with brass taps=Tab Mandi Berkaki Cakar, dengan Kepala Paip Loyang
+Bathtub, clawfoot, with chrome taps=Tab Mandi Berkaki Cakar, dengan Kepala Paip Krom
+Medicine cabinet=Kabinet Ubat
+Shower Head=Kepala Pancuran
+Shower Tray=Lubang Air Mandi
+Toilet=Tandas
+Toilet paper=Tisu Tandas
+Towel rod with towel=Ampaian Beserta Tuala

homedecor_bathroom/locale/homedecor_bathroom.pt.tr

@@ -0,0 +1,20 @@
+# textdomain: homedecor_bathroom
+
+
+### init.lua ###
+
+Bathroom Sink=Pia de Banheiro
+Bathroom sundries set=Espelho de Banheiro com bancada
+Bathroom taps/faucet=Torneira de Banheiro
+Bathroom taps/faucet (brass)=Torneira de Banheiro (latão)
+Bathroom/kitchen tiles (dark)=Azulejo de Banheiro/Cozinha (escuro)
+Bathroom/kitchen tiles (light)=Azulejo de Banheiro/Cozinha (claro)
+Bathroom/kitchen tiles (medium)=Azulejo de Banheiro/Cozinha (médio)
+Bathtub, clawfoot, with brass taps=
+Bathtub, clawfoot, with chrome taps=
+Medicine cabinet=Armário de remédios
+Shower Head=Chuveiro
+Shower Tray=Ralo do Chuveiro
+Toilet=Vaso Sanitário
+Toilet paper=Papel higiênico 
+Towel rod with towel=Haste de Toalha com Toalha

homedecor_bathroom/locale/homedecor_bathroom.pt_BR.tr

@@ -0,0 +1,20 @@
+# textdomain: homedecor_bathroom
+
+
+### init.lua ###
+
+Bathroom Sink=Pia de Banheiro
+Bathroom sundries set=Espelho de Banheiro com bancada
+Bathroom taps/faucet=Torneira de Banheiro
+Bathroom taps/faucet (brass)=Torneira de Banheiro (latão)
+Bathroom/kitchen tiles (dark)=Azulejo de Banheiro/Cozinha (escuro)
+Bathroom/kitchen tiles (light)=Azulejo de Banheiro/Cozinha (claro)
+Bathroom/kitchen tiles (medium)=Azulejo de Banheiro/Cozinha (médio)
+Bathtub, clawfoot, with brass taps=
+Bathtub, clawfoot, with chrome taps=
+Medicine cabinet=Armário de remédios
+Shower Head=Chuveiro
+Shower Tray=Ralo do Chuveiro
+Toilet=Vaso Sanitário
+Toilet paper=Papel higiênico 
+Towel rod with towel=Haste de Toalha com Toalha

homedecor_bathroom/locale/homedecor_bathroom.ru.tr

@@ -0,0 +1,20 @@
+# textdomain: homedecor_bathroom
+
+
+### init.lua ###
+
+Bathroom Sink=Раковина для ванной комнаты
+Bathroom sundries set=Набор для ванных комнат
+Bathroom taps/faucet=м
+Bathroom taps/faucet (brass)=Краны(смесители) для ванной комнаты (латунь)
+Bathroom/kitchen tiles (dark)=Плитка для ванной/кухни (тёмная)
+Bathroom/kitchen tiles (light)=Плитка для ванной/кухни (светлая)
+Bathroom/kitchen tiles (medium)=Плитка для ванной/кухни (обычная)
+Bathtub, clawfoot, with brass taps=Ванна на острых ножках с латунными кранами
+Bathtub, clawfoot, with chrome taps=Ванна на острых ножках с хромированными кранами
+Medicine cabinet=Медицинский кабинет
+Shower Head=Душевая лейка
+Shower Tray=Душевой поддон
+Toilet=Туалет
+Toilet paper=Туалетная бумага
+Towel rod with towel=Полотенцедержатель с полотенцем

homedecor_bathroom/locale/homedecor_bathroom.zh_CN.tr

@@ -0,0 +1,20 @@
+# textdomain: homedecor_bathroom
+
+
+### init.lua ###
+
+Bathroom Sink=浴室水槽
+Bathroom sundries set=浴室杂物套装
+Bathroom taps/faucet=浴室水龙头
+Bathroom taps/faucet (brass)=黄铜浴室水龙头
+Bathroom/kitchen tiles (dark)=深色浴室/厨房瓷砖
+Bathroom/kitchen tiles (light)=浅色浴室/厨房瓷砖
+Bathroom/kitchen tiles (medium)=浴室/厨房瓷砖
+Bathtub, clawfoot, with brass taps=带黄铜水龙头的浴缸
+Bathtub, clawfoot, with chrome taps=带镀铬水龙头的浴缸
+Medicine cabinet=药柜
+Shower Head=淋浴喷头
+Shower Tray=淋浴盆
+Toilet=卫生间
+Toilet paper=厕纸
+Towel rod with towel=毛巾杆

homedecor_bathroom/locale/template.txt

@@ -0,0 +1,20 @@
+# textdomain: homedecor_bathroom
+
+
+### init.lua ###
+
+Bathroom Sink=
+Bathroom sundries set=
+Bathroom taps/faucet=
+Bathroom taps/faucet (brass)=
+Bathroom/kitchen tiles (dark)=
+Bathroom/kitchen tiles (light)=
+Bathroom/kitchen tiles (medium)=
+Bathtub, clawfoot, with brass taps=
+Bathtub, clawfoot, with chrome taps=
+Medicine cabinet=
+Shower Head=
+Shower Tray=
+Toilet=
+Toilet paper=
+Towel rod with towel=

homedecor_bathroom/mod.conf

@@ -0,0 +1,4 @@
+name = homedecor_bathroom
+description = Homedecor mod: bathroom
+depends = homedecor_common, default, basic_materials, unifieddyes, building_blocks
+optional_depends = bucket, homedecor_fences, screwdriver

homedecor_bedroom/.luacheckrc

@@ -0,0 +1,22 @@
+unused_args = false
+allow_defined_top = true
+max_comment_line_length = 999
+
+read_globals = {
+	"DIR_DELIM",
+	"minetest", "core",
+	"unpack",
+	"dump",
+	table = { fields = { "copy", "getn" } },
+	"vector", "nodeupdate",
+	"VoxelManip", "VoxelArea",
+	"PseudoRandom", "ItemStack",
+	"default",
+	"homedecor",
+	"screwdriver",
+	"unifieddyes",
+}
+
+globals = {
+}
+

homedecor_bedroom/depends.txt

@@ -1,5 +0,0 @@
-homedecor_common
-default
-basic_materials
-unifieddyes
-creative

homedecor_bedroom/init.lua

@@ -1,7 +1,6 @@
+local S = minetest.get_translator("homedecor_bedroom")
 
-local S = homedecor.gettext
-
-local function N_(x) return x end
+local sc_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil
 
 local bed_sbox = {
 	type = "wallmounted",
@@ -31,6 +30,9 @@ local kbed_cbox = {
 	}
 }
 
+
+-- local bed_on_rightclick = minetest.registered_nodes["beds:bed"].on_rightclick
+
 homedecor.register("bed_regular", {
 	mesh = "homedecor_bed_regular.obj",
 	tiles = {
@@ -49,7 +51,7 @@ homedecor.register("bed_regular", {
 	selection_box = bed_sbox,
 	node_box = bed_cbox,
 	sounds = default.node_sound_wood_defaults(),
-	on_rotate = screwdriver.disallow,
+	on_rotate = sc_disallow or nil,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
 		if not placer:get_player_control().sneak then
@@ -59,13 +61,14 @@ 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
 			homedecor.bed_expansion(pos, clicker, itemstack, pointed_thing, true)
 			return itemstack
 --		else
---			homedecor.beds_on_rightclick(pos, node, clicker)
+--			bed_on_rightclick(pos, node, clicker)
 --			return itemstack
 		end
 	end
@@ -88,12 +91,13 @@ homedecor.register("bed_extended", {
 	groups = {snappy=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_wood_defaults(),
 	expand = { forward = "air" },
-	on_rotate = screwdriver.disallow,
+	on_rotate = sc_disallow or nil,
 	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)
+--		bed_on_rightclick(pos, node, clicker)
 --		return itemstack
 --	end,
 	drop = "homedecor:bed_regular"
@@ -117,7 +121,7 @@ homedecor.register("bed_kingsize", {
 	selection_box = kbed_sbox,
 	node_box = kbed_cbox,
 	sounds = default.node_sound_wood_defaults(),
-	on_rotate = screwdriver.disallow,
+	on_rotate = sc_disallow or nil,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
 	end,
@@ -128,15 +132,16 @@ 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)
+--		bed_on_rightclick(pos, node, clicker)
 --		return itemstack
 --	end,
 })
 
-for _, w in pairs({ N_("mahogany"), N_("oak") }) do
+for w, d in pairs({ ["mahogany"] = S("mahogany"), ["oak"] = S("oak") }) do
 	homedecor.register("nightstand_"..w.."_one_drawer", {
-		description = S("Nightstand with One Drawer (@1)", S(w)),
+		description = S("Nightstand with One Drawer (@1)", d),
 		tiles = { 'homedecor_nightstand_'..w..'_tb.png',
 			'homedecor_nightstand_'..w..'_tb.png^[transformFY',
 			'homedecor_nightstand_'..w..'_lr.png^[transformFX',
@@ -165,7 +170,7 @@ for _, w in pairs({ N_("mahogany"), N_("oak") }) do
 	})
 
 	homedecor.register("nightstand_"..w.."_two_drawers", {
-		description = S("Nightstand with Two Drawers (@1)", S(w)),
+		description = S("Nightstand with Two Drawers (@1)", d),
 		tiles = { 'homedecor_nightstand_'..w..'_tb.png',
 			'homedecor_nightstand_'..w..'_tb.png^[transformFY',
 			'homedecor_nightstand_'..w..'_lr.png^[transformFX',
@@ -211,19 +216,19 @@ local bedcolors = {
 	"yellow"
 }
 
-homedecor.old_bed_nodes = {}
+local old_bed_nodes = {}
 
 for _, color in ipairs(bedcolors) do
-	table.insert(homedecor.old_bed_nodes, "homedecor:bed_"..color.."_regular")
-	table.insert(homedecor.old_bed_nodes, "homedecor:bed_"..color.."_extended")
-	table.insert(homedecor.old_bed_nodes, "homedecor:bed_"..color.."_kingsize")
+	table.insert(old_bed_nodes, "homedecor:bed_"..color.."_regular")
+	table.insert(old_bed_nodes, "homedecor:bed_"..color.."_extended")
+	table.insert(old_bed_nodes, "homedecor:bed_"..color.."_kingsize")
 end
 
 minetest.register_lbm({
 	name = ":homedecor:convert_beds",
 	label = "Convert homedecor static bed nodes to use param2 color",
 	run_at_every_load = false,
-	nodenames = homedecor.old_bed_nodes,
+	nodenames = old_bed_nodes,
 	action = function(pos, node)
 		local name = node.name
 		local color = string.sub(name, string.find(name, "_") + 1)

homedecor_bedroom/locale/homedecor_bedroom.de.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_bedroom
+
+
+### init.lua ###
+
+Bed=Bett
+Bed (king sized)=Breites Doppelbett
+Nightstand with One Drawer (@1)=Nachttisch mit einer Schublade (@1)
+Nightstand with Two Drawers (@1)=Nachttisch mit zwei Schubladen (@1)
+One-drawer Nightstand=Nachttisch mit einer Schublade
+Two-drawer Nightstand=Nachttisch mit zwei Schubladen
+mahogany=Mahagoni
+oak=Eiche

homedecor_bedroom/locale/homedecor_bedroom.es.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_bedroom
+
+
+### init.lua ###
+
+Bed=Cama
+Bed (king sized)=Cama (tamaño grande)
+Nightstand with One Drawer (@1)=Mesa de luz con un cajón (@1)
+Nightstand with Two Drawers (@1)=Mesa de luz con dos cajones (@1)
+One-drawer Nightstand=Mesa de luz con un cajón
+Two-drawer Nightstand=Mesa de luz con dos cajones
+mahogany=caoba
+oak=roble

homedecor_bedroom/locale/homedecor_bedroom.fr.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_bedroom
+
+
+### init.lua ###
+
+Bed=Lit
+Bed (king sized)=Grand lit
+Nightstand with One Drawer (@1)=Meuble de chevet avec un tiroir (@1)
+Nightstand with Two Drawers (@1)=Meuble de chevet avec deux tiroirs (@1)
+One-drawer Nightstand=Meuble de chevet avec un tiroir
+Two-drawer Nightstand=Meuble de chevet avec deux tiroirs
+mahogany=acajou
+oak=chêne

homedecor_bedroom/locale/homedecor_bedroom.it.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_bedroom
+
+
+### init.lua ###
+
+Bed=rosso
+Bed (king sized)=
+Nightstand with One Drawer (@1)=Comodino in quercia con un cassetto
+Nightstand with Two Drawers (@1)=Comodino in quercia con due cassetti
+One-drawer Nightstand=Comodino a singolo cassetto
+Two-drawer Nightstand=Comodino a doppio cassetto
+mahogany=
+oak=

homedecor_bedroom/locale/homedecor_bedroom.ms.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_bedroom
+
+
+### init.lua ###
+
+Bed=Katil
+Bed (king sized)=Katil Raja
+Nightstand with One Drawer (@1)=Kabinet Katil dengan Satu Laci (@1)
+Nightstand with Two Drawers (@1)=Kabinet Katil dengan Dua Laci (@1)
+One-drawer Nightstand=Kabinet Katil Satu Laci
+Two-drawer Nightstand=Kabinet Katil Dua Laci
+mahogany=Mahogani
+oak=Oak

homedecor_bedroom/locale/homedecor_bedroom.pt.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_bedroom
+
+
+### init.lua ###
+
+Bed=Cama
+Bed (king sized)=Cama (tamanho king)
+Nightstand with One Drawer (@1)=Mesa de Cabeceira com Gaveta (@1)
+Nightstand with Two Drawers (@1)=Mesa de Cabeceira com Duas Gavetas (@1)
+One-drawer Nightstand=Mesinha de Uma Gaveta
+Two-drawer Nightstand=Mesinha de Duas Gavetas
+mahogany=mogno
+oak=carvalho

homedecor_bedroom/locale/homedecor_bedroom.pt_BR.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_bedroom
+
+
+### init.lua ###
+
+Bed=Cama
+Bed (king sized)=Cama (tamanho king)
+Nightstand with One Drawer (@1)=Mesa de Cabeceira com Gaveta (@1)
+Nightstand with Two Drawers (@1)=Mesa de Cabeceira com Duas Gavetas (@1)
+One-drawer Nightstand=Mesinha de Uma Gaveta
+Two-drawer Nightstand=Mesinha de Duas Gavetas
+mahogany=mogno
+oak=carvalho

homedecor_bedroom/locale/homedecor_bedroom.ru.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_bedroom
+
+
+### init.lua ###
+
+Bed=Кровать
+Bed (king sized)=Кровать (большая)
+Nightstand with One Drawer (@1)=Тумба с одним ящиком (@1)
+Nightstand with Two Drawers (@1)=Тумба с двумя ящиками (@1)
+One-drawer Nightstand=Тумба с одним ящиком
+Two-drawer Nightstand=Тумба с двумя ящиками
+mahogany=красное дерево
+oak=дуб

homedecor_bedroom/locale/homedecor_bedroom.zh_CN.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_bedroom
+
+
+### init.lua ###
+
+Bed=床
+Bed (king sized)=双人床
+Nightstand with One Drawer (@1)=带一个抽屉的床头柜(@1)
+Nightstand with Two Drawers (@1)=带两个抽屉的床头柜(@1)
+One-drawer Nightstand=单抽屉床头柜
+Two-drawer Nightstand=两抽屉床头柜
+mahogany=桃花心木
+oak=橡木

homedecor_bedroom/locale/template.txt

@@ -0,0 +1,13 @@
+# textdomain: homedecor_bedroom
+
+
+### init.lua ###
+
+Bed=
+Bed (king sized)=
+Nightstand with One Drawer (@1)=
+Nightstand with Two Drawers (@1)=
+One-drawer Nightstand=
+Two-drawer Nightstand=
+mahogany=
+oak=

homedecor_bedroom/mod.conf

@@ -0,0 +1,4 @@
+name = homedecor_bedroom
+description = Homedecor mod: bedroom
+depends = homedecor_common, default, basic_materials, unifieddyes, creative, beds
+optional_depends = screwdriver

homedecor_books/.luacheckrc

@@ -0,0 +1,21 @@
+unused_args = false
+allow_defined_top = true
+max_comment_line_length = 999
+
+read_globals = {
+	"DIR_DELIM",
+	"minetest", "core",
+	"unpack",
+	"dump",
+	table = { fields = { "copy", "getn" } },
+	"vector", "nodeupdate",
+	"VoxelManip", "VoxelArea",
+	"PseudoRandom", "ItemStack",
+	"creative",
+	"default",
+	"homedecor",
+}
+
+globals = {
+}
+

homedecor_books/depends.txt

@@ -1,5 +0,0 @@
-homedecor_common
-default
-unifieddyes
-creative
-

homedecor_books/init.lua

@@ -1,16 +1,24 @@
-local S = homedecor.gettext
-
-local function N_(x) return x end
+local S = minetest.get_translator("homedecor_books")
 
 local bookcolors = {
-	{ N_("red"),    0xffd26466 },
-	{ N_("green"),  0xff62aa66 },
-	{ N_("blue"),   0xff8686d7 },
-	{ N_("violet"), 0xff9c65a7 },
-	{ N_("grey"),   0xff757579 },
-	{ N_("brown"),  0xff896958 }
+	{ "red",    0xffd26466 },
+	{ "green",  0xff62aa66 },
+	{ "blue",   0xff8686d7 },
+	{ "violet", 0xff9c65a7 },
+	{ "grey",   0xff757579 },
+	{ "brown",  0xff896958 }
 }
 
+local color_locale = {
+	red = S("red") ,
+	green = S("green"),
+	blue = S("blue"),
+	violet = S("violet"),
+	grey = S("grey"),
+	brown = S("brown"),
+}
+
+
 local BOOK_FORMNAME = "homedecor:book_form"
 
 local player_current_book = { }
@@ -39,7 +47,7 @@ for _, c in ipairs(bookcolors) do
 	end
 
 	homedecor.register("book_"..color, {
-		description = S("Writable Book (@1)", S(color)),
+		description = S("Writable Book (@1)", color_locale[color]),
 		mesh = "homedecor_book.obj",
 		tiles = {
 			{ name = "homedecor_book_cover.png", color = hue },
@@ -153,6 +161,16 @@ for _, c in ipairs(bookcolors) do
 		}
 	})
 
+	-- crafting
+	minetest.register_craft({
+		type = "shapeless",
+		output = "homedecor:book_"..color,
+		recipe = {
+			"dye:"..color,
+			"default:book"
+		},
+	})
+
 end
 
 minetest.register_on_player_receive_fields(function(player, form_name, fields)
@@ -183,29 +201,8 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields)
 	return true
 end)
 
--- crafting
 
 
-local bookcolors = {
-	"red",
-	"green",
-	"blue",
-	"violet",
-	"grey",
-	"brown"
-}
-
-for _, color in ipairs(bookcolors) do
-	minetest.register_craft({
-		type = "shapeless",
-		output = "homedecor:book_"..color,
-		recipe = {
-			"dye:"..color,
-			"default:book"
-		},
-	})
-end
-
 -- aliases
 
 minetest.register_alias("homedecor:book", "homedecor:book_grey")

homedecor_books/locale/homedecor_books.de.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_books
+
+
+### init.lua ###
+
+@1 has written in a book (title: "@2"): "@3" at location @4=@1 hat in ein Buch geschrieben (Titel: „@2”): „@3” am Ort @4
+Writable Book (@1)=Schreibbares Buch (@1)
+blue=blau
+brown=braun
+green=grün
+grey=grau
+red=rot
+violet=violett

homedecor_books/locale/homedecor_books.es.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_books
+
+
+### init.lua ###
+
+@1 has written in a book (title: "@2"): "@3" at location @4=@1 ha escrito en un libro (título: "@2"): "@3" en la ubicación @4
+Writable Book (@1)=Libro (@1)
+blue=azul
+brown=marrón
+green=verde
+grey=gris
+red=roja
+violet=violeta

homedecor_books/locale/homedecor_books.fr.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_books
+
+
+### init.lua ###
+
+@1 has written in a book (title: "@2"): "@3" at location @4=@1 a écrit dans un livre (titre: "@2"): "@3" à l'emplacement @4
+Writable Book (@1)=Livre inscriptible (@1)
+blue=bleu
+brown=marron
+green=vert
+grey=vert
+red=rouge
+violet=violet

homedecor_books/locale/homedecor_books.it.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_books
+
+
+### init.lua ###
+
+@1 has written in a book (title: "@2"): "@3" at location @4=
+Writable Book (@1)=Gambe in ottone del tavolo (@1)
+blue=blu
+brown=
+green=verde
+grey=verde scuro
+red=rosso
+violet=viola

homedecor_books/locale/homedecor_books.ms.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_books
+
+
+### init.lua ###
+
+@1 has written in a book (title: "@2"): "@3" at location @4=@1 telah menulis dalam buku (tajuk: "@2"): "@3" di lokasi @4
+Writable Book (@1)=Buku Boleh Ditulis (@1)
+blue=Biru
+brown=Perang
+green=Hijau
+grey=Kelabu
+red=Merah
+violet=Ungu

homedecor_books/locale/homedecor_books.pt.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_books
+
+
+### init.lua ###
+
+@1 has written in a book (title: "@2"): "@3" at location @4=@1 escreveu um livro (título: "@2"): "@3" na localização @4
+Writable Book (@1)=Livro que pode ser escrito (@1)
+blue=azul
+brown=marrom
+green=verde
+grey=cinza
+red=vermelho
+violet=violeta

homedecor_books/locale/homedecor_books.pt_BR.tr

@@ -0,0 +1,13 @@
+# textdomain: homedecor_books
+
+
+### init.lua ###
+
+@1 has written in a book (title: "@2"): "@3" at location @4=@1 escreveu um livro (título: "@2"): "@3" na localização @4
+Writable Book (@1)=Livro que pode ser escrito (@1)
+blue=azul
+brown=marrom
+green=verde
+grey=cinza
+red=vermelho
+violet=violeta