Merge branch 'master' into nalc-1.2

L'auteur du mod a oublié de définir la variable drop des objets
concernés :
- homedecor:glowlight_half,
- homedecor:glowlight_quarter,
- homedecor:glowlight_small_cube,
- homedecor:standing_lamp_off,
- homedecor:desk_lamp.

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

chains/init.lua

@@ -0,0 +1,181 @@
+
+local S = homedecor_i18n.gettext
+
+local chains_sbox = {
+	type = "fixed",
+	fixed = { -0.1, -0.5, -0.1, 0.1, 0.5, 0.1 }
+}
+
+local topchains_sbox = {
+	type = "fixed",
+	fixed = {
+		{ -0.25, 0.35, -0.25, 0.25, 0.5, 0.25 },
+		{ -0.1, -0.5, -0.1, 0.1, 0.4, 0.1 }
+	}
+}
+
+minetest.register_node("chains:chain", {
+	description = S("Hanging chain (wrought iron)"),
+	drawtype = "mesh",
+	mesh = "chains.obj",
+	tiles = {"chains_wrought_iron.png"},
+	walkable = false,
+	climbable = true,
+	sunlight_propagates = true,
+	paramtype = "light",
+	inventory_image = "chain_wrought_iron_inv.png",
+	groups = {cracky=3},
+	selection_box = chains_sbox,
+})
+
+minetest.register_node("chains:chain_brass", {
+	description = S("Hanging chain (brass)"),
+	drawtype = "mesh",
+	mesh = "chains.obj",
+	tiles = {"chains_brass.png"},
+	walkable = false,
+	climbable = true,
+	sunlight_propagates = true,
+	paramtype = "light",
+	inventory_image = "chain_brass_inv.png",
+	groups = {cracky=3},
+	selection_box = chains_sbox,
+})
+
+minetest.register_node("chains:chain_top", {
+	description = S("Hanging chain (ceiling mount, wrought iron)"),
+	drawtype = "mesh",
+	mesh = "top_chains.obj",
+	tiles = {"chains_wrought_iron.png"},
+	walkable = false,
+	climbable = true,
+	sunlight_propagates = true,
+	paramtype = "light",
+	inventory_image = "top_chain_wrought_iron_inv.png",
+	groups = {cracky=3},
+	selection_box = topchains_sbox,
+})
+
+minetest.register_node("chains:chain_top_brass", {
+	description = S("Hanging chain (ceiling mount, brass)"),
+	drawtype = "mesh",
+	mesh = "top_chains.obj",
+	tiles = {"chains_brass.png"},
+	walkable = false,
+	climbable = true,
+	sunlight_propagates = true,
+	paramtype = "light",
+	inventory_image = "top_chain_brass_inv.png",
+	groups = {cracky=3},
+	selection_box = topchains_sbox,
+})
+
+minetest.register_node("chains:chandelier", {
+	description = S("Chandelier (wrought iron)"),
+	paramtype = "light",
+	light_source = 12,
+	walkable = false,
+	climbable = true,
+	sunlight_propagates = true,
+	tiles = {
+		"chains_wrought_iron.png",
+		"chains_candle.png",
+		{
+			name="chains_candle_flame.png",
+			animation={
+				type="vertical_frames",
+				aspect_w=16,
+				aspect_h=16,
+				length=3.0
+			}
+		}
+	},
+	drawtype = "mesh",
+	mesh = "chains_chandelier.obj",
+	groups = {cracky=3},
+	sounds =  default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("chains:chandelier_brass", {
+	description = S("Chandelier (brass)"),
+	paramtype = "light",
+	light_source = 12,
+	walkable = false,
+	climbable = true,
+	sunlight_propagates = true,
+	tiles = {
+		"chains_brass.png",
+		"chains_candle.png",
+		{
+			name="chains_candle_flame.png",
+			animation={
+				type="vertical_frames",
+				aspect_w=16,
+				aspect_h=16,
+				length=3.0
+			}
+		}
+	},
+	drawtype = "mesh",
+	mesh = "chains_chandelier.obj",
+	groups = {cracky=3},
+	sounds =  default.node_sound_stone_defaults(),
+})
+
+-- crafts
+
+minetest.register_craft({
+	output = 'chains:chain 2',
+	recipe = {
+		{'glooptest:chainlink'},
+		{'glooptest:chainlink'},
+		{'glooptest:chainlink'},
+	}
+})
+
+minetest.register_craft({
+	output = 'chains:chain_top',
+	recipe = {
+		{'default:steel_ingot'},
+		{'glooptest:chainlink'},
+	},
+})
+
+minetest.register_craft({
+	output = 'chains:chandelier',
+	recipe = {
+		{'', 'glooptest:chainlink', ''},
+		{'default:torch', 'glooptest:chainlink', 'default:torch'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+	}
+})
+
+-- brass versions
+
+minetest.register_craft({
+	output = 'chains:chain_brass 2',
+	recipe = {
+		{'homedecor:chainlink_brass'},
+		{'homedecor:chainlink_brass'},
+		{'homedecor:chainlink_brass'},
+	}
+})
+
+minetest.register_craft({
+	output = 'chains:chain_top_brass',
+	recipe = {
+		{'technic:brass_ingot'},
+		{'homedecor:chainlink_brass'},
+	},
+})
+
+minetest.register_craft({
+	output = 'chains:chandelier_brass',
+	recipe = {
+		{'', 'homedecor:chainlink_brass', ''},
+		{'default:torch', 'homedecor:chainlink_brass', 'default:torch'},
+		{'technic:brass_ingot', 'technic:brass_ingot', 'technic:brass_ingot'},
+	}
+})
+
+minetest.log("action", "[chains] 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_i18n/init.lua

@@ -0,0 +1,9 @@
+
+-- This file intentionally left blank.
+
+homedecor_i18n = { }
+
+local MP = minetest.get_modpath(minetest.get_current_modname())
+homedecor_i18n.gettext, homedecor_i18n.ngettext = dofile(MP.."/intllib.lua")
+
+minetest.log("action", "[homedecor_i18n] loaded.")

homedecor_lighting/init.lua

@@ -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)
@@ -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,

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

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