8a28fe6dc2
Merge branch 'develop' of DFHack/dfhack into develop
2021-03-06 12:28:45 -05:00
15e0db3895
Merge remote-tracking branch 'PatrikLundell/47' into develop
2021-03-06 12:27:08 -05:00
1e2289c2c9
removed unnecessary log entry
2021-03-06 11:03:00 +01:00
fe175876aa
Auto-update submodules
...
library/xml: master
scripts: master
2021-03-06 07:15:27 +00:00
ef53c2d672
adapted to changed df-structures enum value names
2021-03-05 12:45:51 +01:00
e72125dbff
Auto-update submodules
...
library/xml: master
scripts: master
2021-03-05 07:15:28 +00:00
1698a80c49
Auto-update submodules
...
library/xml: master
scripts: master
2021-03-04 07:15:38 +00:00
fe2eb18c17
Merge branch 'develop' of DFHack/dfhack into develop
2021-03-03 23:56:44 -05:00
9df06564a0
Merge remote-tracking branch 'PatrikLundell/Prospector' into develop
...
Conflicts:
docs/changelog.txt
2021-03-03 23:56:06 -05:00
12ad300d64
Auto-update submodules
...
library/xml: master
2021-03-03 07:16:20 +00:00
c9545268fa
Auto-update submodules
...
library/xml: master
2021-03-02 07:15:54 +00:00
ed3f11a31d
Auto-update submodules
...
library/xml: master
2021-03-01 07:15:58 +00:00
3185d4d6cc
Auto-update submodules
...
library/xml: master
2021-02-28 07:15:33 +00:00
1b2eed7c5e
confirm convict: use visible name to avoid exposing alternate identities
...
Ref #1593
See also:
https://www.reddit.com/r/dwarffortress/comments/ltzu82/if_i_wasnt_sure_i_found_the_vampire_before/
http://www.bay12forums.com/smf/index.php?topic=164123.msg8253738#msg8253738
2021-02-28 01:01:47 -05:00
5affbce13b
Auto-update submodules
...
library/xml: master
2021-02-27 07:15:42 +00:00
6acece1536
Merge remote-tracking branch 'myk002/myk_dreamfort' into develop
2021-02-25 22:25:42 -05:00
5a6263f72c
fix indentation
2021-02-24 21:56:40 -08:00
ac50cdc3c0
Merge branch 'develop' of DFHack/dfhack into develop
2021-02-25 00:43:13 -05:00
4a7fcc6118
Fix plugin name in error, add link in docs
...
Ref #1769
2021-02-25 00:41:13 -05:00
cb9ed4ff0c
Merge remote-tracking branch 'myk002/myk_manipulator' into develop
...
Conflicts:
docs/changelog.txt
2021-02-25 00:39:01 -05:00
23461e17c2
separate sand bags into their own stockpile
...
since quantum stockpiling them dumps out their contents
2021-02-24 19:50:29 -08:00
95e2582219
add include directory for lodepng
2021-02-24 18:23:15 -06:00
577eadf5cb
prefix with dfhack- like other dependency projects
2021-02-24 18:03:39 -06:00
67084de44b
add depends/lodepng
2021-02-24 17:58:31 -06:00
0f85c189d6
Update scripts
2021-02-24 13:53:43 -05:00
b42da7e5d7
Merge branch 'develop' of DFHack/dfhack into develop
2021-02-24 13:53:26 -05:00
96e91fa5e2
Merge remote-tracking branch 'myk002/myk_aliases_docs' into develop
2021-02-24 13:53:22 -05:00
29db977bc7
Auto-update submodules
...
library/xml: master
scripts: master
2021-02-23 07:15:29 +00:00
1fa1501f75
use actual DFHack-Urist noreply email address in workflow
2021-02-22 23:29:28 -06:00
dac63fe69e
Merge remote-tracking branch 'origin/develop' into develop
2021-02-23 00:23:16 -05:00
af34b5d614
Merge remote-tracking branch 'bseiller/ea_improve_survey_performance_keep_mlts_on_heap' into develop
2021-02-23 00:22:22 -05:00
60e83046f8
Prevent accidental double-frees
...
- matcher.cpp, survey.cpp: setting the state pointer to null/nullptr in ::shutdown() to prevent errors caused by accidental double-frees - an additional check if the pointer is null already is not necessary as the standard guarantees that nothing happens if delete is called on a nullpointer
Co-Authored-By: Alan <3719547+lethosor@users.noreply.github.com>
2021-02-20 22:43:12 +01:00
60c6c2a059
Auto-update submodules
...
scripts: master
2021-02-20 07:15:47 +00:00
bf56ac1af9
Merge remote-tracking branch 'myk002/myk_deprecate_fortplan' into develop
...
Conflicts:
docs/changelog.txt
2021-02-20 00:54:18 -05:00
1be75f269b
Merge remote-tracking branch 'myk002/myk_dreamfort' into develop
...
+typo fix in quickfort-alias-guide.rst
2021-02-20 00:47:59 -05:00
cc51835660
Merge remote-tracking branch 'myk002/myk_stockpile_containers_docs' into develop
2021-02-20 00:38:34 -05:00
e2bda663d0
Use auth token to clone repo
...
This should fix pushing, since DFHack-Urist now has permission to push to develop.
2021-02-19 23:45:51 -05:00
3278519c98
document how to specify containers for stockpiles
...
that are not specified with expansion syntax
2021-02-19 11:43:10 -08:00
de9375574a
fix syntax error
2021-02-18 23:25:21 -08:00
3e6294198b
update wording of fortplan deprecation notice
2021-02-18 23:23:50 -08:00
b3666da0a6
fix wheelbarrow UI change attribution
2021-02-18 23:11:09 -08:00
24c499c108
Add some more git flags for safety
2021-02-18 23:22:37 -05:00
5d9d51e327
Merge remote-tracking branch 'lethosor/auto-update-submodules' into develop
2021-02-18 23:15:06 -05:00
8008243c3a
Configure git name/email
2021-02-18 22:14:05 -05:00
fa475949f4
Add workflow to auto-update submodules
2021-02-18 22:08:51 -05:00
f3dd38a038
update structures
2021-02-18 18:18:34 -06:00
a7440ca478
use wheelbarrows to haul occupied cages
2021-02-18 00:26:11 -08:00
cf0506e650
add documentation for #aliases blueprints
2021-02-17 23:10:47 -08:00
9e17bc938c
only set labor validity for the player civ
2021-02-17 09:16:49 -08:00
6a5e6ffa00
add archery targets to services barracks
...
fix a few alignment problems
fix bolts alias
2021-02-17 08:24:50 -08:00
lethosor
PatrikLundell
DFHack-Urist via GitHub Actions
myk002
Ben Lubar
bseiller
DFHack-Urist via GitHub Actions