diff --git a/.gitignore b/.gitignore index ecc34ee9..879a1f18 100755 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ *.od?# *.patch *.swp +*.diff diff --git a/mods/mesecons/mesecons/oldwires.lua b/mods/mesecons/mesecons/oldwires.lua index b3b09e53..5874c69f 100755 --- a/mods/mesecons/mesecons/oldwires.lua +++ b/mods/mesecons/mesecons/oldwires.lua @@ -10,7 +10,7 @@ minetest.register_node("mesecons:mesecon_off", { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5}, }, - groups = {dig_immediate=3, mesecon=1, mesecon_conductor_craftable=1}, + groups = {dig_immediate=2, mesecon=1, mesecon_conductor_craftable=1}, --MFF description="Mesecons", mesecons = {conductor={ state = mesecon.state.off, @@ -28,7 +28,7 @@ minetest.register_node("mesecons:mesecon_on", { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5}, }, - groups = {dig_immediate=3, not_in_creaive_inventory=1, mesecon=1}, + groups = {dig_immediate=2, not_in_creaive_inventory=1, mesecon=1}, --MFF drop = "mesecons:mesecon_off 1", light_source = default.LIGHT_MAX-11, mesecons = {conductor={ diff --git a/mods/mesecons/mesecons/wires.lua b/mods/mesecons/mesecons/wires.lua index 18ae8f5b..cccd467a 100755 --- a/mods/mesecons/mesecons/wires.lua +++ b/mods/mesecons/mesecons/wires.lua @@ -197,9 +197,9 @@ register_wires = function() offstate = "mesecons:wire_"..nodeid.."_off" }} - local groups_on = {dig_immediate = 3, mesecon_conductor_craftable = 1, - not_in_creative_inventory = 1} - local groups_off = {dig_immediate = 3, mesecon_conductor_craftable = 1} + local groups_on = {dig_immediate = 2, mesecon_conductor_craftable = 1, + not_in_creative_inventory = 1} --MFF + local groups_off = {dig_immediate = 2, mesecon_conductor_craftable = 1} --MFF if nodeid ~= "00000000" then groups_off["not_in_creative_inventory"] = 1 end diff --git a/mods/mesecons/mesecons_extrawires/corner.lua b/mods/mesecons/mesecons_extrawires/corner.lua index 1e298707..1cefc3ad 100755 --- a/mods/mesecons/mesecons_extrawires/corner.lua +++ b/mods/mesecons/mesecons_extrawires/corner.lua @@ -37,7 +37,7 @@ minetest.register_node("mesecons_extrawires:corner_on", { sunlight_propagates = true, selection_box = corner_selectionbox, node_box = corner_nodebox, - groups = {dig_immediate = 3, not_in_creative_inventory = 1}, + groups = {dig_immediate = 2, not_in_creative_inventory = 1}, -- MFF drop = "mesecons_extrawires:corner_off", mesecons = {conductor = { @@ -64,7 +64,7 @@ minetest.register_node("mesecons_extrawires:corner_off", { sunlight_propagates = true, selection_box = corner_selectionbox, node_box = corner_nodebox, - groups = {dig_immediate = 3}, + groups = {dig_immediate = 2}, --MFF mesecons = {conductor = { state = mesecon.state.off, diff --git a/mods/mesecons/mesecons_extrawires/crossover.lua b/mods/mesecons/mesecons_extrawires/crossover.lua index 4ecfc12b..a7806ec2 100755 --- a/mods/mesecons/mesecons_extrawires/crossover.lua +++ b/mods/mesecons/mesecons_extrawires/crossover.lua @@ -41,7 +41,7 @@ minetest.register_node("mesecons_extrawires:crossover_off", { { -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 }, }, }, - groups = {dig_immediate=3, mesecon=3}, + groups = {dig_immediate=2, mesecon=3}, --MFF mesecons = { conductor = { states = crossover_states, @@ -77,7 +77,7 @@ minetest.register_node("mesecons_extrawires:crossover_01", { { -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 }, }, }, - groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1}, + groups = {dig_immediate=2, mesecon=3, not_in_creative_inventory=1}, --MFF mesecons = { conductor = { states = crossover_states, diff --git a/mods/mesecons/mesecons_extrawires/tjunction.lua b/mods/mesecons/mesecons_extrawires/tjunction.lua index 1091e83f..51820eee 100755 --- a/mods/mesecons/mesecons_extrawires/tjunction.lua +++ b/mods/mesecons/mesecons_extrawires/tjunction.lua @@ -38,7 +38,7 @@ minetest.register_node("mesecons_extrawires:tjunction_on", { sunlight_propagates = true, selection_box = tjunction_selectionbox, node_box = tjunction_nodebox, - groups = {dig_immediate = 3, not_in_creative_inventory = 1}, + groups = {dig_immediate = 2, not_in_creative_inventory = 1}, --MFF drop = "mesecons_extrawires:tjunction_off", mesecons = {conductor = { @@ -65,7 +65,7 @@ minetest.register_node("mesecons_extrawires:tjunction_off", { sunlight_propagates = true, selection_box = tjunction_selectionbox, node_box = tjunction_nodebox, - groups = {dig_immediate = 3}, + groups = {dig_immediate = 2}, --MFF mesecons = {conductor = { state = mesecon.state.off, diff --git a/mods/mesecons/mesecons_extrawires/vertical.lua b/mods/mesecons/mesecons_extrawires/vertical.lua index cac2ae23..e86b3cf9 100755 --- a/mods/mesecons/mesecons_extrawires/vertical.lua +++ b/mods/mesecons/mesecons_extrawires/vertical.lua @@ -86,7 +86,7 @@ mesecon.register_node("mesecons_extrawires:vertical", { after_dig_node = vertical_update },{ tiles = {"mesecons_wire_off.png"}, - groups = {dig_immediate=3}, + groups = {dig_immediate=2}, --MFF vertical_conductor_state = "off", mesecons = {conductor = { state = mesecon.state.off, @@ -95,7 +95,7 @@ mesecon.register_node("mesecons_extrawires:vertical", { }} },{ tiles = {"mesecons_wire_on.png"}, - groups = {dig_immediate=3, not_in_creative_inventory=1}, + groups = {dig_immediate=2, not_in_creative_inventory=1}, --MFF vertical_conductor_state = "on", mesecons = {conductor = { state = mesecon.state.on, @@ -111,7 +111,7 @@ mesecon.register_node("mesecons_extrawires:vertical_top", { walkable = false, paramtype = "light", sunlight_propagates = true, - groups = {dig_immediate=3, not_in_creative_inventory=1}, + groups = {dig_immediate=2, not_in_creative_inventory=1}, --MFF selection_box = top_box, node_box = top_box, is_vertical_conductor = true, @@ -143,7 +143,7 @@ mesecon.register_node("mesecons_extrawires:vertical_bottom", { walkable = false, paramtype = "light", sunlight_propagates = true, - groups = {dig_immediate = 3, not_in_creative_inventory = 1}, + groups = {dig_immediate = 2, not_in_creative_inventory = 1}, --MFF selection_box = bottom_box, node_box = bottom_box, is_vertical_conductor = true, diff --git a/mods/mesecons/mesecons_insulated/init.lua b/mods/mesecons/mesecons_insulated/init.lua index c6fc05ee..569c502f 100755 --- a/mods/mesecons/mesecons_insulated/init.lua +++ b/mods/mesecons/mesecons_insulated/init.lua @@ -30,7 +30,7 @@ minetest.register_node("mesecons_insulated:insulated_on", { type = "fixed", fixed = { -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 } }, - groups = {dig_immediate = 3, not_in_creative_inventory = 1}, + groups = {dig_immediate = 2, not_in_creative_inventory = 1}, --MFF drop = "mesecons_insulated:insulated_off", mesecons = {conductor = { state = mesecon.state.on, @@ -62,7 +62,7 @@ minetest.register_node("mesecons_insulated:insulated_off", { type = "fixed", fixed = { -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 } }, - groups = {dig_immediate = 3}, + groups = {dig_immediate = 2}, --MFF mesecons = {conductor = { state = mesecon.state.off, onstate = "mesecons_insulated:insulated_on",