Commit Graph

14865 Commits (7abb82d7e9f343c17a04a3493565bd2375dfdd39)
 

Author SHA1 Message Date
Myk 1c8b662b8a
Merge pull request #2860 from robob27/detect-manual-save
Detect manual save when persisting data
2023-02-10 08:31:26 -08:00
Myk c8b5f66429
Merge branch 'develop' into detect-manual-save 2023-02-10 08:23:02 -08:00
Myk Taylor 13f96b9ac8
increase frequency of nestbox scanning 2023-02-10 08:20:11 -08:00
Myk Taylor 960bfaca86
fix annotation parsing
ref: #2857
2023-02-10 08:15:44 -08:00
Robob27 533ccee099 Detect manual save 2023-02-10 02:55:36 -05:00
DFHack-Urist via GitHub Actions e160bd0607 Auto-update submodules
library/xml: master
scripts: master
2023-02-10 07:15:13 +00:00
Myk 0e8d7a4155
Merge pull request #2857 from vallode/annotation-parse-error-fix
Fix annotation parse error
2023-02-09 21:21:53 -08:00
vallode 991c6d89e8 Fix annotation parse error 2023-02-09 23:50:11 +01:00
Myk 497d8e1ff7
Merge pull request #2854 from johncosker/fix-autoslab
autoslab: Improve check for existing engraved slab.
2023-02-09 07:59:48 -08:00
John Cosker f6ab1630b1 Cleanup 2023-02-09 08:30:09 -05:00
John Cosker 99aa4c523a Merge branch 'fix-autoslab' of https://github.com/johncosker/dfhack into fix-autoslab 2023-02-09 08:29:17 -05:00
John Cosker 6795a4a2c8 Further simplify check for engraved slabs 2023-02-09 08:28:33 -05:00
Myk 30ad6c9e4c
Merge pull request #2853 from myk002/myk_nestboxes_job
[nestboxes] remove in-progress jobs when protecting fert eggs
2023-02-09 00:04:30 -08:00
Myk dad05a9a9a
Merge branch 'develop' into myk_nestboxes_job 2023-02-08 23:21:52 -08:00
DFHack-Urist via GitHub Actions 7cc3c08926 Auto-update submodules
library/xml: master
scripts: master
2023-02-09 05:14:15 +00:00
John Cosker d27041e206
Remove debug logging 2023-02-08 22:42:28 -05:00
John Cosker 27ff6c9649 Remove debug logging 2023-02-08 22:41:56 -05:00
John Cosker cf51054f86
Merge branch 'develop' into fix-autoslab 2023-02-08 22:39:46 -05:00
John Cosker fed3b4ddb4 Hopefully fix CI linux build 2023-02-08 22:25:35 -05:00
lethosor 1fd807fc4d
Mark as dev-only changes: #2848, #2842, #2816, #2792 2023-02-08 22:16:16 -05:00
John Cosker 5e09a1cbf1 Change autoslab to use slab's "topic" field to compare historical id of slab instead of using str comp 2023-02-08 22:05:08 -05:00
Myk Taylor a41afb88fc
remove in-progress jobs when protecting fert eggs 2023-02-08 16:37:46 -08:00
DFHack-Urist via GitHub Actions 252a05ba11 Auto-update submodules
library/xml: master
scripts: master
2023-02-09 00:02:46 +00:00
Myk 90767b83d2
Merge pull request #2852 from myk002/myk_misery
update misery
2023-02-08 14:22:33 -08:00
Myk 8c046b070d
Merge pull request #2843 from myk002/myk_tailor
[tailor] persist state, use best practices
2023-02-08 14:22:23 -08:00
Myk Taylor 8bd9853597
make gcc happy 2023-02-08 14:16:11 -08:00
Myk Taylor 4d4e94c449
convert index 2023-02-08 14:06:19 -08:00
Myk Taylor 5c84d18001
update tailor, persist state, use best practices 2023-02-08 14:06:19 -08:00
Myk Taylor 6a04b577b0
update changelog 2023-02-08 14:03:22 -08:00
Myk Taylor 9f76d64e42
update misery; persist state 2023-02-08 14:02:44 -08:00
Myk 5113823d8c
Merge pull request #2848 from eamondo2/automelt-autochop-lua-stack-fix
`automelt` `autochop` Lua Stack smashing fix
2023-02-08 13:01:00 -08:00
eamondo2 5a5fcbd134 Add changes to changelog.txt 2023-02-08 15:52:58 -05:00
Eamon Bode 07fd4b25b1
Merge branch 'develop' into automelt-autochop-lua-stack-fix 2023-02-08 15:45:29 -05:00
Eamon Bode 1e4a73007e
Apply suggestions from code review
Whitespace fixes

Co-authored-by: Myk <myk.taylor@gmail.com>
2023-02-08 15:44:55 -05:00
Myk d74f00f7c2
Merge pull request #2847 from robob27/hotkeylabel-enhancements
Add setLabel/setOnActivate to HotkeyLabel
2023-02-08 12:38:35 -08:00
Myk 44428bc06c
Merge pull request #2844 from cppcooper/channel-safely
Implements plugin: channel-safely v1.2.3
2023-02-08 12:37:41 -08:00
Myk 1787d2435c
Merge branch 'develop' into hotkeylabel-enhancements 2023-02-08 12:37:16 -08:00
Myk 6f25fe3b3e
Merge pull request #2851 from myk002/myk_no_circles
add const & to Push overloads; remove circular def
2023-02-08 12:27:31 -08:00
Myk Taylor cd12f95849
add const & to Push overloads; remove circular def 2023-02-08 12:15:19 -08:00
Josh Cooper caeb6d2f84 Updates changelog 2023-02-08 12:09:32 -08:00
Josh Cooper 5d8d378917 Implements plugin: channel-safely v1.2.3
- Revises a few log lines
- Adds d_assert macro to replace assert usage
  - prints an error to indicate d_assert failed in Release builds as well as Debug builds
  - could be added to the Debug utilities to allow use of assertions on necessary code without needing to buffer the results for use in the assert statement
- Fixes bug wherein designations are never put into marker mode (related to the assert statements)
2023-02-08 12:03:40 -08:00
Myk 26e1d1806f
Merge pull request #2842 from myk002/myk_logo
update logo to crisper version provided by TaxiService
2023-02-08 11:32:27 -08:00
Myk cfc5226aaf
Merge branch 'develop' into myk_logo 2023-02-08 11:21:37 -08:00
Myk ccf57fd961
Merge pull request #2845 from dawnmist/orders/remove-silver-crossbow-from-military
Remove silver crossbow work-order from library/military
2023-02-08 11:19:47 -08:00
Myk 201fec6873
Merge pull request #2837 from robob27/case-insensitive-filterlist
Add case_sensitive attr to FilteredList
2023-02-08 11:18:31 -08:00
pre-commit-ci[bot] bf0b3f8845 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-08 19:06:35 +00:00
eamondo2 02a249fdee Fixes the lua stack smashing issue 2023-02-08 14:01:32 -05:00
Robob27 b950b56926 Add methods to HotkeyLabel 2023-02-08 13:00:13 -05:00
Robob27 22b31bd7f1 Update changelog 2023-02-08 12:40:37 -05:00
eamondo2 5002427bec Merge branch 'develop' into automelt 2023-02-08 10:26:55 -05:00