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 |
|
lethosor
|
79387647d3
|
Update scripts
|
2020-04-15 01:09:29 -04:00 |
|
lethosor
|
c97adb9173
|
Update changelog (#1528, #1530)
|
2020-04-15 01:09:16 -04:00 |
|
lethosor
|
57d565c735
|
Merge remote-tracking branch 'PatrikLundell/TranslateName' into develop
|
2020-04-15 01:07:34 -04:00 |
|
lethosor
|
ff95f49e4f
|
Merge remote-tracking branch 'lethosor/github-actions' into develop
|
2020-04-15 00:52:37 -04:00 |
|
lethosor
|
7e6d939085
|
Merge remote-tracking branch 'Nilsolm/fix/autogems-binned-gems' into develop
|
2020-04-13 00:32:38 -04:00 |
Nilsolm
|
f7630a5270
|
update changelog
|
2020-04-12 11:03:28 +02:00 |
|
Nilsolm
|
362e49c0bc
|
autogems: check bin content in linked stockpiles
|
2020-04-12 11:02:26 +02:00 |
|
Ben Lubar
|
3f72d9934e
|
Merge commit 'refs/pull/1547/head' of github.com:DFHack/dfhack into develop
|
2020-04-11 13:04:04 -05:00 |
|
Ben Lubar
|
67c1321a06
|
update structures
|
2020-04-11 13:03:38 -05:00 |
|
Nilsolm
|
d734c83a28
|
also update the changelog
|
2020-04-11 17:26:09 +02:00 |
|
Nilsolm
|
2b44e52cab
|
Add intrigue skill to manipulator
|
2020-04-11 16:47:29 +02:00 |
|
lethosor
|
ba12e0c6d4
|
Remove obsolete travis scripts
|
2020-04-11 02:33:50 -04:00 |
|
lethosor
|
dbff3355ba
|
Remove .travis.yml
|
2020-04-11 02:32:07 -04:00 |
|
lethosor
|
dc598d501a
|
Limit entire check-pr job to PRs only
|
2020-04-11 02:24:40 -04:00 |
|
lethosor
|
dbdd98829f
|
Add check for PR base branch
|
2020-04-11 02:22:53 -04:00 |
|
lethosor
|
b3db62742c
|
Rename workflow to match Travis, update badge
|
2020-04-11 02:15:57 -04:00 |