204240f3e3
specify expat include dir for xlsxio
2020-08-09 02:14:37 -07:00
c7cf7fdd30
define EXPAT_LIBRARIES for xlsxio
2020-08-09 02:00:06 -07:00
43bcec4a57
move libzip to older version
...
although they declare that they only need cmake 3.0.2, they started
using add_compile_definitions(), which was added in cmake 3.12
git checkout 29b881d fixes this
2020-08-09 00:46:50 -07:00
bb988d25e6
try to get the library suffix right for windows
2020-08-09 00:24:25 -07:00
51794d91ed
really get the env vars
2020-08-08 23:55:24 -07:00
b0cb40c5ea
pass the cmake environment to deps
2020-08-08 22:42:50 -07:00
8d157012d0
build dfhack with verbosity on too
2020-08-08 22:04:49 -07:00
1cfe2735d3
build deps in verbose mode for debugging
2020-08-08 22:03:42 -07:00
d65504eb82
ensure CFLAGS and CXXFLAGS get propagated to deps
2020-08-08 21:19:38 -07:00
8753f9feaf
use correct lib dir on 32-bit
2020-08-08 20:42:03 -07:00
8a05f09cd6
add libexpat to the build
2020-08-08 20:18:43 -07:00
e7afc4cfeb
fix libexpat at v2.2.9
2020-08-08 20:10:13 -07:00
8de39c2d7d
add libexpat as a submodule
2020-08-08 20:09:29 -07:00
cffac8ed93
fix line endings in XlsxReader.cpp
2020-08-08 20:07:54 -07:00
28eaf0ae8b
add libzip to the build
2020-08-08 20:04:46 -07:00
eeeb638c1c
fix libzip at v1.7.3
2020-08-08 19:48:11 -07:00
4f0eb4bca6
add libzip dep
2020-08-08 19:47:02 -07:00
8c7fb808e1
get xlsxio Lua API working
2020-08-08 17:55:49 -07:00
18f4786458
Merge remote-tracking branch 'upstream/develop' into quickfort_xlsxio
2020-08-08 17:17:45 -07:00
89a6309788
build xlsxio and link it into dfhack, add lua api
2020-08-08 15:24:12 -07:00
f2b0f012c9
Bump to 0.47.04-r2
2020-08-08 14:53:24 -04:00
504b0c1ec7
Update changelog ( #1596 )
2020-08-08 14:47:59 -04:00
73ba692f15
Fix road building ( #1596 )
...
Paved roads need architecture before road building
2020-08-08 14:46:42 -04:00
b2368b3c34
Merge remote-tracking branch 'ab9rf/labormanager-custom-furnaces' into develop
2020-08-08 14:35:44 -04:00
8c5b21b7ee
Fix a couple warnings in the Units module ( #1615 )
2020-08-08 14:35:12 -04:00
7ee58ada7b
Update scripts
2020-08-08 14:29:24 -04:00
8f047530c4
Make Units::getRaceNameById and other ID-related functions available to Lua
2020-08-08 14:28:17 -04:00
13380008c4
Update scripts, authors, changelog
2020-08-08 13:28:31 -04:00
3b3b0be8c5
Update submodules, tweak changelog order
2020-08-08 02:00:12 -04:00
a28e939370
Recalculate size after toggling columns (goals can be longer than professions)
2020-08-08 00:45:57 -04:00
6a1f046995
Add --sizecheck option to Linux launcher script, update docs
2020-08-08 00:41:04 -04:00
cb1b751988
Update submodules
2020-08-08 00:31:28 -04:00
ee8d130298
Use existing pronoun_type enum
2020-08-08 00:12:59 -04:00
f7fda8e7f5
Update changelog, authors, xml ( #1615 )
2020-08-08 00:06:59 -04:00
62f4789e2b
Merge remote-tracking branch 'ryanbennitt/feature/manipulator_goal' into develop
2020-08-08 00:04:28 -04:00
c76f71cd46
Update xml library submodule
2020-08-07 22:20:11 +01:00
23c22b3b9d
Merge branch 'develop' of https://github.com/DFHack/dfhack into feature/manipulator_goal
2020-08-07 22:17:32 +01:00
a85b77e6f1
Retrieve goal string values from enum attributes and add new Units methods to Lua API and docs
2020-08-07 22:07:48 +01:00
1fc800e765
fix xlsxio lib to current commit
...
so it doesn't break us with incompatibile changes. we only need to
update this lib if/when we run into a bug with it. no need to introduce
instability by tracking HEAD
2020-08-07 13:08:06 -07:00
b033e4644f
add xlsxio as a submodule
2020-08-07 12:44:40 -07:00
939e97caa0
Update scripts/list-agreements
2020-08-06 22:46:21 -04:00
498fd9a1a6
Flush plugin warning messages
2020-08-06 22:45:46 -04:00
ed9f724117
Use BUILDJOB_NOW key, dim text when no job is selected
2020-08-06 22:44:49 -04:00
c7e4c724e8
Sort tweaks alphabetically
2020-08-06 22:37:04 -04:00
0c53b2b6c5
Add do-job-now tweak
...
Forum thread: http://www.bay12forums.com/smf/index.php?topic=176700
Original source: https://github.com/dlmarquis/dfhack/blob/dojobnow-r1/plugins/dojobnow.cpp
Co-authored-by: dlmarquis <dlmarquis@users.noreply.github.com>
2020-08-06 22:36:57 -04:00
bdb9433822
Update/expand Contributing.rst regarding pull requests
2020-08-06 02:30:17 -04:00
7c2af344a1
Update changelog ( #1564 ) and xml ( dfhack/df-structures#400 )
2020-08-06 02:04:23 -04:00
02c0a6c8f6
Update getplants to use new plant_raw.material_defs layout
...
a9f219baf9#1564
2020-08-06 00:53:06 -04:00
d3fc691858
Merge remote-tracking branch 'PatrikLundell/Units' into develop
2020-08-06 00:12:54 -04:00
756bc4d54b
Merge remote-tracking branch 'myk002/quickfort_docs' into develop
2020-08-05 22:01:59 -04:00
Myk Taylor
lethosor
Ryan Bennitt