Merge branch 'devel' into pocket-alpha-dev

pocket/config/system.lua

@@ -62,6 +62,7 @@ function system.create(tool_ctl, main_pane, cfg_sys, divs, style, exit)
     TextBox{parent=ui_c_1,x=1,y=1,height=3,text="You may customize UI options below."}
 
     TextBox{parent=ui_c_1,y=4,text="Po/Pu Pellet Color"}
+    TextBox{parent=ui_c_1,x=20,y=4,text="new!",fg_bg=cpair(colors.red,colors._INHERIT)}  ---@todo remove NEW tag on next revision
     local pellet_color = RadioButton{parent=ui_c_1,y=5,default=util.trinary(ini_cfg.GreenPuPellet,1,2),options={"Green Pu/Cyan Po","Cyan Pu/Green Po"},callback=function()end,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.lime}
 
     TextBox{parent=ui_c_1,y=8,height=4,text="In Mekanism 10.4 and later, pellet colors now match gas colors (Cyan Pu/Green Po).",fg_bg=g_lg_fg_bg}

pocket/iorx.lua

@@ -314,7 +314,7 @@ function iorx.record_unit_data(data)
     local function blue(text) return { text = text, color = colors.blue } end
 
     -- if unit.reactor_data.rps_status then
-    --     for k, v in pairs(unit.alarms) do
+    --     for k, _ in pairs(unit.alarms) do
     --         unit.alarms[k] = ALARM_STATE.TRIPPED
     --     end
     -- end

pocket/pocket.lua

@@ -269,8 +269,8 @@ function pocket.init_nav(smem)
 
     -- open an app
     ---@param app_id POCKET_APP_ID
-    ---@param on_loaded? function
-    function nav.open_app(app_id, on_loaded)
+    ---@param on_ready? function
+    function nav.open_app(app_id, on_ready)
         -- reset help return on navigating out of an app
         if app_id == APP_ID.ROOT then self.help_return = nil end
 
@@ -283,7 +283,7 @@ function pocket.init_nav(smem)
                 app = self.apps[app_id]
             else self.loader_return = nil end
 
-            if not app.loaded then smem.q.mq_render.push_data(MQ__RENDER_DATA.LOAD_APP, { app_id, on_loaded }) end
+            if not app.loaded then smem.q.mq_render.push_data(MQ__RENDER_DATA.LOAD_APP, { app_id, on_ready }) end
 
             self.cur_app = app_id
             self.pane.set_value(app_id)
@@ -291,6 +291,8 @@ function pocket.init_nav(smem)
             if #app.sidebar_items > 0 then
                 self.sidebar.update(app.sidebar_items)
             end
+
+            if app.loaded and on_ready then on_ready() end
         else
             log.debug("tried to open unknown app")
         end

pocket/startup.lua

@@ -22,7 +22,7 @@ local pocket    = require("pocket.pocket")
 local renderer  = require("pocket.renderer")
 local threads   = require("pocket.threads")
 
-local POCKET_VERSION = "v0.13.2-beta"
+local POCKET_VERSION = "v0.13.4-beta"
 
 local println = util.println
 local println_ts = util.println_ts