Commit Graph

14301 Commits (b571e5b52b3af7ba6b0125d7a51b26dd5de01181)
 

Author SHA1 Message Date
Kelly Kinkade 2dfd7ea0d0 Update labormanager.cpp again
These should probably be OTHER rather than BUSY.
2020-05-03 18:19:49 -05:00
Kelly Kinkade 319354f6cd Update labormanager.cpp
Add entries for jobs 241-243 to the `dwarf_states` vector as well, derp.
2020-05-03 18:16:31 -05:00
Kelly Kinkade 866660169e Update joblabormapper.cpp
Add no-labor mappings for new jobs 241 through 243.
2020-05-03 17:53:32 -05:00
JapaMala 63c7b69b5b Change item improvement type to bare ints. 2020-05-02 14:38:55 -07:00
JapaMala 60853a543d Remove the site realization building type from the remote reader spec. It has no business being there. 2020-05-02 13:28:28 -07:00
JapaMala 2762f75d69 Merge remote-tracking branch 'dfhack/develop' into develop 2020-05-02 10:58:41 -07:00
JapaMala fcc4962052 Update stonesense to not crash. 2020-05-02 10:58:07 -07:00
PatrikLundell ec7f97bb7a adapted to enum value name change 2020-05-02 17:37:10 +02:00
Ben Lubar 1c57aa7bb4
update structures 2020-05-02 02:01:32 -05:00
Ben Lubar 947d0db182
update structures 2020-05-02 01:54:38 -05:00
lethosor 217535decb Update xml 2020-05-01 22:52:35 -04:00
lethosor 1dc59d3772 Ruby: use core methods for finding selected item and building
Similar to c3d566332, the core methods have become more complicated (and are also checked at compile-time). This will give a more consistent experience across scripts.

Fixes #1563
2020-05-01 22:50:02 -04:00
lethosor 24cebbda58 Fix segfault when setting DFHACK_HEADLESS but not PRINT_MODE:TEXT
endwin() is unhappy if initscr() wasn't called
2020-04-28 21:38:47 -04:00
lethosor 2108c2363d Use strcmp 2020-04-28 01:21:11 -04:00
lethosor 9e085b66ac Merge branch 'develop' into lua-ref-target 2020-04-27 23:24:29 -04:00
lethosor 6bdbf5b0dd Update to 0.47.04-r1, update xml, scripts, changelog version 2020-04-25 21:33:02 -04:00
lethosor f76b890cc8 Ensure that dev changelogs are also sorted, since they are pulled in from multiple files now 2020-04-25 21:18:35 -04:00
lethosor 7a2ef4ff60 Update scripts 2020-04-25 21:14:27 -04:00
lethosor 7c1d1c43e5 Merge remote-tracking branch 'PatrikLundell/stocks' into develop
Conflicts:
	docs/changelog.txt
2020-04-25 21:12:27 -04:00
lethosor 3380f9ccf4 Update changelog 2020-04-25 21:03:32 -04:00
lethosor 02c118335f Restore build-lua.sh for build-env 2020-04-25 17:59:50 -04:00
lethosor f008da32f8 Update submodules 2020-04-25 17:58:09 -04:00
lethosor 1546d9ec1a Tweak docs from #1484 2020-04-25 02:41:27 -04:00
lethosor 4dce9f2010 Merge remote-tracking branch 'PatrikLundell/getplants' into develop
Merges #1484

Conflicts:
	docs/changelog.txt
2020-04-25 02:39:05 -04:00
lethosor 405af5a20b Update structures 2020-04-25 02:01:21 -04:00
lethosor 55a82e43c6 Update xml, fix stockpiles build 2020-04-24 23:50:35 -04:00
Ben Rosser 7bdf958518 Fix protobuf compilation with GCC 10 on Fedora
Fixes #1506
2020-04-24 21:18:46 -04:00
lethosor c6ed0a2458 Update xml, scripts, authors 2020-04-24 21:15:04 -04:00
lethosor 27e42ed25d Update xml 2020-04-23 23:12:43 -04:00
Ben Lubar 84f13b643b
update structures 2020-04-23 15:34:26 -05:00
lethosor c5513c3ca1 Update xml 2020-04-23 01:11:29 -04:00
lethosor 0272fd57f8 Update submodules 2020-04-22 22:16:24 -04:00
lethosor 75c8bf1a59 Indent more 2020-04-22 22:05:48 -04:00
lethosor 7fa3f176bd Merge remote-tracking branch 'PatrikLundell/Units' into develop 2020-04-22 22:05:09 -04:00
PatrikLundell 21be5cf061 adapted to structures 2020-04-22 15:32:49 +02:00
PatrikLundell f371ae6da8 adapted to histfig_nemesis_id->union 2020-04-22 12:38:37 +02:00
PatrikLundell 07571e9eb4 updated and resolved conflict 2020-04-22 11:43:37 +02:00
lethosor 9a10ea9fe5 Update submodules 2020-04-22 02:13:24 -04:00
Ben Lubar 66314806b1
update structures 2020-04-19 22:03:13 -05:00
Ben Lubar 2f1e057bc7
check-structures-sanity: report known void* types with a better message 2020-04-19 22:03:03 -05:00
lethosor d3a007489c Fix ZLIB_ROOT in newer CMake versions 2020-04-19 12:16:48 -04:00
Ben Lubar 54d4b68f3c
don't crash if the path to an instance-vector contains a null pointer 2020-04-18 20:40:17 -05:00
Ben Lubar c8ff8d0d8e
update scripts and structures 2020-04-17 11:52:16 -05:00
Ben Lubar 8427f518c9
match capitalization changes I made to df-structures in specific_ref 2020-04-15 20:05:15 -05:00
Ben Lubar 253b15aeb9
update structures 2020-04-15 19:03:40 -05:00
lethosor b5c6fd26e2 Update changelog (#1531) 2020-04-15 17:33:58 -04:00
lethosor c55214c8d4 Merge remote-tracking branch 'ymber/default_autodump' into develop 2020-04-15 17:32:38 -04:00
PatrikLundell f4f2aa0d5e removed underscores, adapted to structure (re)naming 2020-04-15 10:18:37 +02:00
PatrikLundell b0d184e2f9 Merge branch 'develop' of https://github.com/DFHack/dfhack into Units 2020-04-15 09:45:54 +02:00
lethosor 36df6eac8b Restrict status badge to push events only 2020-04-15 01:15:09 -04:00