diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b25c15b..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/LICENSE.txt b/LICENSE.txt old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/mesecons/actionqueue.lua b/mesecons/actionqueue.lua old mode 100644 new mode 100755 diff --git a/mesecons/depends.txt b/mesecons/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons/init.lua b/mesecons/init.lua old mode 100644 new mode 100755 index 3ab4f4a..0594105 --- a/mesecons/init.lua +++ b/mesecons/init.lua @@ -126,7 +126,7 @@ function mesecon.receptor_off(pos, rules) end -print("[OK] Mesecons") +minetest.log("action", "[OK] Mesecons") -- Deprecated stuff -- To be removed in future releases diff --git a/mesecons/internal.lua b/mesecons/internal.lua old mode 100644 new mode 100755 diff --git a/mesecons/legacy.lua b/mesecons/legacy.lua old mode 100644 new mode 100755 diff --git a/mesecons/oldwires.lua b/mesecons/oldwires.lua old mode 100644 new mode 100755 index b3b09e5..5874c69 --- a/mesecons/oldwires.lua +++ b/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/mesecons/presets.lua b/mesecons/presets.lua old mode 100644 new mode 100755 diff --git a/mesecons/services.lua b/mesecons/services.lua old mode 100644 new mode 100755 diff --git a/mesecons/settings.lua b/mesecons/settings.lua old mode 100644 new mode 100755 index 1ebbfde..50240c3 --- a/mesecons/settings.lua +++ b/mesecons/settings.lua @@ -1,15 +1,15 @@ --- SETTINGS -function mesecon.setting(setting, default) - if type(default) == "boolean" then - local read = minetest.setting_getbool("mesecon."..setting) - if read == nil then - return default - else - return read - end - elseif type(default) == "string" then - return minetest.setting_get("mesecon."..setting) or default - elseif type(default) == "number" then - return tonumber(minetest.setting_get("mesecon."..setting) or default) - end -end +-- SETTINGS +function mesecon.setting(setting, default) + if type(default) == "boolean" then + local read = minetest.setting_getbool("mesecon."..setting) + if read == nil then + return default + else + return read + end + elseif type(default) == "string" then + return minetest.setting_get("mesecon."..setting) or default + elseif type(default) == "number" then + return tonumber(minetest.setting_get("mesecon."..setting) or default) + end +end diff --git a/mesecons/textures/mesecons_wire_inv.png b/mesecons/textures/mesecons_wire_inv.png old mode 100644 new mode 100755 index a3930cb..9cb4f47 Binary files a/mesecons/textures/mesecons_wire_inv.png and b/mesecons/textures/mesecons_wire_inv.png differ diff --git a/mesecons/textures/mesecons_wire_off.png b/mesecons/textures/mesecons_wire_off.png old mode 100644 new mode 100755 index 58164fa..869f40f Binary files a/mesecons/textures/mesecons_wire_off.png and b/mesecons/textures/mesecons_wire_off.png differ diff --git a/mesecons/textures/mesecons_wire_on.png b/mesecons/textures/mesecons_wire_on.png old mode 100644 new mode 100755 index 98a86c8..3a67888 Binary files a/mesecons/textures/mesecons_wire_on.png and b/mesecons/textures/mesecons_wire_on.png differ diff --git a/mesecons/util.lua b/mesecons/util.lua old mode 100644 new mode 100755 diff --git a/mesecons/wires.lua b/mesecons/wires.lua old mode 100644 new mode 100755 index d77904e..376de9f --- a/mesecons/wires.lua +++ b/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/mesecons_alias/depends.txt b/mesecons_alias/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_alias/init.lua b/mesecons_alias/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_blinkyplant/depends.txt b/mesecons_blinkyplant/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_blinkyplant/init.lua b/mesecons_blinkyplant/init.lua old mode 100644 new mode 100755 index 8d2aa6e..6a09a87 --- a/mesecons_blinkyplant/init.lua +++ b/mesecons_blinkyplant/init.lua @@ -10,11 +10,25 @@ local toggle_timer = function (pos) end local on_timer = function (pos) - local node = minetest.get_node(pos) - if(mesecon.flipstate(pos, node) == "on") then - mesecon.receptor_on(pos) - else - mesecon.receptor_off(pos) + -- DO NOT TOUCH OR.. THREATS! Thanks, MFF + local activate = false + for _, player in pairs(minetest.get_connected_players()) do + local p = player:getpos() + local dist = ((p.x-pos.x)^2 + (p.y-pos.y)^2 + (p.z-pos.z)^2)^0.5 + if dist < 40 then + activate = true + break + end + end + + if activate then + local node = minetest.get_node(pos) + if(mesecon.flipstate(pos, node) == "on") then + mesecon.receptor_on(pos) + else + mesecon.receptor_off(pos) + end + -- Our modification stops there, thank you, @crabman77 end toggle_timer(pos) end diff --git a/mesecons_blinkyplant/textures/jeija_blinky_plant_off.png b/mesecons_blinkyplant/textures/jeija_blinky_plant_off.png old mode 100644 new mode 100755 index 4f507da..90f7f3c Binary files a/mesecons_blinkyplant/textures/jeija_blinky_plant_off.png and b/mesecons_blinkyplant/textures/jeija_blinky_plant_off.png differ diff --git a/mesecons_blinkyplant/textures/jeija_blinky_plant_on.png b/mesecons_blinkyplant/textures/jeija_blinky_plant_on.png old mode 100644 new mode 100755 index f77a134..3f2213b Binary files a/mesecons_blinkyplant/textures/jeija_blinky_plant_on.png and b/mesecons_blinkyplant/textures/jeija_blinky_plant_on.png differ diff --git a/mesecons_button/depends.txt b/mesecons_button/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_button/init.lua b/mesecons_button/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_button/sounds/mesecons_button_pop.ogg b/mesecons_button/sounds/mesecons_button_pop.ogg old mode 100644 new mode 100755 diff --git a/mesecons_button/sounds/mesecons_button_push.ogg b/mesecons_button/sounds/mesecons_button_push.ogg old mode 100644 new mode 100755 diff --git a/mesecons_button/textures/jeija_wall_button_off.png b/mesecons_button/textures/jeija_wall_button_off.png old mode 100644 new mode 100755 diff --git a/mesecons_button/textures/jeija_wall_button_on.png b/mesecons_button/textures/jeija_wall_button_on.png old mode 100644 new mode 100755 diff --git a/mesecons_button/textures/jeija_wall_button_sides.png b/mesecons_button/textures/jeija_wall_button_sides.png old mode 100644 new mode 100755 index 9b79b57..1902b66 Binary files a/mesecons_button/textures/jeija_wall_button_sides.png and b/mesecons_button/textures/jeija_wall_button_sides.png differ diff --git a/mesecons_commandblock/depends.txt b/mesecons_commandblock/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_commandblock/init.lua b/mesecons_commandblock/init.lua old mode 100644 new mode 100755 index 6cd0027..8fb54e6 --- a/mesecons_commandblock/init.lua +++ b/mesecons_commandblock/init.lua @@ -1,208 +1,208 @@ -minetest.register_chatcommand("say", { - params = "", - description = "Say as the server", - privs = {server=true}, - func = function(name, param) - minetest.chat_send_all(name .. ": " .. param) - end -}) - -minetest.register_chatcommand("tell", { - params = " ", - description = "Say to privately", - func = function(name, param) - local found, _, target, message = param:find("^([^%s]+)%s+(.*)$") - if found == nil then - minetest.chat_send_player(name, "Invalid usage: " .. param) - return - end - if not minetest.get_player_by_name(target) then - minetest.chat_send_player(name, "Invalid target: " .. target) - end - minetest.chat_send_player(target, name .. " whispers: " .. message, false) - end -}) - -minetest.register_chatcommand("hp", { - params = " ", - description = "Set health of to hitpoints", - privs = {ban=true}, - func = function(name, param) - local found, _, target, value = param:find("^([^%s]+)%s+(%d+)$") - if found == nil then - minetest.chat_send_player(name, "Invalid usage: " .. param) - return - end - local player = minetest.get_player_by_name(target) - if player then - player:set_hp(value) - else - minetest.chat_send_player(name, "Invalid target: " .. target) - end - end -}) - -local function initialize_data(meta) - local commands = minetest.formspec_escape(meta:get_string("commands")) - meta:set_string("formspec", - "invsize[9,5;]" .. - "textarea[0.5,0.5;8.5,4;commands;Commands;"..commands.."]" .. - "label[1,3.8;@nearest, @farthest, and @random are replaced by the respective player names]" .. - "button_exit[3.3,4.5;2,1;submit;Submit]") - local owner = meta:get_string("owner") - if owner == "" then - owner = "not owned" - else - owner = "owned by " .. owner - end - meta:set_string("infotext", "Command Block\n" .. - "(" .. owner .. ")\n" .. - "Commands: "..commands) -end - -local function construct(pos) - local meta = minetest.get_meta(pos) - - meta:set_string("commands", "tell @nearest Commandblock unconfigured") - - meta:set_string("owner", "") - - initialize_data(meta) -end - -local function after_place(pos, placer) - if placer then - local meta = minetest.get_meta(pos) - meta:set_string("owner", placer:get_player_name()) - initialize_data(meta) - end -end - -local function receive_fields(pos, formname, fields, sender) - if not fields.submit then - return - end - local meta = minetest.get_meta(pos) - local owner = meta:get_string("owner") - if owner ~= "" and sender:get_player_name() ~= owner then - return - end - meta:set_string("commands", fields.commands) - - initialize_data(meta) -end - -local function resolve_commands(commands, pos) - local players = minetest.get_connected_players() - - -- No players online: remove all commands containing - -- @nearest, @farthest and @random - if #players == 0 then - commands = commands:gsub("[^\r\n]+", function (line) - if line:find("@nearest") then return "" end - if line:find("@farthest") then return "" end - if line:find("@random") then return "" end - return line - end) - return commands - end - - local nearest, farthest = nil, nil - local min_distance, max_distance = math.huge, -1 - for index, player in pairs(players) do - local distance = vector.distance(pos, player:getpos()) - if distance < min_distance then - min_distance = distance - nearest = player:get_player_name() - end - if distance > max_distance then - max_distance = distance - farthest = player:get_player_name() - end - end - local random = players[math.random(#players)]:get_player_name() - commands = commands:gsub("@nearest", nearest) - commands = commands:gsub("@farthest", farthest) - commands = commands:gsub("@random", random) - return commands -end - -local function commandblock_action_on(pos, node) - if node.name ~= "mesecons_commandblock:commandblock_off" then - return - end - - minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_on"}) - - local meta = minetest.get_meta(pos) - local owner = meta:get_string("owner") - if owner == "" then - return - end - - local commands = resolve_commands(meta:get_string("commands"), pos) - for _, command in pairs(commands:split("\n")) do - local pos = command:find(" ") - local cmd, param = command, "" - if pos then - cmd = command:sub(1, pos - 1) - param = command:sub(pos + 1) - end - local cmddef = minetest.chatcommands[cmd] - if not cmddef then - minetest.chat_send_player(owner, "The command "..cmd.." does not exist") - return - end - local has_privs, missing_privs = minetest.check_player_privs(owner, cmddef.privs) - if not has_privs then - minetest.chat_send_player(owner, "You don't have permission " - .."to run "..cmd - .." (missing privileges: " - ..table.concat(missing_privs, ", ")..")") - return - end - cmddef.func(owner, param) - end -end - -local function commandblock_action_off(pos, node) - if node.name == "mesecons_commandblock:commandblock_on" then - minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_off"}) - end -end - -local function can_dig(pos, player) - local meta = minetest.get_meta(pos) - local owner = meta:get_string("owner") - return owner == "" or owner == player:get_player_name() -end - -minetest.register_node("mesecons_commandblock:commandblock_off", { - description = "Command Block", - tiles = {"jeija_commandblock_off.png"}, - inventory_image = minetest.inventorycube("jeija_commandblock_off.png"), - groups = {cracky=2, mesecon_effector_off=1}, - on_construct = construct, - after_place_node = after_place, - on_receive_fields = receive_fields, - can_dig = can_dig, - sounds = default.node_sound_stone_defaults(), - mesecons = {effector = { - action_on = commandblock_action_on - }} -}) - -minetest.register_node("mesecons_commandblock:commandblock_on", { - tiles = {"jeija_commandblock_on.png"}, - groups = {cracky=2, mesecon_effector_on=1, not_in_creative_inventory=1}, - light_source = 10, - drop = "mesecons_commandblock:commandblock_off", - on_construct = construct, - after_place_node = after_place, - on_receive_fields = receive_fields, - can_dig = can_dig, - sounds = default.node_sound_stone_defaults(), - mesecons = {effector = { - action_off = commandblock_action_off - }} -}) +minetest.register_chatcommand("say", { + params = "", + description = "Say as the server", + privs = {server=true}, + func = function(name, param) + minetest.chat_send_all(name .. ": " .. param) + end +}) + +minetest.register_chatcommand("tell", { + params = " ", + description = "Say to privately", + func = function(name, param) + local found, _, target, message = param:find("^([^%s]+)%s+(.*)$") + if found == nil then + minetest.chat_send_player(name, "Invalid usage: " .. param) + return + end + if not minetest.get_player_by_name(target) then + minetest.chat_send_player(name, "Invalid target: " .. target) + end + minetest.chat_send_player(target, name .. " whispers: " .. message, false) + end +}) + +minetest.register_chatcommand("hp", { + params = " ", + description = "Set health of to hitpoints", + privs = {ban=true}, + func = function(name, param) + local found, _, target, value = param:find("^([^%s]+)%s+(%d+)$") + if found == nil then + minetest.chat_send_player(name, "Invalid usage: " .. param) + return + end + local player = minetest.get_player_by_name(target) + if player then + player:set_hp(value) + else + minetest.chat_send_player(name, "Invalid target: " .. target) + end + end +}) + +local function initialize_data(meta) + local commands = minetest.formspec_escape(meta:get_string("commands")) + meta:set_string("formspec", + "invsize[9,5;]" .. + "textarea[0.5,0.5;8.5,4;commands;Commands;"..commands.."]" .. + "label[1,3.8;@nearest, @farthest, and @random are replaced by the respective player names]" .. + "button_exit[3.3,4.5;2,1;submit;Submit]") + local owner = meta:get_string("owner") + if owner == "" then + owner = "not owned" + else + owner = "owned by " .. owner + end + meta:set_string("infotext", "Command Block\n" .. + "(" .. owner .. ")\n" .. + "Commands: "..commands) +end + +local function construct(pos) + local meta = minetest.get_meta(pos) + + meta:set_string("commands", "tell @nearest Commandblock unconfigured") + + meta:set_string("owner", "") + + initialize_data(meta) +end + +local function after_place(pos, placer) + if placer then + local meta = minetest.get_meta(pos) + meta:set_string("owner", placer:get_player_name()) + initialize_data(meta) + end +end + +local function receive_fields(pos, formname, fields, sender) + if not fields.submit then + return + end + local meta = minetest.get_meta(pos) + local owner = meta:get_string("owner") + if owner ~= "" and sender:get_player_name() ~= owner then + return + end + meta:set_string("commands", fields.commands) + + initialize_data(meta) +end + +local function resolve_commands(commands, pos) + local players = minetest.get_connected_players() + + -- No players online: remove all commands containing + -- @nearest, @farthest and @random + if #players == 0 then + commands = commands:gsub("[^\r\n]+", function (line) + if line:find("@nearest") then return "" end + if line:find("@farthest") then return "" end + if line:find("@random") then return "" end + return line + end) + return commands + end + + local nearest, farthest = nil, nil + local min_distance, max_distance = math.huge, -1 + for index, player in pairs(players) do + local distance = vector.distance(pos, player:getpos()) + if distance < min_distance then + min_distance = distance + nearest = player:get_player_name() + end + if distance > max_distance then + max_distance = distance + farthest = player:get_player_name() + end + end + local random = players[math.random(#players)]:get_player_name() + commands = commands:gsub("@nearest", nearest) + commands = commands:gsub("@farthest", farthest) + commands = commands:gsub("@random", random) + return commands +end + +local function commandblock_action_on(pos, node) + if node.name ~= "mesecons_commandblock:commandblock_off" then + return + end + + minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_on"}) + + local meta = minetest.get_meta(pos) + local owner = meta:get_string("owner") + if owner == "" then + return + end + + local commands = resolve_commands(meta:get_string("commands"), pos) + for _, command in pairs(commands:split("\n")) do + local pos = command:find(" ") + local cmd, param = command, "" + if pos then + cmd = command:sub(1, pos - 1) + param = command:sub(pos + 1) + end + local cmddef = minetest.chatcommands[cmd] + if not cmddef then + minetest.chat_send_player(owner, "The command "..cmd.." does not exist") + return + end + local has_privs, missing_privs = minetest.check_player_privs(owner, cmddef.privs) + if not has_privs then + minetest.chat_send_player(owner, "You don't have permission " + .."to run "..cmd + .." (missing privileges: " + ..table.concat(missing_privs, ", ")..")") + return + end + cmddef.func(owner, param) + end +end + +local function commandblock_action_off(pos, node) + if node.name == "mesecons_commandblock:commandblock_on" then + minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_off"}) + end +end + +local function can_dig(pos, player) + local meta = minetest.get_meta(pos) + local owner = meta:get_string("owner") + return owner == "" or owner == player:get_player_name() +end + +minetest.register_node("mesecons_commandblock:commandblock_off", { + description = "Command Block", + tiles = {"jeija_commandblock_off.png"}, + inventory_image = minetest.inventorycube("jeija_commandblock_off.png"), + groups = {cracky=2, mesecon_effector_off=1}, + on_construct = construct, + after_place_node = after_place, + on_receive_fields = receive_fields, + can_dig = can_dig, + sounds = default.node_sound_stone_defaults(), + mesecons = {effector = { + action_on = commandblock_action_on + }} +}) + +minetest.register_node("mesecons_commandblock:commandblock_on", { + tiles = {"jeija_commandblock_on.png"}, + groups = {cracky=2, mesecon_effector_on=1, not_in_creative_inventory=1}, + light_source = 10, + drop = "mesecons_commandblock:commandblock_off", + on_construct = construct, + after_place_node = after_place, + on_receive_fields = receive_fields, + can_dig = can_dig, + sounds = default.node_sound_stone_defaults(), + mesecons = {effector = { + action_off = commandblock_action_off + }} +}) diff --git a/mesecons_commandblock/textures/jeija_close_window.png b/mesecons_commandblock/textures/jeija_close_window.png old mode 100644 new mode 100755 index 5c27c6c..f83a7a9 Binary files a/mesecons_commandblock/textures/jeija_close_window.png and b/mesecons_commandblock/textures/jeija_close_window.png differ diff --git a/mesecons_commandblock/textures/jeija_commandblock_off.png b/mesecons_commandblock/textures/jeija_commandblock_off.png old mode 100644 new mode 100755 index c05b616..45e9cf3 Binary files a/mesecons_commandblock/textures/jeija_commandblock_off.png and b/mesecons_commandblock/textures/jeija_commandblock_off.png differ diff --git a/mesecons_commandblock/textures/jeija_commandblock_on.png b/mesecons_commandblock/textures/jeija_commandblock_on.png old mode 100644 new mode 100755 index 7fc35b6..a9f9a4e Binary files a/mesecons_commandblock/textures/jeija_commandblock_on.png and b/mesecons_commandblock/textures/jeija_commandblock_on.png differ diff --git a/mesecons_delayer/depends.txt b/mesecons_delayer/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_delayer/init.lua b/mesecons_delayer/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_delayer/textures/mesecons_delayer_bottom.png b/mesecons_delayer/textures/mesecons_delayer_bottom.png old mode 100644 new mode 100755 index 2e49d31..5f2b67a Binary files a/mesecons_delayer/textures/mesecons_delayer_bottom.png and b/mesecons_delayer/textures/mesecons_delayer_bottom.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_ends_off.png b/mesecons_delayer/textures/mesecons_delayer_ends_off.png old mode 100644 new mode 100755 index 0242deb..6a04e0b Binary files a/mesecons_delayer/textures/mesecons_delayer_ends_off.png and b/mesecons_delayer/textures/mesecons_delayer_ends_off.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_ends_on.png b/mesecons_delayer/textures/mesecons_delayer_ends_on.png old mode 100644 new mode 100755 index 19ae0cb..0beed80 Binary files a/mesecons_delayer/textures/mesecons_delayer_ends_on.png and b/mesecons_delayer/textures/mesecons_delayer_ends_on.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_off_1.png b/mesecons_delayer/textures/mesecons_delayer_off_1.png old mode 100644 new mode 100755 index 7372b37..20d9efc Binary files a/mesecons_delayer/textures/mesecons_delayer_off_1.png and b/mesecons_delayer/textures/mesecons_delayer_off_1.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_off_2.png b/mesecons_delayer/textures/mesecons_delayer_off_2.png old mode 100644 new mode 100755 index e34f0ac..590d62f Binary files a/mesecons_delayer/textures/mesecons_delayer_off_2.png and b/mesecons_delayer/textures/mesecons_delayer_off_2.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_off_3.png b/mesecons_delayer/textures/mesecons_delayer_off_3.png old mode 100644 new mode 100755 index 091adbc..57ac4c4 Binary files a/mesecons_delayer/textures/mesecons_delayer_off_3.png and b/mesecons_delayer/textures/mesecons_delayer_off_3.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_off_4.png b/mesecons_delayer/textures/mesecons_delayer_off_4.png old mode 100644 new mode 100755 index 7ecc9b6..94fc00c Binary files a/mesecons_delayer/textures/mesecons_delayer_off_4.png and b/mesecons_delayer/textures/mesecons_delayer_off_4.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_on_1.png b/mesecons_delayer/textures/mesecons_delayer_on_1.png old mode 100644 new mode 100755 index 61f52f2..c4d82bf Binary files a/mesecons_delayer/textures/mesecons_delayer_on_1.png and b/mesecons_delayer/textures/mesecons_delayer_on_1.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_on_2.png b/mesecons_delayer/textures/mesecons_delayer_on_2.png old mode 100644 new mode 100755 index 7bd363f..05338c8 Binary files a/mesecons_delayer/textures/mesecons_delayer_on_2.png and b/mesecons_delayer/textures/mesecons_delayer_on_2.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_on_3.png b/mesecons_delayer/textures/mesecons_delayer_on_3.png old mode 100644 new mode 100755 index b93f725..116a0ef Binary files a/mesecons_delayer/textures/mesecons_delayer_on_3.png and b/mesecons_delayer/textures/mesecons_delayer_on_3.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_on_4.png b/mesecons_delayer/textures/mesecons_delayer_on_4.png old mode 100644 new mode 100755 index ca90a1e..bf5a18f Binary files a/mesecons_delayer/textures/mesecons_delayer_on_4.png and b/mesecons_delayer/textures/mesecons_delayer_on_4.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_sides_off.png b/mesecons_delayer/textures/mesecons_delayer_sides_off.png old mode 100644 new mode 100755 index 79f3d59..079c2ce Binary files a/mesecons_delayer/textures/mesecons_delayer_sides_off.png and b/mesecons_delayer/textures/mesecons_delayer_sides_off.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_sides_on.png b/mesecons_delayer/textures/mesecons_delayer_sides_on.png old mode 100644 new mode 100755 index 1c8edaa..f142b19 Binary files a/mesecons_delayer/textures/mesecons_delayer_sides_on.png and b/mesecons_delayer/textures/mesecons_delayer_sides_on.png differ diff --git a/mesecons_detector/depends.txt b/mesecons_detector/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_detector/init.lua b/mesecons_detector/init.lua old mode 100644 new mode 100755 index 65e5c6e..79f2a92 --- a/mesecons_detector/init.lua +++ b/mesecons_detector/init.lua @@ -4,10 +4,12 @@ local GET_COMMAND = "GET" -- Detects players in a certain radius -- The radius can be specified in mesecons/settings.lua -local function object_detector_make_formspec(pos) - minetest.get_meta(pos):set_string("formspec", "size[9,2.5]" .. - "field[0.3, 0;9,2;scanname;Name of player to scan for (empty for any):;${scanname}]".. - "field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]".. +-- The following file was modified to detect multiple players +local object_detector_make_formspec = function (pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", "size[9,2.5]" .. + "field[0.3, 0;12,2;scanname;Name of player(s) to scan for (empty for any, separate with comma):;${scanname}]".. + "field[0.3,1.5;4 ,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]".. "button_exit[7,0.75;2,3;;Save]") end @@ -23,34 +25,36 @@ end -- returns true if player was found, false if not local function object_detector_scan(pos) local objs = minetest.get_objects_inside_radius(pos, mesecon.setting("detector_radius", 6)) - - -- abort if no scan results were found - if next(objs) == nil then return false end - - local scanname = minetest.get_meta(pos):get_string("scanname") - local every_player = scanname == "" - for _, obj in pairs(objs) do - -- "" is returned if it is not a player; "" ~= nil; so only handle objects with foundname ~= "" - local foundname = obj:get_player_name() - - if foundname ~= "" then - -- return true if scanning for any player or if specific playername was detected - if scanname == "" or foundname == scanname then - return true + for k, obj in pairs(objs) do + local isname = obj:get_player_name() -- "" is returned if it is not a player; "" ~= nil! + local scanname = minetest.get_meta(pos):get_string("scanname"):gsub(' ', "") + if (scanname == "" and isname ~= "") then + minetest.get_meta(pos):set_string("scanedname", "") + return true + end + local founds = {} + for _, name in pairs(scanname:split(',')) do + if (isname == name and isname ~= "") then + table.insert(founds, isname) end end + if #founds > 0 then + minetest.get_meta(pos):set_string("scannedname", table.concat(founds, ',')) + return true + end end - + minetest.get_meta(pos):set_string("scanedname", "") return false end -- set player name when receiving a digiline signal on a specific channel local object_detector_digiline = { effector = { - action = function(pos, node, channel, msg) + action = function (pos, node, channel, msg) local meta = minetest.get_meta(pos) - if channel == meta:get_string("digiline_channel") then - meta:set_string("scanname", msg) + local active_channel = meta:get_string("digiline_channel") + if channel == active_channel then + meta:set_string("scanedname", msg) object_detector_make_formspec(pos) end end, diff --git a/mesecons_detector/textures/jeija_node_detector_off.png b/mesecons_detector/textures/jeija_node_detector_off.png old mode 100644 new mode 100755 index 6d130ad..c3c654e Binary files a/mesecons_detector/textures/jeija_node_detector_off.png and b/mesecons_detector/textures/jeija_node_detector_off.png differ diff --git a/mesecons_detector/textures/jeija_node_detector_on.png b/mesecons_detector/textures/jeija_node_detector_on.png old mode 100644 new mode 100755 diff --git a/mesecons_detector/textures/jeija_object_detector_off.png b/mesecons_detector/textures/jeija_object_detector_off.png old mode 100644 new mode 100755 index 825d78f..062c95a Binary files a/mesecons_detector/textures/jeija_object_detector_off.png and b/mesecons_detector/textures/jeija_object_detector_off.png differ diff --git a/mesecons_detector/textures/jeija_object_detector_on.png b/mesecons_detector/textures/jeija_object_detector_on.png old mode 100644 new mode 100755 index 96f8ba3..9892741 Binary files a/mesecons_detector/textures/jeija_object_detector_on.png and b/mesecons_detector/textures/jeija_object_detector_on.png differ diff --git a/mesecons_doors/depends.txt b/mesecons_doors/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_doors/init.lua b/mesecons_doors/init.lua old mode 100644 new mode 100755 index 52d6c17..3aa4ed7 --- a/mesecons_doors/init.lua +++ b/mesecons_doors/init.lua @@ -74,6 +74,19 @@ meseconify_door("doors:door_steel") meseconify_door("doors:door_glass") meseconify_door("doors:door_obsidian_glass") +--MFF meseconify all doors, crabman 12/06/2016 +meseconify_door("doors:door_cherry") +meseconify_door("doors:door_tin") +meseconify_door("doors:door_prison") +meseconify_door("doors:door_gardengate_white") +meseconify_door("doors:door3_wood") +meseconify_door("doors:door3_steel") +meseconify_door("doors:door3_glass") +meseconify_door("doors:door3_obsidian_glass") +meseconify_door("doors:door3_cherry") +meseconify_door("doors:door3_prison") + + -- Trapdoor local function trapdoor_switch(pos, node) local state = minetest.get_meta(pos):get_int("state") diff --git a/mesecons_extrawires/corner.lua b/mesecons_extrawires/corner.lua old mode 100644 new mode 100755 index 1e29870..1cefc3a --- a/mesecons_extrawires/corner.lua +++ b/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/mesecons_extrawires/crossover.lua b/mesecons_extrawires/crossover.lua old mode 100644 new mode 100755 index 4ecfc12..a7806ec --- a/mesecons_extrawires/crossover.lua +++ b/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/mesecons_extrawires/depends.txt b/mesecons_extrawires/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_extrawires/init.lua b/mesecons_extrawires/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_extrawires/mesewire.lua b/mesecons_extrawires/mesewire.lua old mode 100644 new mode 100755 diff --git a/mesecons_extrawires/tjunction.lua b/mesecons_extrawires/tjunction.lua old mode 100644 new mode 100755 index 1091e83..51820ee --- a/mesecons_extrawires/tjunction.lua +++ b/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/mesecons_extrawires/vertical.lua b/mesecons_extrawires/vertical.lua old mode 100644 new mode 100755 index f3232d8..ec522f5 --- a/mesecons_extrawires/vertical.lua +++ b/mesecons_extrawires/vertical.lua @@ -90,7 +90,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 mesecons = {conductor = { state = mesecon.state.off, onstate = "mesecons_extrawires:vertical_on", @@ -98,7 +98,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 mesecons = {conductor = { state = mesecon.state.on, offstate = "mesecons_extrawires:vertical_off", @@ -113,7 +113,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/mesecons_gates/depends.txt b/mesecons_gates/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_gates/init.lua b/mesecons_gates/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_gates/textures/jeija_gate_and.png b/mesecons_gates/textures/jeija_gate_and.png old mode 100644 new mode 100755 index 0ddc043..9fb6424 Binary files a/mesecons_gates/textures/jeija_gate_and.png and b/mesecons_gates/textures/jeija_gate_and.png differ diff --git a/mesecons_gates/textures/jeija_gate_diode.png b/mesecons_gates/textures/jeija_gate_diode.png old mode 100644 new mode 100755 index ffa403f..259f5dc Binary files a/mesecons_gates/textures/jeija_gate_diode.png and b/mesecons_gates/textures/jeija_gate_diode.png differ diff --git a/mesecons_gates/textures/jeija_gate_nand.png b/mesecons_gates/textures/jeija_gate_nand.png old mode 100644 new mode 100755 index 0e4294e..9fb065d Binary files a/mesecons_gates/textures/jeija_gate_nand.png and b/mesecons_gates/textures/jeija_gate_nand.png differ diff --git a/mesecons_gates/textures/jeija_gate_nor.png b/mesecons_gates/textures/jeija_gate_nor.png index c4298e3..c4218bc 100644 Binary files a/mesecons_gates/textures/jeija_gate_nor.png and b/mesecons_gates/textures/jeija_gate_nor.png differ diff --git a/mesecons_gates/textures/jeija_gate_not.png b/mesecons_gates/textures/jeija_gate_not.png old mode 100644 new mode 100755 index 939fb76..1e13d93 Binary files a/mesecons_gates/textures/jeija_gate_not.png and b/mesecons_gates/textures/jeija_gate_not.png differ diff --git a/mesecons_gates/textures/jeija_gate_off.png b/mesecons_gates/textures/jeija_gate_off.png old mode 100644 new mode 100755 index 44017b0..88e12d8 Binary files a/mesecons_gates/textures/jeija_gate_off.png and b/mesecons_gates/textures/jeija_gate_off.png differ diff --git a/mesecons_gates/textures/jeija_gate_on.png b/mesecons_gates/textures/jeija_gate_on.png old mode 100644 new mode 100755 index 47028a8..82d02b7 Binary files a/mesecons_gates/textures/jeija_gate_on.png and b/mesecons_gates/textures/jeija_gate_on.png differ diff --git a/mesecons_gates/textures/jeija_gate_or.png b/mesecons_gates/textures/jeija_gate_or.png index 09f0661..7977794 100644 Binary files a/mesecons_gates/textures/jeija_gate_or.png and b/mesecons_gates/textures/jeija_gate_or.png differ diff --git a/mesecons_gates/textures/jeija_gate_xor.png b/mesecons_gates/textures/jeija_gate_xor.png old mode 100644 new mode 100755 index afbd6ab..82fdeb1 Binary files a/mesecons_gates/textures/jeija_gate_xor.png and b/mesecons_gates/textures/jeija_gate_xor.png differ diff --git a/mesecons_hydroturbine/depends.txt b/mesecons_hydroturbine/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_hydroturbine/init.lua b/mesecons_hydroturbine/init.lua old mode 100644 new mode 100755 index f1292e9..acc9a97 --- a/mesecons_hydroturbine/init.lua +++ b/mesecons_hydroturbine/init.lua @@ -59,7 +59,7 @@ nodenames = {"mesecons_hydroturbine:hydro_turbine_off"}, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) local waterpos={x=pos.x, y=pos.y+1, z=pos.z} - if minetest.get_node(waterpos).name=="default:water_flowing" then + if minetest.get_node(waterpos).name=="default:water_flowing" or minetest.get_node(waterpos).name == "default:river_water_flowing" then minetest.set_node(pos, {name="mesecons_hydroturbine:hydro_turbine_on"}) nodeupdate(pos) mesecon.receptor_on(pos) @@ -73,7 +73,7 @@ nodenames = {"mesecons_hydroturbine:hydro_turbine_on"}, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) local waterpos={x=pos.x, y=pos.y+1, z=pos.z} - if minetest.get_node(waterpos).name~="default:water_flowing" then + if minetest.get_node(waterpos).name~="default:water_flowing" or minetest.get_node(waterpos).name ~= "default:river_water_flowing" then minetest.set_node(pos, {name="mesecons_hydroturbine:hydro_turbine_off"}) nodeupdate(pos) mesecon.receptor_off(pos) diff --git a/mesecons_hydroturbine/models/jeija_hydro_turbine.obj b/mesecons_hydroturbine/models/jeija_hydro_turbine.obj old mode 100644 new mode 100755 diff --git a/mesecons_hydroturbine/textures/jeija_hydro_turbine_inv.png b/mesecons_hydroturbine/textures/jeija_hydro_turbine_inv.png old mode 100644 new mode 100755 index 4cc9f20..8c2cfcd Binary files a/mesecons_hydroturbine/textures/jeija_hydro_turbine_inv.png and b/mesecons_hydroturbine/textures/jeija_hydro_turbine_inv.png differ diff --git a/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_off.png b/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_off.png old mode 100644 new mode 100755 index 89975e8..6e12834 Binary files a/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_off.png and b/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_off.png differ diff --git a/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_on.png b/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_on.png old mode 100644 new mode 100755 index 759388a..c8a2f39 Binary files a/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_on.png and b/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_on.png differ diff --git a/mesecons_hydroturbine/textures/jeija_hydro_turbine_top_bottom.png b/mesecons_hydroturbine/textures/jeija_hydro_turbine_top_bottom.png old mode 100644 new mode 100755 diff --git a/mesecons_hydroturbine/textures/jeija_hydro_turbine_turbine_misc.png b/mesecons_hydroturbine/textures/jeija_hydro_turbine_turbine_misc.png old mode 100644 new mode 100755 index 45a720b..c6ed54d Binary files a/mesecons_hydroturbine/textures/jeija_hydro_turbine_turbine_misc.png and b/mesecons_hydroturbine/textures/jeija_hydro_turbine_turbine_misc.png differ diff --git a/mesecons_hydroturbine/textures/jeija_hydro_turbine_turbine_top_bottom.png b/mesecons_hydroturbine/textures/jeija_hydro_turbine_turbine_top_bottom.png old mode 100644 new mode 100755 diff --git a/mesecons_insulated/depends.txt b/mesecons_insulated/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_insulated/init.lua b/mesecons_insulated/init.lua old mode 100644 new mode 100755 index c6fc05e..569c502 --- a/mesecons_insulated/init.lua +++ b/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", diff --git a/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_01.png b/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_01.png old mode 100644 new mode 100755 index d872b2b..db63d21 Binary files a/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_01.png and b/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_01.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_10.png b/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_10.png old mode 100644 new mode 100755 index ae06dea..8f4d13a Binary files a/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_10.png and b/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_10.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_off.png b/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_off.png old mode 100644 new mode 100755 index 41b5ff4..89d8d0c Binary files a/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_off.png and b/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_off.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_on.png b/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_on.png old mode 100644 new mode 100755 index 154288b..94594a0 Binary files a/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_on.png and b/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_on.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_off.png b/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_off.png old mode 100644 new mode 100755 index 85ca90b..dcc96c7 Binary files a/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_off.png and b/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_off.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_on.png b/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_on.png old mode 100644 new mode 100755 index 772d9a6..321f931 Binary files a/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_on.png and b/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_on.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_ends_01x.png b/mesecons_insulated/textures/jeija_insulated_wire_ends_01x.png old mode 100644 new mode 100755 index b742152..609c3ae Binary files a/mesecons_insulated/textures/jeija_insulated_wire_ends_01x.png and b/mesecons_insulated/textures/jeija_insulated_wire_ends_01x.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_ends_01z.png b/mesecons_insulated/textures/jeija_insulated_wire_ends_01z.png old mode 100644 new mode 100755 index 497a467..e0bbcad Binary files a/mesecons_insulated/textures/jeija_insulated_wire_ends_01z.png and b/mesecons_insulated/textures/jeija_insulated_wire_ends_01z.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_ends_10x.png b/mesecons_insulated/textures/jeija_insulated_wire_ends_10x.png old mode 100644 new mode 100755 index d407cff..8bc7b30 Binary files a/mesecons_insulated/textures/jeija_insulated_wire_ends_10x.png and b/mesecons_insulated/textures/jeija_insulated_wire_ends_10x.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_ends_10z.png b/mesecons_insulated/textures/jeija_insulated_wire_ends_10z.png old mode 100644 new mode 100755 index 830d390..cc030ab Binary files a/mesecons_insulated/textures/jeija_insulated_wire_ends_10z.png and b/mesecons_insulated/textures/jeija_insulated_wire_ends_10z.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_ends_off.png b/mesecons_insulated/textures/jeija_insulated_wire_ends_off.png old mode 100644 new mode 100755 index 89a8385..815cbdc Binary files a/mesecons_insulated/textures/jeija_insulated_wire_ends_off.png and b/mesecons_insulated/textures/jeija_insulated_wire_ends_off.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_ends_on.png b/mesecons_insulated/textures/jeija_insulated_wire_ends_on.png old mode 100644 new mode 100755 index 75cf435..5251b9e Binary files a/mesecons_insulated/textures/jeija_insulated_wire_ends_on.png and b/mesecons_insulated/textures/jeija_insulated_wire_ends_on.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_sides_off.png b/mesecons_insulated/textures/jeija_insulated_wire_sides_off.png old mode 100644 new mode 100755 index db33f14..b5ec138 Binary files a/mesecons_insulated/textures/jeija_insulated_wire_sides_off.png and b/mesecons_insulated/textures/jeija_insulated_wire_sides_off.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_sides_on.png b/mesecons_insulated/textures/jeija_insulated_wire_sides_on.png old mode 100644 new mode 100755 index f76e9a8..3eaca60 Binary files a/mesecons_insulated/textures/jeija_insulated_wire_sides_on.png and b/mesecons_insulated/textures/jeija_insulated_wire_sides_on.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_off.png b/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_off.png old mode 100644 new mode 100755 index a897b29..451fbc2 Binary files a/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_off.png and b/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_off.png differ diff --git a/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_on.png b/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_on.png old mode 100644 new mode 100755 index 8fc312b..e30dad4 Binary files a/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_on.png and b/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_on.png differ diff --git a/mesecons_lamp/depends.txt b/mesecons_lamp/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_lamp/init.lua b/mesecons_lamp/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_lamp/textures/jeija_meselamp.png b/mesecons_lamp/textures/jeija_meselamp.png old mode 100644 new mode 100755 index 5456ee9..9312f41 Binary files a/mesecons_lamp/textures/jeija_meselamp.png and b/mesecons_lamp/textures/jeija_meselamp.png differ diff --git a/mesecons_lamp/textures/jeija_meselamp_off.png b/mesecons_lamp/textures/jeija_meselamp_off.png old mode 100644 new mode 100755 index 67bd7fd..be6ad5f Binary files a/mesecons_lamp/textures/jeija_meselamp_off.png and b/mesecons_lamp/textures/jeija_meselamp_off.png differ diff --git a/mesecons_lamp/textures/jeija_meselamp_on.png b/mesecons_lamp/textures/jeija_meselamp_on.png old mode 100644 new mode 100755 index 2316e00..26d7f17 Binary files a/mesecons_lamp/textures/jeija_meselamp_on.png and b/mesecons_lamp/textures/jeija_meselamp_on.png differ diff --git a/mesecons_lightstone/depends.txt b/mesecons_lightstone/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_lightstone/init.lua b/mesecons_lightstone/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_lightstone/textures/jeija_lightstone_blue_off.png b/mesecons_lightstone/textures/jeija_lightstone_blue_off.png old mode 100644 new mode 100755 index 09acc22..87f753c Binary files a/mesecons_lightstone/textures/jeija_lightstone_blue_off.png and b/mesecons_lightstone/textures/jeija_lightstone_blue_off.png differ diff --git a/mesecons_lightstone/textures/jeija_lightstone_blue_on.png b/mesecons_lightstone/textures/jeija_lightstone_blue_on.png old mode 100644 new mode 100755 index 93c8638..7723366 Binary files a/mesecons_lightstone/textures/jeija_lightstone_blue_on.png and b/mesecons_lightstone/textures/jeija_lightstone_blue_on.png differ diff --git a/mesecons_lightstone/textures/jeija_lightstone_darkgray_off.png b/mesecons_lightstone/textures/jeija_lightstone_darkgray_off.png old mode 100644 new mode 100755 index 7e5aae7..636789f Binary files a/mesecons_lightstone/textures/jeija_lightstone_darkgray_off.png and b/mesecons_lightstone/textures/jeija_lightstone_darkgray_off.png differ diff --git a/mesecons_lightstone/textures/jeija_lightstone_darkgray_on.png b/mesecons_lightstone/textures/jeija_lightstone_darkgray_on.png old mode 100644 new mode 100755 index e6d4d00..19d42c9 Binary files a/mesecons_lightstone/textures/jeija_lightstone_darkgray_on.png and b/mesecons_lightstone/textures/jeija_lightstone_darkgray_on.png differ diff --git a/mesecons_lightstone/textures/jeija_lightstone_gray_off.png b/mesecons_lightstone/textures/jeija_lightstone_gray_off.png old mode 100644 new mode 100755 index f168fc2..b7723f0 Binary files a/mesecons_lightstone/textures/jeija_lightstone_gray_off.png and b/mesecons_lightstone/textures/jeija_lightstone_gray_off.png differ diff --git a/mesecons_lightstone/textures/jeija_lightstone_gray_on.png b/mesecons_lightstone/textures/jeija_lightstone_gray_on.png old mode 100644 new mode 100755 index 24c5470..bcf140e Binary files a/mesecons_lightstone/textures/jeija_lightstone_gray_on.png and b/mesecons_lightstone/textures/jeija_lightstone_gray_on.png differ diff --git a/mesecons_lightstone/textures/jeija_lightstone_green_off.png b/mesecons_lightstone/textures/jeija_lightstone_green_off.png old mode 100644 new mode 100755 index 2f214fa..947365d Binary files a/mesecons_lightstone/textures/jeija_lightstone_green_off.png and b/mesecons_lightstone/textures/jeija_lightstone_green_off.png differ diff --git a/mesecons_lightstone/textures/jeija_lightstone_green_on.png b/mesecons_lightstone/textures/jeija_lightstone_green_on.png old mode 100644 new mode 100755 index 225bf4e..46f8b91 Binary files a/mesecons_lightstone/textures/jeija_lightstone_green_on.png and b/mesecons_lightstone/textures/jeija_lightstone_green_on.png differ diff --git a/mesecons_lightstone/textures/jeija_lightstone_red_off.png b/mesecons_lightstone/textures/jeija_lightstone_red_off.png old mode 100644 new mode 100755 index 3c828b2..85a6e21 Binary files a/mesecons_lightstone/textures/jeija_lightstone_red_off.png and b/mesecons_lightstone/textures/jeija_lightstone_red_off.png differ diff --git a/mesecons_lightstone/textures/jeija_lightstone_red_on.png b/mesecons_lightstone/textures/jeija_lightstone_red_on.png old mode 100644 new mode 100755 index 512b0fe..570536a Binary files a/mesecons_lightstone/textures/jeija_lightstone_red_on.png and b/mesecons_lightstone/textures/jeija_lightstone_red_on.png differ diff --git a/mesecons_lightstone/textures/jeija_lightstone_yellow_off.png b/mesecons_lightstone/textures/jeija_lightstone_yellow_off.png old mode 100644 new mode 100755 index 2e7fed0..5280e91 Binary files a/mesecons_lightstone/textures/jeija_lightstone_yellow_off.png and b/mesecons_lightstone/textures/jeija_lightstone_yellow_off.png differ diff --git a/mesecons_lightstone/textures/jeija_lightstone_yellow_on.png b/mesecons_lightstone/textures/jeija_lightstone_yellow_on.png old mode 100644 new mode 100755 index 8943aca..81a5657 Binary files a/mesecons_lightstone/textures/jeija_lightstone_yellow_on.png and b/mesecons_lightstone/textures/jeija_lightstone_yellow_on.png differ diff --git a/mesecons_luacontroller/depends.txt b/mesecons_luacontroller/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_luacontroller/init.lua b/mesecons_luacontroller/init.lua old mode 100644 new mode 100755 index 458286f..ff0f40a --- a/mesecons_luacontroller/init.lua +++ b/mesecons_luacontroller/init.lua @@ -273,7 +273,7 @@ end local function get_digiline_send(pos) - if not digiline then return end + if not rawget(_G, "digiline") then return end return function(channel, msg) minetest.after(0, function() digiline:receptor_send(pos, digiline.rules.default, channel, msg) diff --git a/mesecons_luacontroller/textures/jeija_luac_background.png b/mesecons_luacontroller/textures/jeija_luac_background.png index 40e316c..4b60832 100644 Binary files a/mesecons_luacontroller/textures/jeija_luac_background.png and b/mesecons_luacontroller/textures/jeija_luac_background.png differ diff --git a/mesecons_luacontroller/textures/jeija_luac_runbutton.png b/mesecons_luacontroller/textures/jeija_luac_runbutton.png old mode 100644 new mode 100755 index 157507f..df9c42d Binary files a/mesecons_luacontroller/textures/jeija_luac_runbutton.png and b/mesecons_luacontroller/textures/jeija_luac_runbutton.png differ diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png old mode 100644 new mode 100755 index a187e8e..78d05ef Binary files a/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png and b/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png differ diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png old mode 100644 new mode 100755 index 738ba96..a4a1fe2 Binary files a/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png and b/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png differ diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png old mode 100644 new mode 100755 index abe0fe6..4dc57c2 Binary files a/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png and b/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png differ diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png old mode 100644 new mode 100755 index cc10170..a67f36f Binary files a/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png and b/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png differ diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_burnt_top.png b/mesecons_luacontroller/textures/jeija_luacontroller_burnt_top.png index d1a17af..7fa6c50 100644 Binary files a/mesecons_luacontroller/textures/jeija_luacontroller_burnt_top.png and b/mesecons_luacontroller/textures/jeija_luacontroller_burnt_top.png differ diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_top.png b/mesecons_luacontroller/textures/jeija_luacontroller_top.png old mode 100644 new mode 100755 index 3128230..7c51579 Binary files a/mesecons_luacontroller/textures/jeija_luacontroller_top.png and b/mesecons_luacontroller/textures/jeija_luacontroller_top.png differ diff --git a/mesecons_materials/depends.txt b/mesecons_materials/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_materials/init.lua b/mesecons_materials/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_materials/textures/mesecons_fiber.png b/mesecons_materials/textures/mesecons_fiber.png index e8c7b08..bca4c2c 100644 Binary files a/mesecons_materials/textures/mesecons_fiber.png and b/mesecons_materials/textures/mesecons_fiber.png differ diff --git a/mesecons_materials/textures/mesecons_silicon.png b/mesecons_materials/textures/mesecons_silicon.png index a7b0d52..4553b9f 100644 Binary files a/mesecons_materials/textures/mesecons_silicon.png and b/mesecons_materials/textures/mesecons_silicon.png differ diff --git a/mesecons_microcontroller/depends.txt b/mesecons_microcontroller/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_microcontroller/init.lua b/mesecons_microcontroller/init.lua old mode 100644 new mode 100755 index 6778a10..66265b9 --- a/mesecons_microcontroller/init.lua +++ b/mesecons_microcontroller/init.lua @@ -145,8 +145,8 @@ end minetest.register_craft({ output = 'craft "mesecons_microcontroller:microcontroller0000" 2', recipe = { - {'mesecons_materials:silicon', 'mesecons_materials:silicon', 'group:mesecon_conductor_craftable'}, - {'mesecons_materials:silicon', 'mesecons_materials:silicon', 'group:mesecon_conductor_craftable'}, + {'group:mesecon_conductor_craftable', 'group:mesecon_conductor_craftable', ''}, + {'mesecons_materials:silicon', 'mesecons_materials:silicon', ''}, {'group:mesecon_conductor_craftable', 'group:mesecon_conductor_craftable', ''}, } }) diff --git a/mesecons_microcontroller/textures/jeija_microcontroller_LED_A.png b/mesecons_microcontroller/textures/jeija_microcontroller_LED_A.png old mode 100644 new mode 100755 index 64526cf..78d05ef Binary files a/mesecons_microcontroller/textures/jeija_microcontroller_LED_A.png and b/mesecons_microcontroller/textures/jeija_microcontroller_LED_A.png differ diff --git a/mesecons_microcontroller/textures/jeija_microcontroller_LED_B.png b/mesecons_microcontroller/textures/jeija_microcontroller_LED_B.png old mode 100644 new mode 100755 index 1f7b451..a4a1fe2 Binary files a/mesecons_microcontroller/textures/jeija_microcontroller_LED_B.png and b/mesecons_microcontroller/textures/jeija_microcontroller_LED_B.png differ diff --git a/mesecons_microcontroller/textures/jeija_microcontroller_LED_C.png b/mesecons_microcontroller/textures/jeija_microcontroller_LED_C.png old mode 100644 new mode 100755 index 399cc2c..4dc57c2 Binary files a/mesecons_microcontroller/textures/jeija_microcontroller_LED_C.png and b/mesecons_microcontroller/textures/jeija_microcontroller_LED_C.png differ diff --git a/mesecons_microcontroller/textures/jeija_microcontroller_LED_D.png b/mesecons_microcontroller/textures/jeija_microcontroller_LED_D.png old mode 100644 new mode 100755 index 506389c..a67f36f Binary files a/mesecons_microcontroller/textures/jeija_microcontroller_LED_D.png and b/mesecons_microcontroller/textures/jeija_microcontroller_LED_D.png differ diff --git a/mesecons_microcontroller/textures/jeija_microcontroller_bottom.png b/mesecons_microcontroller/textures/jeija_microcontroller_bottom.png old mode 100644 new mode 100755 index 3a9161e..6ad3edd Binary files a/mesecons_microcontroller/textures/jeija_microcontroller_bottom.png and b/mesecons_microcontroller/textures/jeija_microcontroller_bottom.png differ diff --git a/mesecons_microcontroller/textures/jeija_microcontroller_sides.png b/mesecons_microcontroller/textures/jeija_microcontroller_sides.png old mode 100644 new mode 100755 index b367644..649906f Binary files a/mesecons_microcontroller/textures/jeija_microcontroller_sides.png and b/mesecons_microcontroller/textures/jeija_microcontroller_sides.png differ diff --git a/mesecons_microcontroller/textures/jeija_microcontroller_top.png b/mesecons_microcontroller/textures/jeija_microcontroller_top.png old mode 100644 new mode 100755 index 438c934..6591207 Binary files a/mesecons_microcontroller/textures/jeija_microcontroller_top.png and b/mesecons_microcontroller/textures/jeija_microcontroller_top.png differ diff --git a/mesecons_movestones/depends.txt b/mesecons_movestones/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_movestones/init.lua b/mesecons_movestones/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_movestones/textures/jeija_movestone_arrows.png b/mesecons_movestones/textures/jeija_movestone_arrows.png old mode 100644 new mode 100755 diff --git a/mesecons_movestones/textures/jeija_movestone_side.png b/mesecons_movestones/textures/jeija_movestone_side.png old mode 100644 new mode 100755 index de753ef..1830bfe Binary files a/mesecons_movestones/textures/jeija_movestone_side.png and b/mesecons_movestones/textures/jeija_movestone_side.png differ diff --git a/mesecons_movestones/textures/jeija_sticky_movestone.png b/mesecons_movestones/textures/jeija_sticky_movestone.png old mode 100644 new mode 100755 index 8953cf1..e15eab8 Binary files a/mesecons_movestones/textures/jeija_sticky_movestone.png and b/mesecons_movestones/textures/jeija_sticky_movestone.png differ diff --git a/mesecons_mvps/depends.txt b/mesecons_mvps/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_mvps/init.lua b/mesecons_mvps/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_noteblock/depends.txt b/mesecons_noteblock/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_noteblock/init.lua b/mesecons_noteblock/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_pistons/depends.txt b/mesecons_pistons/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_pistons/init.lua b/mesecons_pistons/init.lua old mode 100644 new mode 100755 index 474f621..52b9c6e --- a/mesecons_pistons/init.lua +++ b/mesecons_pistons/init.lua @@ -723,7 +723,7 @@ local piston_up_down_get_stopper = function (node, dir, stack, stackid) end local piston_get_stopper = function (node, dir, stack, stackid) - pistonspec = minetest.registered_nodes[node.name].mesecons_piston + local pistonspec = minetest.registered_nodes[node.name].mesecons_piston dir = piston_get_direction(pistonspec.dir, node) local pusherpos = vector.add(stack[stackid].pos, dir) local pushernode = minetest.get_node(pusherpos) diff --git a/mesecons_pistons/sounds/piston_extend.ogg b/mesecons_pistons/sounds/piston_extend.ogg old mode 100644 new mode 100755 index e234ad9..07afe54 Binary files a/mesecons_pistons/sounds/piston_extend.ogg and b/mesecons_pistons/sounds/piston_extend.ogg differ diff --git a/mesecons_pistons/sounds/piston_retract.ogg b/mesecons_pistons/sounds/piston_retract.ogg old mode 100644 new mode 100755 index feb9f04..efb4c39 Binary files a/mesecons_pistons/sounds/piston_retract.ogg and b/mesecons_pistons/sounds/piston_retract.ogg differ diff --git a/mesecons_pistons/textures/mesecons_piston_back.png b/mesecons_pistons/textures/mesecons_piston_back.png old mode 100644 new mode 100755 diff --git a/mesecons_pistons/textures/mesecons_piston_bottom.png b/mesecons_pistons/textures/mesecons_piston_bottom.png old mode 100644 new mode 100755 index 5a3af9b..e27b604 Binary files a/mesecons_pistons/textures/mesecons_piston_bottom.png and b/mesecons_pistons/textures/mesecons_piston_bottom.png differ diff --git a/mesecons_pistons/textures/mesecons_piston_left.png b/mesecons_pistons/textures/mesecons_piston_left.png old mode 100644 new mode 100755 index 215dd73..d076d16 Binary files a/mesecons_pistons/textures/mesecons_piston_left.png and b/mesecons_pistons/textures/mesecons_piston_left.png differ diff --git a/mesecons_pistons/textures/mesecons_piston_on_front.png b/mesecons_pistons/textures/mesecons_piston_on_front.png old mode 100644 new mode 100755 diff --git a/mesecons_pistons/textures/mesecons_piston_pusher_back.png b/mesecons_pistons/textures/mesecons_piston_pusher_back.png old mode 100644 new mode 100755 diff --git a/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png b/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png old mode 100644 new mode 100755 index 87c4e81..caf4989 Binary files a/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png and b/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png differ diff --git a/mesecons_pistons/textures/mesecons_piston_pusher_front.png b/mesecons_pistons/textures/mesecons_piston_pusher_front.png old mode 100644 new mode 100755 diff --git a/mesecons_pistons/textures/mesecons_piston_pusher_front_sticky.png b/mesecons_pistons/textures/mesecons_piston_pusher_front_sticky.png old mode 100644 new mode 100755 diff --git a/mesecons_pistons/textures/mesecons_piston_pusher_left.png b/mesecons_pistons/textures/mesecons_piston_pusher_left.png old mode 100644 new mode 100755 index bc5495b..b7f9daa Binary files a/mesecons_pistons/textures/mesecons_piston_pusher_left.png and b/mesecons_pistons/textures/mesecons_piston_pusher_left.png differ diff --git a/mesecons_pistons/textures/mesecons_piston_pusher_right.png b/mesecons_pistons/textures/mesecons_piston_pusher_right.png old mode 100644 new mode 100755 index 32ee32f..2a8421d Binary files a/mesecons_pistons/textures/mesecons_piston_pusher_right.png and b/mesecons_pistons/textures/mesecons_piston_pusher_right.png differ diff --git a/mesecons_pistons/textures/mesecons_piston_pusher_top.png b/mesecons_pistons/textures/mesecons_piston_pusher_top.png old mode 100644 new mode 100755 index 72f04e9..7d55459 Binary files a/mesecons_pistons/textures/mesecons_piston_pusher_top.png and b/mesecons_pistons/textures/mesecons_piston_pusher_top.png differ diff --git a/mesecons_pistons/textures/mesecons_piston_right.png b/mesecons_pistons/textures/mesecons_piston_right.png old mode 100644 new mode 100755 index 176463c..a62ff20 Binary files a/mesecons_pistons/textures/mesecons_piston_right.png and b/mesecons_pistons/textures/mesecons_piston_right.png differ diff --git a/mesecons_pistons/textures/mesecons_piston_top.png b/mesecons_pistons/textures/mesecons_piston_top.png old mode 100644 new mode 100755 index 5c8bace..5cc2697 Binary files a/mesecons_pistons/textures/mesecons_piston_top.png and b/mesecons_pistons/textures/mesecons_piston_top.png differ diff --git a/mesecons_powerplant/depends.txt b/mesecons_powerplant/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_powerplant/init.lua b/mesecons_powerplant/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_powerplant/textures/jeija_power_plant.png b/mesecons_powerplant/textures/jeija_power_plant.png old mode 100644 new mode 100755 index edc8891..d4297fc Binary files a/mesecons_powerplant/textures/jeija_power_plant.png and b/mesecons_powerplant/textures/jeija_power_plant.png differ diff --git a/mesecons_pressureplates/depends.txt b/mesecons_pressureplates/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_pressureplates/init.lua b/mesecons_pressureplates/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_pressureplates/textures/jeija_pressure_plate_stone_inv.png b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_inv.png old mode 100644 new mode 100755 diff --git a/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off.png b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off.png old mode 100644 new mode 100755 diff --git a/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off_edges.png b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off_edges.png old mode 100644 new mode 100755 diff --git a/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on.png b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on.png old mode 100644 new mode 100755 diff --git a/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on_edges.png b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on_edges.png old mode 100644 new mode 100755 index 51add95..aec9df2 Binary files a/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on_edges.png and b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on_edges.png differ diff --git a/mesecons_pressureplates/textures/jeija_pressure_plate_stone_wield.png b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_wield.png old mode 100644 new mode 100755 diff --git a/mesecons_pressureplates/textures/jeija_pressure_plate_wood_inv.png b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_inv.png old mode 100644 new mode 100755 diff --git a/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off.png b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off.png old mode 100644 new mode 100755 diff --git a/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off_edges.png b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off_edges.png old mode 100644 new mode 100755 diff --git a/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on.png b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on.png old mode 100644 new mode 100755 diff --git a/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on_edges.png b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on_edges.png old mode 100644 new mode 100755 index 358f2ea..5977e01 Binary files a/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on_edges.png and b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on_edges.png differ diff --git a/mesecons_pressureplates/textures/jeija_pressure_plate_wood_wield.png b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_wield.png old mode 100644 new mode 100755 diff --git a/mesecons_random/depends.txt b/mesecons_random/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_random/init.lua b/mesecons_random/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_random/textures/jeija_ghoststone.png b/mesecons_random/textures/jeija_ghoststone.png old mode 100644 new mode 100755 diff --git a/mesecons_random/textures/jeija_ghoststone_inv.png b/mesecons_random/textures/jeija_ghoststone_inv.png old mode 100644 new mode 100755 index c715d7f..05f2a60 Binary files a/mesecons_random/textures/jeija_ghoststone_inv.png and b/mesecons_random/textures/jeija_ghoststone_inv.png differ diff --git a/mesecons_random/textures/jeija_removestone.png b/mesecons_random/textures/jeija_removestone.png old mode 100644 new mode 100755 diff --git a/mesecons_random/textures/jeija_removestone_inv.png b/mesecons_random/textures/jeija_removestone_inv.png old mode 100644 new mode 100755 index c715d7f..05f2a60 Binary files a/mesecons_random/textures/jeija_removestone_inv.png and b/mesecons_random/textures/jeija_removestone_inv.png differ diff --git a/mesecons_receiver/depends.txt b/mesecons_receiver/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_receiver/init.lua b/mesecons_receiver/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_receiver/textures/receiver_bottom_off.png b/mesecons_receiver/textures/receiver_bottom_off.png old mode 100644 new mode 100755 index b95903e..3e9a475 Binary files a/mesecons_receiver/textures/receiver_bottom_off.png and b/mesecons_receiver/textures/receiver_bottom_off.png differ diff --git a/mesecons_receiver/textures/receiver_bottom_on.png b/mesecons_receiver/textures/receiver_bottom_on.png old mode 100644 new mode 100755 index d0b7006..fcaddee Binary files a/mesecons_receiver/textures/receiver_bottom_on.png and b/mesecons_receiver/textures/receiver_bottom_on.png differ diff --git a/mesecons_receiver/textures/receiver_fb_off.png b/mesecons_receiver/textures/receiver_fb_off.png old mode 100644 new mode 100755 index aed3008..3e9a475 Binary files a/mesecons_receiver/textures/receiver_fb_off.png and b/mesecons_receiver/textures/receiver_fb_off.png differ diff --git a/mesecons_receiver/textures/receiver_fb_on.png b/mesecons_receiver/textures/receiver_fb_on.png old mode 100644 new mode 100755 index 0916736..fcaddee Binary files a/mesecons_receiver/textures/receiver_fb_on.png and b/mesecons_receiver/textures/receiver_fb_on.png differ diff --git a/mesecons_receiver/textures/receiver_lr_off.png b/mesecons_receiver/textures/receiver_lr_off.png old mode 100644 new mode 100755 index 1fb2b3a..3e9a475 Binary files a/mesecons_receiver/textures/receiver_lr_off.png and b/mesecons_receiver/textures/receiver_lr_off.png differ diff --git a/mesecons_receiver/textures/receiver_lr_on.png b/mesecons_receiver/textures/receiver_lr_on.png old mode 100644 new mode 100755 index 087c0b4..fcaddee Binary files a/mesecons_receiver/textures/receiver_lr_on.png and b/mesecons_receiver/textures/receiver_lr_on.png differ diff --git a/mesecons_receiver/textures/receiver_top_off.png b/mesecons_receiver/textures/receiver_top_off.png old mode 100644 new mode 100755 index ae50106..3e9a475 Binary files a/mesecons_receiver/textures/receiver_top_off.png and b/mesecons_receiver/textures/receiver_top_off.png differ diff --git a/mesecons_receiver/textures/receiver_top_on.png b/mesecons_receiver/textures/receiver_top_on.png old mode 100644 new mode 100755 index 5b48cac..fcaddee Binary files a/mesecons_receiver/textures/receiver_top_on.png and b/mesecons_receiver/textures/receiver_top_on.png differ diff --git a/mesecons_solarpanel/depends.txt b/mesecons_solarpanel/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_solarpanel/init.lua b/mesecons_solarpanel/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_solarpanel/textures/jeija_solar_panel.png b/mesecons_solarpanel/textures/jeija_solar_panel.png old mode 100644 new mode 100755 diff --git a/mesecons_stickyblocks/depends.txt b/mesecons_stickyblocks/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_stickyblocks/init.lua b/mesecons_stickyblocks/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_switch/depends.txt b/mesecons_switch/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_switch/init.lua b/mesecons_switch/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_switch/sounds/mesecons_switch.ogg b/mesecons_switch/sounds/mesecons_switch.ogg old mode 100644 new mode 100755 index 53d45c1..6964c99 Binary files a/mesecons_switch/sounds/mesecons_switch.ogg and b/mesecons_switch/sounds/mesecons_switch.ogg differ diff --git a/mesecons_switch/textures/mesecons_switch_off.png b/mesecons_switch/textures/mesecons_switch_off.png index 2a75ef3..1dd77ea 100644 Binary files a/mesecons_switch/textures/mesecons_switch_off.png and b/mesecons_switch/textures/mesecons_switch_off.png differ diff --git a/mesecons_switch/textures/mesecons_switch_on.png b/mesecons_switch/textures/mesecons_switch_on.png index 9df3450..1476ad2 100644 Binary files a/mesecons_switch/textures/mesecons_switch_on.png and b/mesecons_switch/textures/mesecons_switch_on.png differ diff --git a/mesecons_switch/textures/mesecons_switch_side.png b/mesecons_switch/textures/mesecons_switch_side.png index fb5db33..b5aea8d 100644 Binary files a/mesecons_switch/textures/mesecons_switch_side.png and b/mesecons_switch/textures/mesecons_switch_side.png differ diff --git a/mesecons_torch/depends.txt b/mesecons_torch/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_torch/init.lua b/mesecons_torch/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_torch/textures/jeija_torches_off.png b/mesecons_torch/textures/jeija_torches_off.png old mode 100644 new mode 100755 index 537920c..6be3464 Binary files a/mesecons_torch/textures/jeija_torches_off.png and b/mesecons_torch/textures/jeija_torches_off.png differ diff --git a/mesecons_torch/textures/jeija_torches_off_ceiling.png b/mesecons_torch/textures/jeija_torches_off_ceiling.png old mode 100644 new mode 100755 index 3934e6e..dbf0e83 Binary files a/mesecons_torch/textures/jeija_torches_off_ceiling.png and b/mesecons_torch/textures/jeija_torches_off_ceiling.png differ diff --git a/mesecons_torch/textures/jeija_torches_off_side.png b/mesecons_torch/textures/jeija_torches_off_side.png old mode 100644 new mode 100755 index ecb2951..c6e4f0b Binary files a/mesecons_torch/textures/jeija_torches_off_side.png and b/mesecons_torch/textures/jeija_torches_off_side.png differ diff --git a/mesecons_torch/textures/jeija_torches_on.png b/mesecons_torch/textures/jeija_torches_on.png old mode 100644 new mode 100755 index a93dcc2..d967b2f Binary files a/mesecons_torch/textures/jeija_torches_on.png and b/mesecons_torch/textures/jeija_torches_on.png differ diff --git a/mesecons_torch/textures/jeija_torches_on_ceiling.png b/mesecons_torch/textures/jeija_torches_on_ceiling.png old mode 100644 new mode 100755 index 24fe201..2004151 Binary files a/mesecons_torch/textures/jeija_torches_on_ceiling.png and b/mesecons_torch/textures/jeija_torches_on_ceiling.png differ diff --git a/mesecons_torch/textures/jeija_torches_on_side.png b/mesecons_torch/textures/jeija_torches_on_side.png old mode 100644 new mode 100755 index fe7dfd2..ab792ee Binary files a/mesecons_torch/textures/jeija_torches_on_side.png and b/mesecons_torch/textures/jeija_torches_on_side.png differ diff --git a/mesecons_walllever/depends.txt b/mesecons_walllever/depends.txt old mode 100644 new mode 100755 diff --git a/mesecons_walllever/init.lua b/mesecons_walllever/init.lua old mode 100644 new mode 100755 diff --git a/mesecons_walllever/models/jeija_wall_lever_off.obj b/mesecons_walllever/models/jeija_wall_lever_off.obj old mode 100644 new mode 100755 diff --git a/mesecons_walllever/models/jeija_wall_lever_on.obj b/mesecons_walllever/models/jeija_wall_lever_on.obj old mode 100644 new mode 100755 diff --git a/mesecons_walllever/sounds/mesecons_lever.ogg b/mesecons_walllever/sounds/mesecons_lever.ogg old mode 100644 new mode 100755 index 53d45c1..250a7e8 Binary files a/mesecons_walllever/sounds/mesecons_lever.ogg and b/mesecons_walllever/sounds/mesecons_lever.ogg differ diff --git a/mesecons_walllever/textures/jeija_wall_lever_back_edges.png b/mesecons_walllever/textures/jeija_wall_lever_back_edges.png index 936b454..edc331f 100644 Binary files a/mesecons_walllever/textures/jeija_wall_lever_back_edges.png and b/mesecons_walllever/textures/jeija_wall_lever_back_edges.png differ diff --git a/mesecons_walllever/textures/jeija_wall_lever_front.png b/mesecons_walllever/textures/jeija_wall_lever_front.png index 1bd747a..c7987ee 100644 Binary files a/mesecons_walllever/textures/jeija_wall_lever_front.png and b/mesecons_walllever/textures/jeija_wall_lever_front.png differ diff --git a/mesecons_walllever/textures/jeija_wall_lever_front_bump.png b/mesecons_walllever/textures/jeija_wall_lever_front_bump.png index 5c2a88a..3b80d7a 100644 Binary files a/mesecons_walllever/textures/jeija_wall_lever_front_bump.png and b/mesecons_walllever/textures/jeija_wall_lever_front_bump.png differ diff --git a/mesecons_walllever/textures/jeija_wall_lever_inv.png b/mesecons_walllever/textures/jeija_wall_lever_inv.png index 474f8c1..4c75084 100644 Binary files a/mesecons_walllever/textures/jeija_wall_lever_inv.png and b/mesecons_walllever/textures/jeija_wall_lever_inv.png differ diff --git a/mesecons_walllever/textures/jeija_wall_lever_lever_light_off.png b/mesecons_walllever/textures/jeija_wall_lever_lever_light_off.png index 2b47c7d..24f4179 100644 Binary files a/mesecons_walllever/textures/jeija_wall_lever_lever_light_off.png and b/mesecons_walllever/textures/jeija_wall_lever_lever_light_off.png differ diff --git a/mesecons_walllever/textures/jeija_wall_lever_lever_light_on.png b/mesecons_walllever/textures/jeija_wall_lever_lever_light_on.png index 83b83a0..746227f 100644 Binary files a/mesecons_walllever/textures/jeija_wall_lever_lever_light_on.png and b/mesecons_walllever/textures/jeija_wall_lever_lever_light_on.png differ diff --git a/modpack.txt b/modpack.txt old mode 100644 new mode 100755