TheHomecraft/cc-mek-scada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/MikaylaFischler/cc-mek-scada into devel

Browse Source
This commit is contained in:
Mikayla 2024-11-08 02:52:22 +00:00
commit 129bf8809a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/safemin.py
View File

@ -28,7 +28,10 @@ def minify(path: str):
contents = f.read() contents = f.read()
f.close() f.close()
if re.search(r'--+\[(?!\[@as)+', contents) != None: # remove --[[@as type]] hints before anything, since it would detect as multiline comments
contents = re.sub(r' --+\[.+]]', '', contents)
if re.search(r'--+\[+', contents) != None:
# absolutely not dealing with lua multiline comments # absolutely not dealing with lua multiline comments
# - there are more important things to do # - there are more important things to do
# - this minification is intended to be 100% safe, so working with multiline comments is asking for trouble # - this minification is intended to be 100% safe, so working with multiline comments is asking for trouble

2
supervisor/facility_update.lua
View File

@ -555,7 +555,7 @@ function update.auto_safety()
-- clears when we enter the fault waiting state -- clears when we enter the fault waiting state
astatus.gen_fault = self.mode == PROCESS.GEN_RATE and not self.units_ready astatus.gen_fault = self.mode == PROCESS.GEN_RATE and not self.units_ready
else else
astatus.matrix_fault = true astatus.matrix_dc = true
end end
-- check for critical unit alarms -- check for critical unit alarms