Minecraft/cc-mek-scada
1
0
Fork 0
mirror of https://github.com/MikaylaFischler/cc-mek-scada.git synced 2024-08-30 18:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into 412-additional-matrix-integrations

Browse Source
This commit is contained in:
Mikayla Fischler 2024-04-21 12:09:53 -04:00
commit 712d018806
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
coordinator/coordinator.lua
View File

@ -348,6 +348,7 @@ function coordinator.comms(version, nic, sv_watchdog)
ok = false ok = false
elseif self.sv_config_err then elseif self.sv_config_err then
self.est_task_done(false)
coordinator.log_comms("supervisor unit count does not match coordinator unit count, check configs") coordinator.log_comms("supervisor unit count does not match coordinator unit count, check configs")
ok = false ok = false
elseif (os.clock() - self.est_last) > 1.0 then elseif (os.clock() - self.est_last) > 1.0 then

2
coordinator/startup.lua
View File

@ -19,7 +19,7 @@ local renderer = require("coordinator.renderer")
local sounder = require("coordinator.sounder") local sounder = require("coordinator.sounder")
local threads = require("coordinator.threads") local threads = require("coordinator.threads")
local COORDINATOR_VERSION = "v1.4.2" local COORDINATOR_VERSION = "v1.4.3"
local CHUNK_LOAD_DELAY_S = 30.0 local CHUNK_LOAD_DELAY_S = 30.0