Merge branch 'master' into 'master'

Fix digging of locked inventory nodes

Closes #34 and #33

See merge request VanessaE/homedecor_modpack!21

building_blocks/init.lua

@@ -4,6 +4,3 @@ 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

@@ -96,5 +96,3 @@ 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

@@ -309,5 +309,3 @@ minetest.register_lbm({
 		fire_particles_on(pos)
 	end
 })
-
-minetest.log("action", "[fake_fire] loaded.")

homedecor_3d_extras/init.lua

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

homedecor_books/mod.conf

@@ -1,3 +1,4 @@
 name = homedecor_books
 description = Homedecor mod: books
-depends = homedecor_common, default, unifieddyes, creative
+depends = homedecor_common, default, creative
+optional_depends = unifieddyes

homedecor_common/init.lua

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

homedecor_common/inventory.lua

@@ -141,9 +141,9 @@ function homedecor.handle_inventory(name, def, original_def)
 					stack:get_count()
 		end
 
-		local can_dig = def.can_dig
+		local can_dig = def.can_dig or default_can_dig
 		def.can_dig = function(pos, player)
-			return default.can_interact_with_node(player, pos) and (can_dig and (can_dig(pos, player) or true))
+			return default.can_interact_with_node(player, pos) and (can_dig and can_dig(pos, player) == true)
 		end
 
 		def.on_key_use = function(pos, player)

homedecor_exterior/locale/homedecor_exterior.es.tr

@@ -7,14 +7,14 @@ Barbecue=Barbacoa
 Doghouse=Casa de perros
 Garden Lattice (@1)=Enrejado de jardín (@1)
 Garden stone path=Camino de piedra de jardín
-No room in your inventory to add a filled bucket!=
-No room under there to hang a swing.=
+No room in your inventory to add a filled bucket!=No hay espacio en tu inv para el cubo
+No room under there to hang a swing.=No hay espacio para colgar el columpio
 Shrubbery (@1)=Arbustos (@1)
 Shrubbery (large, @1)=Arbustos (@1)
 Tree's swing=Columpio
 Water well=Pozo de agua
 
-You have to point at the bottom side of an overhanging object to place a swing.=
+You have to point at the bottom side of an overhanging object to place a swing.=Debe ser la parte inferior de un objeto para colocar el columpio.
 
 green=verde
 red=roja

homedecor_lighting/init.lua

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

homedecor_seating/init.lua

@@ -82,5 +82,3 @@ 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

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

itemframes/init.lua

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

plasmascreen/init.lua

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