e8c8953cbb
Re-add and update misery plugin
...
Closes #1037
Ref #1011
2016-12-10 18:22:32 -05:00
3bae9d9d65
Lua API: Make bitfield.whole return an integer, not a decimal
2016-12-10 12:27:43 -05:00
0c6c94b310
Merge branch 'develop' of gh:dfhack/dfhack into develop
2016-12-09 11:28:09 -05:00
6e16a7a20c
Update xml, scripts
2016-12-09 11:27:44 -05:00
d6fda58ca0
Remove treefarm (PR #1011 )
...
Merge remote-tracking branch 'PeridexisErrant/remove-broken-plugins'
advtools and misery are still partially broken, but parts of them still work, so
repairing them is possible.
2016-12-09 11:20:35 -05:00
1545a4106b
Merge pull request #1035 from ab9rf/labormanager-0.43.05-r1
...
labormanager: fix StoreItemInVehicle labor inference
2016-12-09 11:07:00 -05:00
1a9d8629c5
labormanager: fix StoreItemInVehicle labor inference ( #8 )
...
* labormanager: add deconstruct labor for constructed instruments
* labormanager: fix StoreItemInVehicle labor inference
StoreItemInVehicle requires the labor appropriate to the item being
stashed
2016-12-09 09:54:20 -06:00
8012c5686b
Merge pull request #1034 from ab9rf/labormanager-0.43.05-r1
...
labormanager: add deconstruct labor for constructed instruments
2016-12-08 17:15:04 -05:00
50ce9942f4
labormanager: add deconstruct labor for constructed instruments ( #7 )
2016-12-08 16:01:14 -06:00
8521b830b2
Merge remote-tracking branch 'CannibalVox/job_remove' into develop
2016-12-05 15:24:37 -05:00
672410bea7
travis: Use sphinx 1.4 only for now
...
The sphinx.domains.cpp extension (which I'm not sure we're explicitly using)
generates a warning with parallel docs builds, which causes the Travis build to
fail. This may be something that needs to be fixed upstream.
2016-12-05 12:21:27 -05:00
a5afd98863
travis: install requests[security] to silence sphinx warning
2016-12-05 12:14:08 -05:00
8488b1a953
ruby: use correct raw string length with encodings
2016-12-05 10:29:16 +01:00
595f3857b6
Reverse the param order of these two methods
...
The current way doesn't match other Job module methods
2016-12-01 20:13:49 -08:00
eaf9b75a18
Merge pull request #1026 from ab9rf/labormanager-0.43.05-r1
...
labormanager: fix deconstruction of buildings containing items
2016-12-01 18:41:10 -05:00
1eaa2033dc
Merge pull request #6 from ab9rf/labormanager-0.43.03-working
...
further tweak building construction labor identification
2016-12-01 14:38:21 -06:00
ad6d6fbaa6
further tweak building construction labor identification
...
It's always more complicated than you expect....
2016-12-01 14:36:46 -06:00
1fa997612f
Merge pull request #5 from ab9rf/labormanager-0.43.03-working
...
Mysteriously disappearing code reinserted
2016-12-01 11:12:39 -06:00
1d97638579
Mysteriously disappearing code reinserted
2016-12-01 11:10:52 -06:00
6856a7ebe0
Merge pull request #4 from ab9rf/labormanager-0.43.03-working
...
Fix deconstruction of buildings containing items
2016-12-01 11:07:36 -06:00
77a1264a94
Fix deconstruction of buildings containing items
2016-12-01 11:06:40 -06:00
a8eb10f111
Merge remote-tracking branch 'nocico/develop' into develop
2016-11-29 01:55:28 -05:00
ddf447d3de
Merge pull request #1022 from ab9rf/labormanager-0.43.05-r1
...
Use attributes in calculating assignment weight
2016-11-29 01:51:56 -05:00
0ab3005a89
Merge pull request #3 from ab9rf/labormanager-0.43.03-working
...
Incorporate more updates cherrypicked from nocico
2016-11-29 00:24:31 -06:00
d5d0775f1a
Remove redundant cast
2016-11-29 00:22:34 -06:00
5c16b5a2b7
labormanager: multimaterial constructions
2016-11-28 23:53:40 -06:00
d626990ac8
labormanager: trap components
2016-11-28 23:53:39 -06:00
442a12a9b2
labormanager: multimaterial constructions
2016-11-29 05:48:58 +02:00
15b7ba552d
labormanager: trap components
2016-11-29 05:48:58 +02:00
ba4952491a
Update scripts
2016-11-28 00:02:59 -05:00
51c7039f92
Merge pull request #1024 from nocico/develop
...
labormanager: support for jobs in bowyer's shop
2016-11-27 23:57:39 -05:00
7c0fecec14
Merge pull request #2 from ab9rf/labormanager-0.43.03-working
...
Pull working changes forward to 0.43.05
2016-11-27 22:53:29 -06:00
ae48612ebd
labormanager: support for jobs in bowyer's shop
2016-11-27 22:47:53 -06:00
5405c76746
labormanager: support for jobs in bowyer's shop
2016-11-28 05:40:03 +02:00
0acd1c9059
make labormanager know building instruments is furniture hauling
2016-11-26 21:09:31 -06:00
10384fe720
make labormanager know building instruments is furniture hauling
2016-11-26 21:07:02 -06:00
b25fcdecbe
Merge pull request #1 from ab9rf/labormanager-0.43.03-working
...
Harmonize 43.03 and 43.05 versions
2016-11-26 21:02:22 -06:00
ad84217687
fix white space to make travis happy
2016-11-26 20:55:10 -06:00
47426e3e00
Use attributes in calculating assignment weight
2016-11-26 20:55:10 -06:00
a28c4db69a
Finish clipped sentence. (erk.)
2016-11-26 20:55:10 -06:00
61baaa0c37
Docs for labormanager
2016-11-26 20:55:10 -06:00
cbcb148182
Better job assignment algorithm for labormanager.
2016-11-26 20:55:09 -06:00
491d53b76f
fix white space to make travis happy
2016-11-26 18:08:48 -06:00
c009640e74
Merge branch 'labormanager-0.43.05-r1' of https://github.com/ab9rf/dfhack into labormanager-0.43.05-r1
2016-11-26 18:05:16 -06:00
338f6029a7
Use attributes in calculating assignment weight
2016-11-26 17:55:08 -06:00
fe1dd01535
Better job assignment algorithm for labormanager.
2016-11-26 17:55:08 -06:00
8eb4f17b23
Use attributes in calculating assignment weight
2016-11-26 17:37:26 -06:00
b723378a62
Add nocico to Authors.rst ( f71d195)
2016-11-26 14:06:31 -05:00
50dd773d6f
Merge pull request #1020 from nocico/develop
...
make labormanager know building instruments is furniture hauling
2016-11-26 12:55:53 -05:00
f71d19578c
make labormanager know building instruments is furniture hauling
2016-11-26 13:39:20 +02:00
lethosor
Lethosor
Kelly Kinkade
jj
Stephen Baynham
nocico