From fc8315b96255ff4a213fddd82f4fc5eb820a0fcd Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Thu, 1 Sep 2016 11:57:25 +0200 Subject: [PATCH] [pipeworks] Update and fix global variable 'rules' - Fix global variable 'rules' in devices.lua for #508 - Update inventory elements from pipeworks' upstream repository --- mods/pipeworks/autocrafter.lua | 9 ++++++++- mods/pipeworks/devices.lua | 2 ++ mods/pipeworks/filter-injector.lua | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mods/pipeworks/autocrafter.lua b/mods/pipeworks/autocrafter.lua index 648a6101..faf53815 100755 --- a/mods/pipeworks/autocrafter.lua +++ b/mods/pipeworks/autocrafter.lua @@ -183,7 +183,14 @@ local function update_meta(meta, enabled) default.gui_bg_img.. default.gui_slots.. default.get_hotbar_bg(0,7) .. - "list[current_player;main;0,7;8,4;]") + "list[current_player;main;0,7;8,4;]" .. + "listring[current_player;main]".. + "listring[context;src]" .. + "listring[context;dst]" .. + "listring[current_player;main]".. + "listring[context;recipe]" .. + "listring[context;output]" + ) -- toggling the button doesn't quite call for running a recipe change check -- so instead we run a minimal version for infotext setting only diff --git a/mods/pipeworks/devices.lua b/mods/pipeworks/devices.lua index c2e1bc41..f7f6f45b 100755 --- a/mods/pipeworks/devices.lua +++ b/mods/pipeworks/devices.lua @@ -35,6 +35,8 @@ local pipes_devicelist = { "storage_tank_10" } +local rules = pipeworks.mesecons_rules -- Enough with the undefined global variable // MFF (Mg|01/07/2016 for #68) + -- Now define the nodes. local states = { "on", "off" } diff --git a/mods/pipeworks/filter-injector.lua b/mods/pipeworks/filter-injector.lua index 78e6f257..7fbabc2b 100755 --- a/mods/pipeworks/filter-injector.lua +++ b/mods/pipeworks/filter-injector.lua @@ -45,7 +45,8 @@ local function set_filter_formspec(data, meta) "Sequence slots Randomly", "Sequence slots by Rotation"}).. exmatch_button.. - "list[current_player;main;0,4.5;8,4;]" + "list[current_player;main;0,4.5;8,4;]" .. + "listring[]" end meta:set_string("formspec", formspec) end