Merge branch 'develop' into adv-beta

DFHack · Dec 25, 2024 · 4fcc4a5 · 4fcc4a5
2 parents 6e3091d + a93873a
commit 4fcc4a5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/library/lua/repeat-util.lua b/library/lua/repeat-util.lua
@@ -1,7 +1,4 @@
--- lua/plugins/repeatUtil.lua
--- author expwnent
 -- tools for registering callbacks periodically
--- vaguely based on a script by Putnam
 
 local _ENV = mkmodule("repeat-util")
 
@@ -13,6 +10,18 @@ dfhack.onStateChange.repeatUtilStateChange = function(code)
     end
 end
 
+function isScheduled(name)
+    return repeating[name] ~= nil
+end
+
+function listScheduled()
+    local result = {}
+    for name, _ in pairs(repeating) do
+        table.insert(result, name)
+    end
+    return result
+end
+
 function cancel(name)
     if not repeating[name] then
         return false

diff --git a/scripts b/scripts
+1 −0		changelog.txt
+24 −0		docs/fix/stuck-squad.rst
+100 −0		fix/stuck-squad.lua
+2 −2		internal/control-panel/common.lua
+2 −1		internal/control-panel/registry.lua
+31 −0		internal/notify/notifications.lua
+2 −2		repeat.lua