Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

Fix door recipes

See merge request VanessaE/homedecor_modpack!8

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/init.lua

@@ -97,3 +97,5 @@ dofile(MODPATH.."/computers.lua")
 dofile(MODPATH.."/printers.lua")
 dofile(MODPATH.."/recipes.lua")
 dofile(MODPATH.."/tetris.lua")
+
+minetest.log("action", "[computer] loaded.")

fake_fire/init.lua

@@ -214,3 +214,5 @@ 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")
+
+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_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_doors_and_gates/init.lua

@@ -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_lighting/init.lua

@@ -1895,3 +1895,4 @@ if minetest.get_modpath("darkage") then
 	end
 end
 
+minetest.log("action", "[homedecor_lightning] loaded.")

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.")

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.")

plasmascreen/init.lua

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