diff --git a/mods/mesecons/COPYING.txt b/mods/mesecons/COPYING.txt new file mode 100644 index 00000000..61bf7e2a --- /dev/null +++ b/mods/mesecons/COPYING.txt @@ -0,0 +1,30 @@ +The Mesecons Mod for Minetest is + Copyright (C) 2011-2016 Mesecons Mod Developer Team and contributors + +See the version control system log for information about other authors. + +License of source code +---------------------- +Copyright (C) 2011-2016 Mesecons Mod Developer Team and contributors + +This program is free software; you can redistribute the Mesecons Mod and/or +modify it under the terms of the GNU Lesser General Public License version 3 +published by the Free Software Foundation. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with this library; if not, write to the +Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +Boston, MA 02110-1301, USA. + +License of media (textures, sounds and documentation) +----------------------------------------------------- +Copyright (C) 2011-2016 Mesecons Mod Developer Team and contributors + +All textures, sounds and documentation files are licensed under the +Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/mods/mesecons/mesecons/doc/mesecon/preview.png b/mods/mesecons/mesecons/doc/mesecon/preview.png old mode 100644 new mode 100755 index 88255c2d..f81e5cb2 Binary files a/mods/mesecons/mesecons/doc/mesecon/preview.png and b/mods/mesecons/mesecons/doc/mesecon/preview.png differ diff --git a/mods/mesecons/mesecons/doc/mesecon/recipe.png b/mods/mesecons/mesecons/doc/mesecon/recipe.png index c248e009..72f92108 100644 Binary files a/mods/mesecons/mesecons/doc/mesecon/recipe.png and b/mods/mesecons/mesecons/doc/mesecon/recipe.png differ diff --git a/mods/mesecons/mesecons_blinkyplant/doc/blinkyplant/preview.png b/mods/mesecons/mesecons_blinkyplant/doc/blinkyplant/preview.png old mode 100644 new mode 100755 index 48da42bf..40ce5b51 Binary files a/mods/mesecons/mesecons_blinkyplant/doc/blinkyplant/preview.png and b/mods/mesecons/mesecons_blinkyplant/doc/blinkyplant/preview.png differ diff --git a/mods/mesecons/mesecons_blinkyplant/doc/blinkyplant/recipe.png b/mods/mesecons/mesecons_blinkyplant/doc/blinkyplant/recipe.png index d724fa49..6f1e1484 100644 Binary files a/mods/mesecons/mesecons_blinkyplant/doc/blinkyplant/recipe.png and b/mods/mesecons/mesecons_blinkyplant/doc/blinkyplant/recipe.png differ diff --git a/mods/mesecons/mesecons_button/doc/button/preview.png b/mods/mesecons/mesecons_button/doc/button/preview.png index 0f5d66e8..b69f8f4f 100644 Binary files a/mods/mesecons/mesecons_button/doc/button/preview.png and b/mods/mesecons/mesecons_button/doc/button/preview.png differ diff --git a/mods/mesecons/mesecons_button/doc/button/recipe.png b/mods/mesecons/mesecons_button/doc/button/recipe.png index 7194b3d5..c6232b48 100644 Binary files a/mods/mesecons/mesecons_button/doc/button/recipe.png and b/mods/mesecons/mesecons_button/doc/button/recipe.png differ diff --git a/mods/mesecons/mesecons_commandblock/doc/commandblock/preview.png b/mods/mesecons/mesecons_commandblock/doc/commandblock/preview.png index 6ace68be..d89cc7bc 100644 Binary files a/mods/mesecons/mesecons_commandblock/doc/commandblock/preview.png and b/mods/mesecons/mesecons_commandblock/doc/commandblock/preview.png differ diff --git a/mods/mesecons/mesecons_commandblock/init.lua b/mods/mesecons/mesecons_commandblock/init.lua index 6605b99c..17bcf016 100755 --- a/mods/mesecons/mesecons_commandblock/init.lua +++ b/mods/mesecons/mesecons_commandblock/init.lua @@ -43,9 +43,9 @@ minetest.register_chatcommand("hp", { }) local function initialize_data(meta) - local commands = meta:get_string("commands") + local commands = minetest.formspec_escape(meta:get_string("commands")) meta:set_string("formspec", - "size[9,5;]" .. + "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]") diff --git a/mods/mesecons/mesecons_delayer/doc/delayer/preview.png b/mods/mesecons/mesecons_delayer/doc/delayer/preview.png index eb4bbfe5..c57c728b 100644 Binary files a/mods/mesecons/mesecons_delayer/doc/delayer/preview.png and b/mods/mesecons/mesecons_delayer/doc/delayer/preview.png differ diff --git a/mods/mesecons/mesecons_delayer/doc/delayer/recipe.png b/mods/mesecons/mesecons_delayer/doc/delayer/recipe.png index 68e2d09a..ea394aac 100644 Binary files a/mods/mesecons/mesecons_delayer/doc/delayer/recipe.png and b/mods/mesecons/mesecons_delayer/doc/delayer/recipe.png differ diff --git a/mods/mesecons/mesecons_detector/doc/nodedetector/preview.png b/mods/mesecons/mesecons_detector/doc/nodedetector/preview.png index 22eac4a3..1f781614 100644 Binary files a/mods/mesecons/mesecons_detector/doc/nodedetector/preview.png and b/mods/mesecons/mesecons_detector/doc/nodedetector/preview.png differ diff --git a/mods/mesecons/mesecons_detector/doc/nodedetector/recipe.png b/mods/mesecons/mesecons_detector/doc/nodedetector/recipe.png index 0e067ba5..958c7e66 100644 Binary files a/mods/mesecons/mesecons_detector/doc/nodedetector/recipe.png and b/mods/mesecons/mesecons_detector/doc/nodedetector/recipe.png differ diff --git a/mods/mesecons/mesecons_detector/doc/objectdetector/preview.png b/mods/mesecons/mesecons_detector/doc/objectdetector/preview.png index 4b498382..85c4dea3 100644 Binary files a/mods/mesecons/mesecons_detector/doc/objectdetector/preview.png and b/mods/mesecons/mesecons_detector/doc/objectdetector/preview.png differ diff --git a/mods/mesecons/mesecons_detector/doc/objectdetector/recipe.png b/mods/mesecons/mesecons_detector/doc/objectdetector/recipe.png index c0330eb6..a1cee00f 100644 Binary files a/mods/mesecons/mesecons_detector/doc/objectdetector/recipe.png and b/mods/mesecons/mesecons_detector/doc/objectdetector/recipe.png differ diff --git a/mods/mesecons/mesecons_detector/init.lua b/mods/mesecons/mesecons_detector/init.lua index 62273e7c..79f2a924 100755 --- a/mods/mesecons/mesecons_detector/init.lua +++ b/mods/mesecons/mesecons_detector/init.lua @@ -13,8 +13,8 @@ local object_detector_make_formspec = function (pos) "button_exit[7,0.75;2,3;;Save]") end -local object_detector_on_receive_fields = function(pos, formname, fields) - if not fields.scanname or not fields.digiline_channel then return end; +local function object_detector_on_receive_fields(pos, _, fields) + if not fields.scanname or not fields.digiline_channel then return end local meta = minetest.get_meta(pos) meta:set_string("scanname", fields.scanname) @@ -23,7 +23,7 @@ local object_detector_on_receive_fields = function(pos, formname, fields) end -- returns true if player was found, false if not -local object_detector_scan = function (pos) +local function object_detector_scan(pos) local objs = minetest.get_objects_inside_radius(pos, mesecon.setting("detector_radius", 6)) for k, obj in pairs(objs) do local isname = obj:get_player_name() -- "" is returned if it is not a player; "" ~= nil! diff --git a/mods/mesecons/mesecons_extrawires/doc/corner/preview.png b/mods/mesecons/mesecons_extrawires/doc/corner/preview.png index 96ff5db0..9713229a 100644 Binary files a/mods/mesecons/mesecons_extrawires/doc/corner/preview.png and b/mods/mesecons/mesecons_extrawires/doc/corner/preview.png differ diff --git a/mods/mesecons/mesecons_extrawires/doc/corner/recipe.png b/mods/mesecons/mesecons_extrawires/doc/corner/recipe.png index 883e34fe..ac85b017 100644 Binary files a/mods/mesecons/mesecons_extrawires/doc/corner/recipe.png and b/mods/mesecons/mesecons_extrawires/doc/corner/recipe.png differ diff --git a/mods/mesecons/mesecons_extrawires/doc/crossing/preview.png b/mods/mesecons/mesecons_extrawires/doc/crossing/preview.png index ad551a57..66aaa054 100644 Binary files a/mods/mesecons/mesecons_extrawires/doc/crossing/preview.png and b/mods/mesecons/mesecons_extrawires/doc/crossing/preview.png differ diff --git a/mods/mesecons/mesecons_extrawires/doc/crossing/recipe.png b/mods/mesecons/mesecons_extrawires/doc/crossing/recipe.png index 3363705a..ac374013 100644 Binary files a/mods/mesecons/mesecons_extrawires/doc/crossing/recipe.png and b/mods/mesecons/mesecons_extrawires/doc/crossing/recipe.png differ diff --git a/mods/mesecons/mesecons_extrawires/doc/mese/preview.png b/mods/mesecons/mesecons_extrawires/doc/mese/preview.png index 0f8d39ed..3ce0ea42 100644 Binary files a/mods/mesecons/mesecons_extrawires/doc/mese/preview.png and b/mods/mesecons/mesecons_extrawires/doc/mese/preview.png differ diff --git a/mods/mesecons/mesecons_extrawires/doc/mese/recipe.png b/mods/mesecons/mesecons_extrawires/doc/mese/recipe.png index ce223494..904cf0ba 100644 Binary files a/mods/mesecons/mesecons_extrawires/doc/mese/recipe.png and b/mods/mesecons/mesecons_extrawires/doc/mese/recipe.png differ diff --git a/mods/mesecons/mesecons_extrawires/doc/tjunction/preview.png b/mods/mesecons/mesecons_extrawires/doc/tjunction/preview.png index 1b9c5a64..4dec8418 100644 Binary files a/mods/mesecons/mesecons_extrawires/doc/tjunction/preview.png and b/mods/mesecons/mesecons_extrawires/doc/tjunction/preview.png differ diff --git a/mods/mesecons/mesecons_extrawires/doc/tjunction/recipe.png b/mods/mesecons/mesecons_extrawires/doc/tjunction/recipe.png index c3f5fd70..86029417 100644 Binary files a/mods/mesecons/mesecons_extrawires/doc/tjunction/recipe.png and b/mods/mesecons/mesecons_extrawires/doc/tjunction/recipe.png differ diff --git a/mods/mesecons/mesecons_extrawires/doc/vertical/preview.png b/mods/mesecons/mesecons_extrawires/doc/vertical/preview.png index bb26184a..aad6ea86 100644 Binary files a/mods/mesecons/mesecons_extrawires/doc/vertical/preview.png and b/mods/mesecons/mesecons_extrawires/doc/vertical/preview.png differ diff --git a/mods/mesecons/mesecons_extrawires/doc/vertical/recipe.png b/mods/mesecons/mesecons_extrawires/doc/vertical/recipe.png index 5b3cb027..83bc4980 100644 Binary files a/mods/mesecons/mesecons_extrawires/doc/vertical/recipe.png and b/mods/mesecons/mesecons_extrawires/doc/vertical/recipe.png differ diff --git a/mods/mesecons/mesecons_extrawires/mesewire.lua b/mods/mesecons/mesecons_extrawires/mesewire.lua index 150178c1..3640de82 100755 --- a/mods/mesecons/mesecons_extrawires/mesewire.lua +++ b/mods/mesecons/mesecons_extrawires/mesewire.lua @@ -16,15 +16,21 @@ minetest.override_item("default:mese", { }} }) -minetest.register_node("mesecons_extrawires:mese_powered", { - tiles = {minetest.registered_nodes["default:mese"].tiles[1].."^[brighten"}, - is_ground_content = true, - groups = {cracky=1, not_in_creative_inventory = 1}, - sounds = default.node_sound_stone_defaults(), +-- Copy node definition of powered mese from normal mese +-- and brighten texture tiles to indicate mese is powered +local powered_def = mesecon.mergetable(minetest.registered_nodes["default:mese"], { + drop = "default:mese", + light_source = 5, mesecons = {conductor = { state = mesecon.state.on, offstate = "default:mese", rules = mesewire_rules }}, - drop = "default:mese" + groups = {cracky = 1, not_in_creative_inventory = 1} }) + +for i, v in pairs(powered_def.tiles) do + powered_def.tiles[i] = v .. "^[brighten" +end + +minetest.register_node("mesecons_extrawires:mese_powered", powered_def) diff --git a/mods/mesecons/mesecons_gates/doc/and/preview.png b/mods/mesecons/mesecons_gates/doc/and/preview.png index bff0d283..b2b53015 100644 Binary files a/mods/mesecons/mesecons_gates/doc/and/preview.png and b/mods/mesecons/mesecons_gates/doc/and/preview.png differ diff --git a/mods/mesecons/mesecons_gates/doc/and/recipe.png b/mods/mesecons/mesecons_gates/doc/and/recipe.png index 510bfbac..ae6bf633 100644 Binary files a/mods/mesecons/mesecons_gates/doc/and/recipe.png and b/mods/mesecons/mesecons_gates/doc/and/recipe.png differ diff --git a/mods/mesecons/mesecons_gates/doc/diode/preview.png b/mods/mesecons/mesecons_gates/doc/diode/preview.png index 13f78e03..ced541bd 100644 Binary files a/mods/mesecons/mesecons_gates/doc/diode/preview.png and b/mods/mesecons/mesecons_gates/doc/diode/preview.png differ diff --git a/mods/mesecons/mesecons_gates/doc/diode/recipe.png b/mods/mesecons/mesecons_gates/doc/diode/recipe.png index d27061a2..71086bf1 100644 Binary files a/mods/mesecons/mesecons_gates/doc/diode/recipe.png and b/mods/mesecons/mesecons_gates/doc/diode/recipe.png differ diff --git a/mods/mesecons/mesecons_gates/doc/nand/preview.png b/mods/mesecons/mesecons_gates/doc/nand/preview.png index fa4c7c57..d8db780f 100644 Binary files a/mods/mesecons/mesecons_gates/doc/nand/preview.png and b/mods/mesecons/mesecons_gates/doc/nand/preview.png differ diff --git a/mods/mesecons/mesecons_gates/doc/nand/recipe.png b/mods/mesecons/mesecons_gates/doc/nand/recipe.png index dfd13707..e6118b30 100644 Binary files a/mods/mesecons/mesecons_gates/doc/nand/recipe.png and b/mods/mesecons/mesecons_gates/doc/nand/recipe.png differ diff --git a/mods/mesecons/mesecons_gates/doc/nor/preview.png b/mods/mesecons/mesecons_gates/doc/nor/preview.png index a8ee1fbd..b6d27813 100644 Binary files a/mods/mesecons/mesecons_gates/doc/nor/preview.png and b/mods/mesecons/mesecons_gates/doc/nor/preview.png differ diff --git a/mods/mesecons/mesecons_gates/doc/nor/recipe.png b/mods/mesecons/mesecons_gates/doc/nor/recipe.png index 3187a3eb..a2063c72 100644 Binary files a/mods/mesecons/mesecons_gates/doc/nor/recipe.png and b/mods/mesecons/mesecons_gates/doc/nor/recipe.png differ diff --git a/mods/mesecons/mesecons_gates/doc/not/preview.png b/mods/mesecons/mesecons_gates/doc/not/preview.png index 2df4117d..4a33cd17 100644 Binary files a/mods/mesecons/mesecons_gates/doc/not/preview.png and b/mods/mesecons/mesecons_gates/doc/not/preview.png differ diff --git a/mods/mesecons/mesecons_gates/doc/not/recipe.png b/mods/mesecons/mesecons_gates/doc/not/recipe.png index f503902a..ee1c0d6b 100644 Binary files a/mods/mesecons/mesecons_gates/doc/not/recipe.png and b/mods/mesecons/mesecons_gates/doc/not/recipe.png differ diff --git a/mods/mesecons/mesecons_gates/doc/or/preview.png b/mods/mesecons/mesecons_gates/doc/or/preview.png index 440a8ead..b7a8cdcf 100644 Binary files a/mods/mesecons/mesecons_gates/doc/or/preview.png and b/mods/mesecons/mesecons_gates/doc/or/preview.png differ diff --git a/mods/mesecons/mesecons_gates/doc/or/recipe.png b/mods/mesecons/mesecons_gates/doc/or/recipe.png index ebc36253..b94169d5 100644 Binary files a/mods/mesecons/mesecons_gates/doc/or/recipe.png and b/mods/mesecons/mesecons_gates/doc/or/recipe.png differ diff --git a/mods/mesecons/mesecons_gates/doc/xor/preview.png b/mods/mesecons/mesecons_gates/doc/xor/preview.png index ead90740..3d3941ef 100644 Binary files a/mods/mesecons/mesecons_gates/doc/xor/preview.png and b/mods/mesecons/mesecons_gates/doc/xor/preview.png differ diff --git a/mods/mesecons/mesecons_gates/doc/xor/recipe.png b/mods/mesecons/mesecons_gates/doc/xor/recipe.png index 68f3a0b6..1e129bf2 100644 Binary files a/mods/mesecons/mesecons_gates/doc/xor/recipe.png and b/mods/mesecons/mesecons_gates/doc/xor/recipe.png differ diff --git a/mods/mesecons/mesecons_hydroturbine/doc/waterturbine/preview.png b/mods/mesecons/mesecons_hydroturbine/doc/waterturbine/preview.png index 91661936..14be16e5 100644 Binary files a/mods/mesecons/mesecons_hydroturbine/doc/waterturbine/preview.png and b/mods/mesecons/mesecons_hydroturbine/doc/waterturbine/preview.png differ diff --git a/mods/mesecons/mesecons_hydroturbine/doc/waterturbine/recipe.png b/mods/mesecons/mesecons_hydroturbine/doc/waterturbine/recipe.png index 31a14e16..8eb53651 100644 Binary files a/mods/mesecons/mesecons_hydroturbine/doc/waterturbine/recipe.png and b/mods/mesecons/mesecons_hydroturbine/doc/waterturbine/recipe.png differ diff --git a/mods/mesecons/mesecons_insulated/doc/insulated/preview.png b/mods/mesecons/mesecons_insulated/doc/insulated/preview.png index 94b252d9..bf544e88 100644 Binary files a/mods/mesecons/mesecons_insulated/doc/insulated/preview.png and b/mods/mesecons/mesecons_insulated/doc/insulated/preview.png differ diff --git a/mods/mesecons/mesecons_insulated/doc/insulated/recipe.png b/mods/mesecons/mesecons_insulated/doc/insulated/recipe.png index 34eebee4..f2a731a4 100644 Binary files a/mods/mesecons/mesecons_insulated/doc/insulated/recipe.png and b/mods/mesecons/mesecons_insulated/doc/insulated/recipe.png differ diff --git a/mods/mesecons/mesecons_lamp/doc/lamp/preview.png b/mods/mesecons/mesecons_lamp/doc/lamp/preview.png index 2440813a..a581cb3c 100644 Binary files a/mods/mesecons/mesecons_lamp/doc/lamp/preview.png and b/mods/mesecons/mesecons_lamp/doc/lamp/preview.png differ diff --git a/mods/mesecons/mesecons_lamp/doc/lamp/recipe.png b/mods/mesecons/mesecons_lamp/doc/lamp/recipe.png index 2aba6008..77570bd3 100644 Binary files a/mods/mesecons/mesecons_lamp/doc/lamp/recipe.png and b/mods/mesecons/mesecons_lamp/doc/lamp/recipe.png differ diff --git a/mods/mesecons/mesecons_lightstone/doc/lightstone_blue/preview.png b/mods/mesecons/mesecons_lightstone/doc/lightstone_blue/preview.png index f4e808bd..579f7195 100644 Binary files a/mods/mesecons/mesecons_lightstone/doc/lightstone_blue/preview.png and b/mods/mesecons/mesecons_lightstone/doc/lightstone_blue/preview.png differ diff --git a/mods/mesecons/mesecons_lightstone/doc/lightstone_blue/recipe.png b/mods/mesecons/mesecons_lightstone/doc/lightstone_blue/recipe.png index b88c7640..ce8ebd70 100644 Binary files a/mods/mesecons/mesecons_lightstone/doc/lightstone_blue/recipe.png and b/mods/mesecons/mesecons_lightstone/doc/lightstone_blue/recipe.png differ diff --git a/mods/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/preview.png b/mods/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/preview.png index d14f934a..56fe6ea4 100644 Binary files a/mods/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/preview.png and b/mods/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/preview.png differ diff --git a/mods/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/recipe.png b/mods/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/recipe.png index adbee9bd..fed0db27 100644 Binary files a/mods/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/recipe.png and b/mods/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/recipe.png differ diff --git a/mods/mesecons/mesecons_lightstone/doc/lightstone_green/preview.png b/mods/mesecons/mesecons_lightstone/doc/lightstone_green/preview.png index 1d00d056..9efc7741 100644 Binary files a/mods/mesecons/mesecons_lightstone/doc/lightstone_green/preview.png and b/mods/mesecons/mesecons_lightstone/doc/lightstone_green/preview.png differ diff --git a/mods/mesecons/mesecons_lightstone/doc/lightstone_green/recipe.png b/mods/mesecons/mesecons_lightstone/doc/lightstone_green/recipe.png index c11c89a0..66900641 100644 Binary files a/mods/mesecons/mesecons_lightstone/doc/lightstone_green/recipe.png and b/mods/mesecons/mesecons_lightstone/doc/lightstone_green/recipe.png differ diff --git a/mods/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/preview.png b/mods/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/preview.png index 461578ff..0084fa3f 100644 Binary files a/mods/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/preview.png and b/mods/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/preview.png differ diff --git a/mods/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/recipe.png b/mods/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/recipe.png index f511f846..e790012d 100644 Binary files a/mods/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/recipe.png and b/mods/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/recipe.png differ diff --git a/mods/mesecons/mesecons_lightstone/doc/lightstone_red/preview.png b/mods/mesecons/mesecons_lightstone/doc/lightstone_red/preview.png index 210dc337..5fd3eba9 100644 Binary files a/mods/mesecons/mesecons_lightstone/doc/lightstone_red/preview.png and b/mods/mesecons/mesecons_lightstone/doc/lightstone_red/preview.png differ diff --git a/mods/mesecons/mesecons_lightstone/doc/lightstone_red/recipe.png b/mods/mesecons/mesecons_lightstone/doc/lightstone_red/recipe.png index 3b9f888b..7791a99f 100644 Binary files a/mods/mesecons/mesecons_lightstone/doc/lightstone_red/recipe.png and b/mods/mesecons/mesecons_lightstone/doc/lightstone_red/recipe.png differ diff --git a/mods/mesecons/mesecons_lightstone/doc/lightstone_yellow/preview.png b/mods/mesecons/mesecons_lightstone/doc/lightstone_yellow/preview.png index a3aef66b..fb9f644d 100644 Binary files a/mods/mesecons/mesecons_lightstone/doc/lightstone_yellow/preview.png and b/mods/mesecons/mesecons_lightstone/doc/lightstone_yellow/preview.png differ diff --git a/mods/mesecons/mesecons_lightstone/doc/lightstone_yellow/recipe.png b/mods/mesecons/mesecons_lightstone/doc/lightstone_yellow/recipe.png index 18b74782..f17e9d44 100644 Binary files a/mods/mesecons/mesecons_lightstone/doc/lightstone_yellow/recipe.png and b/mods/mesecons/mesecons_lightstone/doc/lightstone_yellow/recipe.png differ diff --git a/mods/mesecons/mesecons_luacontroller/doc/luacontroller/preview.png b/mods/mesecons/mesecons_luacontroller/doc/luacontroller/preview.png index fe1bcf03..f16c9d0d 100644 Binary files a/mods/mesecons/mesecons_luacontroller/doc/luacontroller/preview.png and b/mods/mesecons/mesecons_luacontroller/doc/luacontroller/preview.png differ diff --git a/mods/mesecons/mesecons_luacontroller/doc/luacontroller/recipe.png b/mods/mesecons/mesecons_luacontroller/doc/luacontroller/recipe.png index 65d6c0c5..529b66d8 100644 Binary files a/mods/mesecons/mesecons_luacontroller/doc/luacontroller/recipe.png and b/mods/mesecons/mesecons_luacontroller/doc/luacontroller/recipe.png differ diff --git a/mods/mesecons/mesecons_luacontroller/init.lua b/mods/mesecons/mesecons_luacontroller/init.lua index e669f937..01f58789 100755 --- a/mods/mesecons/mesecons_luacontroller/init.lua +++ b/mods/mesecons/mesecons_luacontroller/init.lua @@ -229,23 +229,35 @@ end local function remove_functions(x) local tp = type(x) - if tp == "table" then + if tp == "function" then + return nil + end + + -- Make sure to not serialize the same table multiple times, otherwise + -- writing mem.test = mem in the LuaController will lead to infinite recursion + local seen = {} + + local function rfuncs(x) + if seen[x] then return end + seen[x] = true + if type(x) ~= "table" then return end + for key, value in pairs(x) do - local key_t, val_t = type(key), type(value) - if key_t == "function" or val_t == "function" then + if type(key) == "function" or type(value) == "function" then x[key] = nil else - if key_t == "table" then - remove_functions(key) + if type(key) == "table" then + rfuncs(key) end - if val_t == "table" then - remove_functions(value) + if type(value) == "table" then + rfuncs(value) end end end - elseif tp == "function" then - return nil end + + rfuncs(x) + return x end diff --git a/mods/mesecons/mesecons_materials/doc/fiber/preview.png b/mods/mesecons/mesecons_materials/doc/fiber/preview.png index 009fa86b..cad9645f 100644 Binary files a/mods/mesecons/mesecons_materials/doc/fiber/preview.png and b/mods/mesecons/mesecons_materials/doc/fiber/preview.png differ diff --git a/mods/mesecons/mesecons_materials/doc/fiber/recipe.png b/mods/mesecons/mesecons_materials/doc/fiber/recipe.png index 689adf68..7a53123e 100644 Binary files a/mods/mesecons/mesecons_materials/doc/fiber/recipe.png and b/mods/mesecons/mesecons_materials/doc/fiber/recipe.png differ diff --git a/mods/mesecons/mesecons_materials/doc/glue/preview.png b/mods/mesecons/mesecons_materials/doc/glue/preview.png index 237da351..0158f9cb 100644 Binary files a/mods/mesecons/mesecons_materials/doc/glue/preview.png and b/mods/mesecons/mesecons_materials/doc/glue/preview.png differ diff --git a/mods/mesecons/mesecons_materials/doc/glue/recipe.png b/mods/mesecons/mesecons_materials/doc/glue/recipe.png index 763e369b..b20ce660 100644 Binary files a/mods/mesecons/mesecons_materials/doc/glue/recipe.png and b/mods/mesecons/mesecons_materials/doc/glue/recipe.png differ diff --git a/mods/mesecons/mesecons_materials/doc/silicon/preview.png b/mods/mesecons/mesecons_materials/doc/silicon/preview.png index 5da06316..cd52dbdd 100644 Binary files a/mods/mesecons/mesecons_materials/doc/silicon/preview.png and b/mods/mesecons/mesecons_materials/doc/silicon/preview.png differ diff --git a/mods/mesecons/mesecons_materials/doc/silicon/recipe.png b/mods/mesecons/mesecons_materials/doc/silicon/recipe.png index 9b1926ad..9e8b3321 100644 Binary files a/mods/mesecons/mesecons_materials/doc/silicon/recipe.png and b/mods/mesecons/mesecons_materials/doc/silicon/recipe.png differ diff --git a/mods/mesecons/mesecons_movestones/doc/movestone/preview.png b/mods/mesecons/mesecons_movestones/doc/movestone/preview.png index 877d366e..bda64db1 100644 Binary files a/mods/mesecons/mesecons_movestones/doc/movestone/preview.png and b/mods/mesecons/mesecons_movestones/doc/movestone/preview.png differ diff --git a/mods/mesecons/mesecons_movestones/doc/movestone/recipe.png b/mods/mesecons/mesecons_movestones/doc/movestone/recipe.png index bd0cdbe4..f3d45dfc 100644 Binary files a/mods/mesecons/mesecons_movestones/doc/movestone/recipe.png and b/mods/mesecons/mesecons_movestones/doc/movestone/recipe.png differ diff --git a/mods/mesecons/mesecons_movestones/doc/movestone_sticky/preview.png b/mods/mesecons/mesecons_movestones/doc/movestone_sticky/preview.png index 7470837f..85f92139 100644 Binary files a/mods/mesecons/mesecons_movestones/doc/movestone_sticky/preview.png and b/mods/mesecons/mesecons_movestones/doc/movestone_sticky/preview.png differ diff --git a/mods/mesecons/mesecons_movestones/doc/movestone_sticky/recipe.png b/mods/mesecons/mesecons_movestones/doc/movestone_sticky/recipe.png index f7f3697c..bbf0a948 100644 Binary files a/mods/mesecons/mesecons_movestones/doc/movestone_sticky/recipe.png and b/mods/mesecons/mesecons_movestones/doc/movestone_sticky/recipe.png differ diff --git a/mods/mesecons/mesecons_noteblock/doc/noteblock/preview.png b/mods/mesecons/mesecons_noteblock/doc/noteblock/preview.png index 566fd659..c4991fba 100644 Binary files a/mods/mesecons/mesecons_noteblock/doc/noteblock/preview.png and b/mods/mesecons/mesecons_noteblock/doc/noteblock/preview.png differ diff --git a/mods/mesecons/mesecons_noteblock/doc/noteblock/recipe.png b/mods/mesecons/mesecons_noteblock/doc/noteblock/recipe.png index 2e2e36b7..d3c3675d 100644 Binary files a/mods/mesecons/mesecons_noteblock/doc/noteblock/recipe.png and b/mods/mesecons/mesecons_noteblock/doc/noteblock/recipe.png differ diff --git a/mods/mesecons/mesecons_pistons/doc/piston/preview.png b/mods/mesecons/mesecons_pistons/doc/piston/preview.png index 7d51e5a0..9e9ede3b 100644 Binary files a/mods/mesecons/mesecons_pistons/doc/piston/preview.png and b/mods/mesecons/mesecons_pistons/doc/piston/preview.png differ diff --git a/mods/mesecons/mesecons_pistons/doc/piston/recipe.png b/mods/mesecons/mesecons_pistons/doc/piston/recipe.png index cfe41e4e..0a711595 100644 Binary files a/mods/mesecons/mesecons_pistons/doc/piston/recipe.png and b/mods/mesecons/mesecons_pistons/doc/piston/recipe.png differ diff --git a/mods/mesecons/mesecons_pistons/doc/piston_sticky/preview.png b/mods/mesecons/mesecons_pistons/doc/piston_sticky/preview.png index e622a725..716d6756 100644 Binary files a/mods/mesecons/mesecons_pistons/doc/piston_sticky/preview.png and b/mods/mesecons/mesecons_pistons/doc/piston_sticky/preview.png differ diff --git a/mods/mesecons/mesecons_pistons/doc/piston_sticky/recipe.png b/mods/mesecons/mesecons_pistons/doc/piston_sticky/recipe.png index 3d6c1f84..35207367 100644 Binary files a/mods/mesecons/mesecons_pistons/doc/piston_sticky/recipe.png and b/mods/mesecons/mesecons_pistons/doc/piston_sticky/recipe.png differ diff --git a/mods/mesecons/mesecons_powerplant/doc/powerplant/preview.png b/mods/mesecons/mesecons_powerplant/doc/powerplant/preview.png index 06b3e25a..473d15c5 100644 Binary files a/mods/mesecons/mesecons_powerplant/doc/powerplant/preview.png and b/mods/mesecons/mesecons_powerplant/doc/powerplant/preview.png differ diff --git a/mods/mesecons/mesecons_powerplant/doc/powerplant/recipe.png b/mods/mesecons/mesecons_powerplant/doc/powerplant/recipe.png index 9e775b26..04a40024 100644 Binary files a/mods/mesecons/mesecons_powerplant/doc/powerplant/recipe.png and b/mods/mesecons/mesecons_powerplant/doc/powerplant/recipe.png differ diff --git a/mods/mesecons/mesecons_pressureplates/doc/pressureplate_stone/preview.png b/mods/mesecons/mesecons_pressureplates/doc/pressureplate_stone/preview.png index 06a3a725..235ffc41 100644 Binary files a/mods/mesecons/mesecons_pressureplates/doc/pressureplate_stone/preview.png and b/mods/mesecons/mesecons_pressureplates/doc/pressureplate_stone/preview.png differ diff --git a/mods/mesecons/mesecons_pressureplates/doc/pressureplate_stone/recipe.png b/mods/mesecons/mesecons_pressureplates/doc/pressureplate_stone/recipe.png index 5fc0deea..62acf45b 100644 Binary files a/mods/mesecons/mesecons_pressureplates/doc/pressureplate_stone/recipe.png and b/mods/mesecons/mesecons_pressureplates/doc/pressureplate_stone/recipe.png differ diff --git a/mods/mesecons/mesecons_pressureplates/doc/pressureplate_wood/preview.png b/mods/mesecons/mesecons_pressureplates/doc/pressureplate_wood/preview.png index 8d1840d4..7063cb02 100644 Binary files a/mods/mesecons/mesecons_pressureplates/doc/pressureplate_wood/preview.png and b/mods/mesecons/mesecons_pressureplates/doc/pressureplate_wood/preview.png differ diff --git a/mods/mesecons/mesecons_pressureplates/doc/pressureplate_wood/recipe.png b/mods/mesecons/mesecons_pressureplates/doc/pressureplate_wood/recipe.png index 4e0146d1..429d491d 100644 Binary files a/mods/mesecons/mesecons_pressureplates/doc/pressureplate_wood/recipe.png and b/mods/mesecons/mesecons_pressureplates/doc/pressureplate_wood/recipe.png differ diff --git a/mods/mesecons/mesecons_random/doc/ghoststone/preview.png b/mods/mesecons/mesecons_random/doc/ghoststone/preview.png index a422501c..4ab33fba 100644 Binary files a/mods/mesecons/mesecons_random/doc/ghoststone/preview.png and b/mods/mesecons/mesecons_random/doc/ghoststone/preview.png differ diff --git a/mods/mesecons/mesecons_random/doc/ghoststone/recipe.png b/mods/mesecons/mesecons_random/doc/ghoststone/recipe.png index 59ed29db..3bd385d4 100644 Binary files a/mods/mesecons/mesecons_random/doc/ghoststone/recipe.png and b/mods/mesecons/mesecons_random/doc/ghoststone/recipe.png differ diff --git a/mods/mesecons/mesecons_random/doc/removestone/preview.png b/mods/mesecons/mesecons_random/doc/removestone/preview.png index 4fdf627f..15caf3fa 100644 Binary files a/mods/mesecons/mesecons_random/doc/removestone/preview.png and b/mods/mesecons/mesecons_random/doc/removestone/preview.png differ diff --git a/mods/mesecons/mesecons_random/doc/removestone/recipe.png b/mods/mesecons/mesecons_random/doc/removestone/recipe.png index da55ea48..f271963f 100644 Binary files a/mods/mesecons/mesecons_random/doc/removestone/recipe.png and b/mods/mesecons/mesecons_random/doc/removestone/recipe.png differ diff --git a/mods/mesecons/mesecons_solarpanel/doc/solarpanel/preview.png b/mods/mesecons/mesecons_solarpanel/doc/solarpanel/preview.png index 39d8d5fd..b7731951 100644 Binary files a/mods/mesecons/mesecons_solarpanel/doc/solarpanel/preview.png and b/mods/mesecons/mesecons_solarpanel/doc/solarpanel/preview.png differ diff --git a/mods/mesecons/mesecons_solarpanel/doc/solarpanel/recipe.png b/mods/mesecons/mesecons_solarpanel/doc/solarpanel/recipe.png index d0f39641..3a3d7991 100644 Binary files a/mods/mesecons/mesecons_solarpanel/doc/solarpanel/recipe.png and b/mods/mesecons/mesecons_solarpanel/doc/solarpanel/recipe.png differ diff --git a/mods/mesecons/mesecons_switch/doc/switch/preview.png b/mods/mesecons/mesecons_switch/doc/switch/preview.png index b29cc4f2..0a0487dc 100644 Binary files a/mods/mesecons/mesecons_switch/doc/switch/preview.png and b/mods/mesecons/mesecons_switch/doc/switch/preview.png differ diff --git a/mods/mesecons/mesecons_switch/doc/switch/recipe.png b/mods/mesecons/mesecons_switch/doc/switch/recipe.png index 33e366dc..6db6464c 100644 Binary files a/mods/mesecons/mesecons_switch/doc/switch/recipe.png and b/mods/mesecons/mesecons_switch/doc/switch/recipe.png differ diff --git a/mods/mesecons/mesecons_torch/doc/torch/preview.png b/mods/mesecons/mesecons_torch/doc/torch/preview.png index ee9d55a1..fa325432 100644 Binary files a/mods/mesecons/mesecons_torch/doc/torch/preview.png and b/mods/mesecons/mesecons_torch/doc/torch/preview.png differ diff --git a/mods/mesecons/mesecons_torch/doc/torch/recipe.png b/mods/mesecons/mesecons_torch/doc/torch/recipe.png index 73e3819a..529d99f7 100644 Binary files a/mods/mesecons/mesecons_torch/doc/torch/recipe.png and b/mods/mesecons/mesecons_torch/doc/torch/recipe.png differ diff --git a/mods/mesecons/mesecons_walllever/doc/walllever/preview.png b/mods/mesecons/mesecons_walllever/doc/walllever/preview.png index 3aeb48e0..e8d2015c 100644 Binary files a/mods/mesecons/mesecons_walllever/doc/walllever/preview.png and b/mods/mesecons/mesecons_walllever/doc/walllever/preview.png differ diff --git a/mods/mesecons/mesecons_walllever/doc/walllever/recipe.png b/mods/mesecons/mesecons_walllever/doc/walllever/recipe.png index bc1583ef..0ad7c928 100644 Binary files a/mods/mesecons/mesecons_walllever/doc/walllever/recipe.png and b/mods/mesecons/mesecons_walllever/doc/walllever/recipe.png differ diff --git a/mods/mesecons/mesecons_microcontroller/MeseconMicro.odt b/other_things/MeseconMicro.odt similarity index 100% rename from mods/mesecons/mesecons_microcontroller/MeseconMicro.odt rename to other_things/MeseconMicro.odt diff --git a/mods/mesecons/mesecons_microcontroller/MeseconMicro.pdf b/other_things/MeseconMicro.pdf similarity index 100% rename from mods/mesecons/mesecons_microcontroller/MeseconMicro.pdf rename to other_things/MeseconMicro.pdf