updated several mods:

blox, bobblocks, castle, digilines, home decor, mesecons, pipeworks, and
quartz

2 files changed, 47 insertions, 28 deletions

diff --git a/itemframes/depends.txt b/itemframes/depends.txt
index 4ad96d5..85a4dc2 100644
--- a/itemframes/depends.txt
+++ b/itemframes/depends.txt
@@ -1 +1,2 @@
 default
+mesecons_mvps?
diff --git a/itemframes/init.lua b/itemframes/init.lua
index 000eab6..8900dd5 100644
--- a/itemframes/init.lua
+++ b/itemframes/init.lua
@@ -4,10 +4,10 @@ screwdriver = screwdriver or {}
 minetest.register_entity("itemframes:item",{
 	hp_max = 1,
 	visual="wielditem",
-	visual_size={x=.33,y=.33},
-	collisionbox = {0,0,0,0,0,0},
-	physical=false,
-	textures={"air"},
+	visual_size={x = 0.33, y = 0.33},
+	collisionbox = {0, 0, 0, 0, 0, 0},
+	physical = false,
+	textures = {"air"},
 	on_activate = function(self, staticdata)
 		if tmp.nodename ~= nil and tmp.texture ~= nil then
 			self.nodename = tmp.nodename
@@ -24,10 +24,10 @@ minetest.register_entity("itemframes:item",{
 			end
 		end
 		if self.texture ~= nil then
-			self.object:set_properties({textures={self.texture}})
+			self.object:set_properties({textures = {self.texture}})
 		end
 		if self.nodename == "itemframes:pedestal" then
-			self.object:set_properties({automatic_rotate=1})
+			self.object:set_properties({automatic_rotate = 1})
 		end
 	end,
 	get_staticdata = function(self)
@@ -38,12 +38,12 @@ minetest.register_entity("itemframes:item",{
 	end,
 })
 
-
 local facedir = {}
-facedir[0] = {x=0,y=0,z=1}
-facedir[1] = {x=1,y=0,z=0}
-facedir[2] = {x=0,y=0,z=-1}
-facedir[3] = {x=-1,y=0,z=0}
+
+facedir[0] = {x = 0, y = 0, z = 1}
+facedir[1] = {x = 1, y = 0, z = 0}
+facedir[2] = {x = 0, y = 0, z = -1}
+facedir[3] = {x = -1, y = 0, z = 0}
 
 local remove_item = function(pos, node)
 	local objs = nil
@@ -68,17 +68,17 @@ local update_item = function(pos, node)
 		if node.name == "itemframes:frame" then
 			local posad = facedir[node.param2]
 			if not posad then return end
-			pos.x = pos.x + posad.x*6.5/16
-			pos.y = pos.y + posad.y*6.5/16
-			pos.z = pos.z + posad.z*6.5/16
+			pos.x = pos.x + posad.x * 6.5 / 16
+			pos.y = pos.y + posad.y * 6.5 / 16
+			pos.z = pos.z + posad.z * 6.5 / 16
 		elseif node.name == "itemframes:pedestal" then
-			pos.y = pos.y + 12/16+.33
+			pos.y = pos.y + 12 / 16 + 0.33
 		end
 		tmp.nodename = node.name
 		tmp.texture = ItemStack(meta:get_string("item")):get_name()
 		local e = minetest.add_entity(pos,"itemframes:item")
 		if node.name == "itemframes:frame" then
-			local yaw = math.pi*2 - node.param2 * math.pi/2
+			local yaw = math.pi * 2 - node.param2 * math.pi / 2
 			e:setyaw(yaw)
 		end
 	end
@@ -100,15 +100,21 @@ end
 minetest.register_node("itemframes:frame",{
 	description = "Item frame",
 	drawtype = "nodebox",
-	node_box = { type = "fixed", fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5} },
-	selection_box = { type = "fixed", fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5} },
+	node_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5}
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5}
+	},
 	tiles = {"itemframes_frame.png"},
 	inventory_image = "itemframes_frame.png",
 	wield_image = "itemframes_frame.png",
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = true,
-	groups = { choppy=2,dig_immediate=2 },
+	groups = {choppy = 2, dig_immediate = 2},
 	legacy_wallmounted = true,
 	sounds = default.node_sound_defaults(),
 	on_rotate = screwdriver.disallow,
@@ -152,16 +158,21 @@ minetest.register_node("itemframes:frame",{
 minetest.register_node("itemframes:pedestal",{
 	description = "Pedestal",
 	drawtype = "nodebox",
-	node_box = { type = "fixed", fixed = {
-		{-7/16, -8/16, -7/16, 7/16, -7/16, 7/16}, -- bottom plate
-		{-6/16, -7/16, -6/16, 6/16, -6/16, 6/16}, -- bottom plate (upper)
-		{-0.25, -6/16, -0.25, 0.25, 11/16, 0.25}, -- pillar
-		{-7/16, 11/16, -7/16, 7/16, 12/16, 7/16}, -- top plate
-	} },
-	--selection_box = { type = "fixed", fixed = {-7/16, -0.5, -7/16, 7/16, 12/16, 7/16} },
+	node_box = {
+		type = "fixed", fixed = {
+			{-7/16, -8/16, -7/16, 7/16, -7/16, 7/16}, -- bottom plate
+			{-6/16, -7/16, -6/16, 6/16, -6/16, 6/16}, -- bottom plate (upper)
+			{-0.25, -6/16, -0.25, 0.25, 11/16, 0.25}, -- pillar
+			{-7/16, 11/16, -7/16, 7/16, 12/16, 7/16}, -- top plate
+		}
+	},
+	--selection_box = {
+	--	type = "fixed",
+	--	fixed = {-7/16, -0.5, -7/16, 7/16, 12/16, 7/16}
+	--},
 	tiles = {"itemframes_pedestal.png"},
 	paramtype = "light",
-	groups = { cracky=3 },
+	groups = {cracky = 3},
 	sounds = default.node_sound_defaults(),
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack)
@@ -204,7 +215,7 @@ minetest.register_node("itemframes:pedestal",{
 -- due to /clearobjects or similar
 
 minetest.register_abm({
-	nodenames = { "itemframes:frame", "itemframes:pedestal" },
+	nodenames = {"itemframes:frame", "itemframes:pedestal"},
 	interval = 15,
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
@@ -233,6 +244,7 @@ minetest.register_craft({
 		{'group:stick', 'group:stick', 'group:stick'},
 	}
 })
+
 minetest.register_craft({
 	output = 'itemframes:pedestal',
 	recipe = {
@@ -241,3 +253,9 @@ minetest.register_craft({
 		{'default:stone', 'default:stone', 'default:stone'},
 	}
 })
+
+-- stop mesecon pistons from pushing itemframes and pedestals
+if minetest.get_modpath("mesecons_mvps") then
+	mesecon.register_mvps_stopper("itemframes:frame")
+	mesecon.register_mvps_stopper("itemframes:pedestal")
+end