Merge branch 'develop' of https://github.com/DFHack/dfhack into develop

library/lua/dfhack.lua

@@ -543,23 +543,23 @@ function dfhack.run_script_with_env(envVars, name, flags, ...)
     end
     env.dfhack_flags = flags
     env.moduleMode = flags.module
-    local f
+    local script_code
     local perr
     local time = dfhack.filesystem.mtime(file)
     if time == scripts[file].mtime and scripts[file].run then
-        f = scripts[file].run
+        script_code = scripts[file].run
     else
         --reload
-        f, perr = loadfile(file, 't', env)
-        if not f then
+        script_code, perr = loadfile(file, 't', env)
+        if not script_code then
             error(perr)
         end
         -- avoid updating mtime if the script failed to load
         scripts[file].mtime = time
     end
     scripts[file].env = env
-    scripts[file].run = f
-    return f(...), env
+    scripts[file].run = script_code
+    return script_code(...), env
 end
 
 local function _run_command(...)

library/xml

@@ -1 +1 @@
-Subproject commit 693d58c8588120ad0a179bdd154cf0ce6035c782
+Subproject commit 81e2cf023422ad6f01061db12586a0589ef6eac5

scripts

@@ -1 +1 @@
-Subproject commit de996207994e4ce3e221c010c9cc042b06620a2e
+Subproject commit b285334a8a91c0b43bac9d3e362b95fcbfa472c7