Merge branch 'master' into nalc-1.2

also added optdepend on kitchen stuff (for the recipe)

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.."/miscitems.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

@@ -89,3 +89,5 @@ if minetest.get_modpath("moreblocks") then
 		}
 	})
 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_lighting/init.lua

@@ -126,7 +126,7 @@ minetest.register_node(":homedecor:glowlight_small_cube", {
 })
 
 homedecor.register("plasma_lamp", {
-	description = S("Plasma Lamp"),
+	description = S("Plasma Lamp/Light"),
 	drawtype = "mesh",
 	mesh = "plasma_lamp.obj",
 	tiles = {
@@ -273,7 +273,7 @@ local ol_cbox = {
 }
 
 homedecor.register("oil_lamp", {
-	description = S("Oil lamp (hurricane)"),
+	description = S("Oil lamp/Light (hurricane)"),
 	mesh = "homedecor_oil_lamp.obj",
 	tiles = {
 		"homedecor_generic_metal_brass.png",
@@ -293,7 +293,7 @@ homedecor.register("oil_lamp", {
 })
 
 homedecor.register("oil_lamp_tabletop", {
-	description = S("Oil Lamp (tabletop)"),
+	description = S("Oil Lamp/Light (tabletop)"),
 	mesh = "homedecor_oil_lamp_tabletop.obj",
 	tiles = {"homedecor_oil_lamp_tabletop.png"},
 	inventory_image = "homedecor_oil_lamp_tabletop_inv.png",
@@ -312,7 +312,7 @@ local gl_cbox = {
 minetest.register_alias("homedecor:wall_lantern", "homedecor:ground_lantern")
 
 homedecor.register("ground_lantern", {
-	description = S("Ground Lantern"),
+	description = S("Ground Lantern/Light"),
 	mesh = "homedecor_ground_lantern.obj",
 	tiles = { "homedecor_light.png", "homedecor_generic_metal_wrought_iron.png" },
 	use_texture_alpha = true,
@@ -330,7 +330,7 @@ local hl_cbox = {
 }
 
 homedecor.register("hanging_lantern", {
-	description = S("Hanging Lantern"),
+	description = S("Hanging Lantern/Light"),
 	mesh = "homedecor_hanging_lantern.obj",
 	tiles = { "homedecor_generic_metal_wrought_iron.png", "homedecor_light.png" },
 	use_texture_alpha = true,
@@ -353,7 +353,7 @@ homedecor.register("ceiling_lantern", {
 	tiles = { "homedecor_light.png", "homedecor_generic_metal_wrought_iron.png" },
 	use_texture_alpha = true,
 	inventory_image = "homedecor_ceiling_lantern_inv.png",
-	description = S("Ceiling Lantern"),
+	description = S("Ceiling Lantern/Light"),
 	groups = {snappy=3},
 	light_source = 11,
 	selection_box = cl_cbox,
@@ -367,7 +367,7 @@ if minetest.get_modpath("darkage") then
 	sm_light = default.LIGHT_MAX-5
 else
 	homedecor.register("lattice_lantern_large", {
-		description = S("Lattice lantern (large)"),
+		description = S("Lattice lantern/Light (large)"),
 		tiles = { 'homedecor_lattice_lantern_large.png' },
 		groups = { snappy = 3 },
 		light_source = default.LIGHT_MAX,
@@ -438,7 +438,7 @@ local function reg_lamp(suffix, nxt, light, brightness)
 	local wool_brighten = (light or 0) * 15
 
 	homedecor.register("table_lamp_"..suffix, {
-		description = S("Table Lamp"),
+		description = S("Table Lamp/Light"),
 		mesh = "homedecor_table_lamp.obj",
 		tiles = {
 			"wool_grey.png^[colorize:#ffffff:"..wool_brighten,
@@ -471,7 +471,7 @@ local function reg_lamp(suffix, nxt, light, brightness)
 	})
 
 	homedecor.register("standing_lamp_"..suffix, {
-		description = S("Standing Lamp"),
+		description = S("Standing Lamp/Light"),
 		mesh = "homedecor_standing_lamp.obj",
 		tiles = {
 			"wool_grey.png^[colorize:#ffffff:"..wool_brighten,
@@ -491,6 +491,7 @@ local function reg_lamp(suffix, nxt, light, brightness)
 		selection_box = slamp_cbox,
 		sounds = default.node_sound_wood_defaults(),
 		on_rotate = screwdriver.rotate_simple,
+		drop = "homedecor:standing_lamp_off",
 		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 			node.name = "homedecor:standing_lamp_"..repl[suffix]
 			minetest.set_node(pos, node)
@@ -522,7 +523,7 @@ local dlamp_cbox = {
 }
 
 homedecor.register("desk_lamp", {
-	description = S("Desk Lamp"),
+	description = S("Desk Lamp/Light"),
 	mesh = "homedecor_desk_lamp.obj",
 	tiles = {
 		"homedecor_generic_metal.png",
@@ -538,6 +539,7 @@ homedecor.register("desk_lamp", {
 	node_box = dlamp_cbox,
 	walkable = false,
 	groups = {snappy=3, ud_param2_colorable = 1},
+	drop = "homedecor:desk_lamp",
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
 	end,
@@ -547,7 +549,7 @@ homedecor.register("desk_lamp", {
 -- "kitchen"/"dining room" ceiling lamp
 
 homedecor.register("ceiling_lamp", {
-	description = S("Ceiling Lamp"),
+	description = S("Ceiling Lamp/Light"),
 	mesh = "homedecor_ceiling_lamp.obj",
 	tiles = {
 		"homedecor_generic_metal_brass.png",
@@ -565,7 +567,7 @@ homedecor.register("ceiling_lamp", {
 })
 
 homedecor.register("ceiling_lamp_off", {
-	description = S("Ceiling Lamp (off)"),
+	description = S("Ceiling Lamp/Light (off)"),
 	mesh = "homedecor_ceiling_lamp.obj",
 	tiles = {
 		"homedecor_generic_metal_brass.png",

homedecor_wardrobe/depends.txt

@@ -1,4 +1,5 @@
 homedecor_common
 default
+homedecor_kitchen?
 homedecor_misc?
 skinsdb?

homedecor_wardrobe/init.lua

@@ -1,4 +1,4 @@
-modpath = minetest.get_modpath("homedecor")
+modpath = minetest.get_modpath("homedecor_wardrobe")
 
 screwdriver = screwdriver or {}
 

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

@@ -4,7 +4,7 @@ local S = homedecor.gettext
 lavalamp = {}
 
 minetest.register_node("lavalamp:lavalamp", {
-	description = S("Lava Lamp"),
+	description = S("Lava Lamp/Light"),
 	drawtype = "mesh",
 	mesh = "lavalamp.obj",
 	tiles = {
@@ -46,7 +46,7 @@ minetest.register_node("lavalamp:lavalamp", {
 })
 
 minetest.register_node("lavalamp:lavalamp_off", {
-	description = S("Lava Lamp (off)"),
+	description = S("Lava Lamp/Light (off)"),
 	drawtype = "mesh",
 	mesh = "lavalamp.obj",
 	tiles = {

lrfurn/init.lua

@@ -73,3 +73,5 @@ dofile(minetest.get_modpath("lrfurn").."/sofas.lua")
 dofile(minetest.get_modpath("lrfurn").."/armchairs.lua")
 dofile(minetest.get_modpath("lrfurn").."/coffeetable.lua")
 dofile(minetest.get_modpath("lrfurn").."/endtable.lua")
+
+minetest.log("action", "[lrfurn] loaded.")

plasmascreen/init.lua

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