90767b83d2
Merge pull request #2852 from myk002/myk_misery
...
update misery
2023-02-08 14:22:33 -08:00
8c046b070d
Merge pull request #2843 from myk002/myk_tailor
...
[tailor] persist state, use best practices
2023-02-08 14:22:23 -08:00
8bd9853597
make gcc happy
2023-02-08 14:16:11 -08:00
4d4e94c449
convert index
2023-02-08 14:06:19 -08:00
5c84d18001
update tailor, persist state, use best practices
2023-02-08 14:06:19 -08:00
6a04b577b0
update changelog
2023-02-08 14:03:22 -08:00
9f76d64e42
update misery; persist state
2023-02-08 14:02:44 -08:00
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
5a5fcbd134
Add changes to changelog.txt
2023-02-08 15:52:58 -05:00
07fd4b25b1
Merge branch 'develop' into automelt-autochop-lua-stack-fix
2023-02-08 15:45:29 -05:00
1e4a73007e
Apply suggestions from code review
...
Whitespace fixes
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-02-08 15:44:55 -05:00
d74f00f7c2
Merge pull request #2847 from robob27/hotkeylabel-enhancements
...
Add setLabel/setOnActivate to HotkeyLabel
2023-02-08 12:38:35 -08:00
44428bc06c
Merge pull request #2844 from cppcooper/channel-safely
...
Implements plugin: channel-safely v1.2.3
2023-02-08 12:37:41 -08:00
1787d2435c
Merge branch 'develop' into hotkeylabel-enhancements
2023-02-08 12:37:16 -08:00
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
cd12f95849
add const & to Push overloads; remove circular def
2023-02-08 12:15:19 -08:00
caeb6d2f84
Updates changelog
2023-02-08 12:09:32 -08:00
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
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
cfc5226aaf
Merge branch 'develop' into myk_logo
2023-02-08 11:21:37 -08:00
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
201fec6873
Merge pull request #2837 from robob27/case-insensitive-filterlist
...
Add case_sensitive attr to FilteredList
2023-02-08 11:18:31 -08:00
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
02a249fdee
Fixes the lua stack smashing issue
2023-02-08 14:01:32 -05:00
b950b56926
Add methods to HotkeyLabel
2023-02-08 13:00:13 -05:00
22b31bd7f1
Update changelog
2023-02-08 12:40:37 -05:00
5002427bec
Merge branch 'develop' into automelt
2023-02-08 10:26:55 -05:00
1f38b294cb
Add note in changelog about silver crossbows
2023-02-08 21:24:24 +11:00
24827eabe2
Remove checks for silver from library/military for crossbows.
2023-02-08 21:24:24 +11:00
dd10451c2f
Remove library/military silver crossbow work-order
...
It is not possible to create a work-order for making silver crossbows,
so the silver crossbow recipe belongs in the alternative military library
with other artifact/non-craftable weapon recipes.
It's already present in the library/military_include_artifact_materials
work-orders, so simply needed removal from the vanilla library/military
orders version.
2023-02-08 21:24:24 +11:00
54560bc5db
Don't duplicate regex
2023-02-08 03:39:43 -05:00
13440d18a8
Add case_sensitive to FilteredList docs
2023-02-08 03:39:43 -05:00
c1b9de87d2
Add case_sensitive attr to FilteredList
2023-02-08 03:39:43 -05:00
d0b4b1a4a5
Auto-update submodules
...
library/xml: master
2023-02-08 07:36:55 +00:00
585b8da03a
Auto-update submodules
...
scripts: master
2023-02-08 07:15:14 +00:00
9925aba3e4
Merge branch 'develop' into automelt
2023-02-08 02:00:14 -05:00
be0cec9520
Current attempt to fix lua stack smashing
2023-02-08 01:59:57 -05:00
0a91166a92
add light AA
2023-02-07 22:55:19 -08:00
8ee05af6ef
update logo to crisper version provided by TaxiService
2023-02-07 22:55:19 -08:00
057d2d8c5d
Update scripts (hermit)
2023-02-08 00:00:52 -05:00
468e9875e5
Update DFHack version to 50.07-alpha0, update xml
2023-02-08 00:00:31 -05:00
ef81a91181
only realign out-of-alignment list positions
2023-02-07 14:12:52 -08:00
b2ecb8aaab
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-07 20:53:12 +00:00
df5184d751
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-07 07:14:45 +00:00
d126cbec7a
Merge pull request #2836 from DFHack/pre-commit-ci-update-config
...
[pre-commit.ci] pre-commit autoupdate
2023-02-06 17:55:50 -08:00
bc1adc0300
[pre-commit.ci] pre-commit autoupdate
...
updates:
- [github.com/python-jsonschema/check-jsonschema: 0.19.2 → 0.21.0](https://github.com/python-jsonschema/check-jsonschema/compare/0.19.2...0.21.0 )
- [github.com/Lucas-C/pre-commit-hooks: v1.3.1 → v1.4.2](https://github.com/Lucas-C/pre-commit-hooks/compare/v1.3.1...v1.4.2 )
2023-02-07 01:38:55 +00:00
26e57a9780
Merge pull request #2834 from TealSeer/zonecheckfixes
...
Fix logic for zone type checks and re-enables autonestbox
2023-02-06 16:21:17 -08:00
826f918954
remove isHospital as hospitals are no longer civzones
2023-02-06 19:11:00 -05:00
ca5a17a799
explanatory comment for magic number
2023-02-06 19:09:47 -05:00
0043e05895
enable autonestbox
2023-02-06 16:47:50 -05:00
Myk
Myk Taylor
eamondo2
Josh Cooper
pre-commit-ci[bot]
Robob27
Janeene Beeforth
DFHack-Urist via GitHub Actions
lethosor
Roxy