Merge remote-tracking branch 'upstream/master'

itemframes/.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",
+	"mesecon",
+	"screwdriver",
+}
+
+globals = {
+}
+

itemframes/depends.txt

@@ -1,3 +0,0 @@
-default
-homedecor_common
-mesecons_mvps?

itemframes/init.lua

@@ -1,8 +1,7 @@
-
-local S = homedecor.gettext
+local S = minetest.get_translator("itemframes")
 
 local tmp = {}
-screwdriver = screwdriver or {}
+local sd_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil
 
 minetest.register_entity("itemframes:item",{
 	hp_max = 1,
@@ -139,7 +138,7 @@ minetest.register_node("itemframes:frame",{
 	groups = {choppy = 2, dig_immediate = 2},
 	legacy_wallmounted = true,
 	sounds = default.node_sound_wood_defaults(),
-	on_rotate = screwdriver.disallow,
+	on_rotate = sd_disallow or nil,
 	after_place_node = function(pos, placer, itemstack)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("owner",placer:get_player_name())
@@ -202,7 +201,7 @@ minetest.register_node("itemframes:pedestal",{
 	paramtype = "light",
 	groups = {cracky = 3},
 	sounds = default.node_sound_stone_defaults(),
-	on_rotate = screwdriver.disallow,
+	on_rotate = sd_disallow or nil,
 	after_place_node = function(pos, placer, itemstack)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("owner",placer:get_player_name())
@@ -252,7 +251,7 @@ minetest.register_lbm({
 	name = "itemframes:maintain_entities",
 	nodenames = {"itemframes:frame", "itemframes:pedestal"},
 	run_at_every_load = true,
-	action = function(pos, node)
+	action = function(pos1, node1)
 		minetest.after(0,
 			function(pos, node)
 				local meta = minetest.get_meta(pos)
@@ -271,7 +270,7 @@ minetest.register_lbm({
 					end
 				end
 			end,
-		pos, node)
+		pos1, node1)
 	end
 })
 

itemframes/locale/itemframes.de.tr

@@ -0,0 +1,9 @@
+# textdomain: itemframes
+
+
+### init.lua ###
+
+Item frame=Ausstellrahmen
+Item frame (owned by @1)=Ausstellrahmen (gehört @1)
+Pedestal=Podest
+Pedestal (owned by @1)=Podest (gehört @1)

itemframes/locale/itemframes.es.tr

@@ -0,0 +1,9 @@
+# textdomain: itemframes
+
+
+### init.lua ###
+
+Item frame=Marco para objetos
+Item frame (owned by @1)=Marco para objetos (propiedad de @1)
+Pedestal=Pedestal
+Pedestal (owned by @1)=Pedestal (propiedad de @1)

itemframes/locale/itemframes.fr.tr

@@ -0,0 +1,9 @@
+# textdomain: itemframes
+
+
+### init.lua ###
+
+Item frame=Cadre
+Item frame (owned by @1)=Cadre (propriété de @1)
+Pedestal=Piédestal
+Pedestal (owned by @1)=Piédestal (propriété de @1)

itemframes/locale/itemframes.it.tr

@@ -0,0 +1,9 @@
+# textdomain: itemframes
+
+
+### init.lua ###
+
+Item frame=
+Item frame (owned by @1)=%s (di proprietà di %s)
+Pedestal=
+Pedestal (owned by @1)=%s (di proprietà di %s)

itemframes/locale/itemframes.ms.tr

@@ -0,0 +1,9 @@
+# textdomain: itemframes
+
+
+### init.lua ###
+
+Item frame=Bingkai Item
+Item frame (owned by @1)=Bingkai Item (hak milik @1)
+Pedestal=Kekaki
+Pedestal (owned by @1)=Kekaki (hak milik @1)

itemframes/locale/itemframes.pt.tr

@@ -0,0 +1,9 @@
+# textdomain: itemframes
+
+
+### init.lua ###
+
+Item frame=Quadro de Item
+Item frame (owned by @1)=Quadro de item (pertence a @l)
+Pedestal=Pedestal
+Pedestal (owned by @1)=Pedestal (pertence a @l)

itemframes/locale/itemframes.pt_BR.tr

@@ -0,0 +1,9 @@
+# textdomain: itemframes
+
+
+### init.lua ###
+
+Item frame=Quadro de Item
+Item frame (owned by @1)=Quadro de item (pertence a @l)
+Pedestal=Pedestal
+Pedestal (owned by @1)=Pedestal (pertence a @l)

itemframes/locale/itemframes.ru.tr

@@ -0,0 +1,9 @@
+# textdomain: itemframes
+
+
+### init.lua ###
+
+Item frame=Рамка предметов
+Item frame (owned by @1)=Рамка предметов (принадлежит @1)
+Pedestal=Пьедестал
+Pedestal (owned by @1)=Пьедестал (принадлежит @1)

itemframes/locale/itemframes.zh_CN.tr

@@ -0,0 +1,9 @@
+# textdomain: itemframes
+
+
+### init.lua ###
+
+Item frame=项目框架
+Item frame (owned by @1)=物品框架（归@1所有）
+Pedestal=底座
+Pedestal (owned by @1)=基座（归@1所有）

itemframes/locale/template.txt

@@ -0,0 +1,9 @@
+# textdomain: itemframes
+
+
+### init.lua ###
+
+Item frame=
+Item frame (owned by @1)=
+Pedestal=
+Pedestal (owned by @1)=

itemframes/mod.conf

@@ -0,0 +1,3 @@
+name = itemframes
+depends = default, homedecor_common
+optional_depends = mesecons_mvps, screwdriver