Commit d75f8a41 authored by Milan's avatar Milan
Browse files

merge upstream 🐈

parents f4d60800 8638435b

building_blocks/init.lua

+2 −2
Original line number Diff line number Diff line
@@ -569,8 +569,8 @@ minetest.register_tool("building_blocks:knife", { 
	tool_capabilities = {

		max_drop_level=0,

		groupcaps={

			choppy={times={[2]=7.50, [3]=2.80}, maxwear=0.01, maxlevel=1},

			fleshy={times={[2]=5.50, [3]=2.80}, maxwear=0.01, maxlevel=1}

			choppy={times={[2]=7.50, [3]=2.80}, uses=100, maxlevel=1},

			fleshy={times={[2]=5.50, [3]=2.80}, uses=100, maxlevel=1}

		}

	},

})

computer/computers.lua

+1 −1
Original line number Diff line number Diff line
@@ -316,8 +316,8 @@ minetest.register_node("computer:server_on", { 
	tiles = {

		'computer_server_t.png',

		'computer_server_bt.png',

		'computer_server_r.png',

		'computer_server_l.png',

		'computer_server_r.png',

		'computer_server_bt.png',

		'computer_server_f_on.png',

	},

homedecor/doors_and_gates.lua

+2 −2
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ for i in ipairs(gates_list) do 
		end,

        mesecons = {

            effector = {

                action_on = function(pos,node) homedecor.flip_gate(pos,node,player,gate, "closed") end

                action_on = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "closed") end

            }

        }

	}
@@ -420,7 +420,7 @@ for i in ipairs(gates_list) do 
        return itemstack

	end

    def.mesecons.effector = {

        action_off = function(pos,node) homedecor.flip_gate(pos,node,player,gate, "open") end

        action_off = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "open") end

    }



	minetest.register_node("homedecor:gate_"..gate.."_open", def)

lrfurn/coffeetable.lua

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ minetest.register_node("lrfurn:coffeetable_back", { 
		local node = minetest.get_node(pos)

		local param2 = node.param2



		local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false)



		if lrfurn.check_forward(pos, fdir, false, placer) then



			node.name = "lrfurn:coffeetable_front"