jj
|
8488b1a953
|
ruby: use correct raw string length with encodings
|
2016-12-05 10:29:16 +01:00 |
Lethosor
|
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 |
Kelly Kinkade
|
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 |
|
Kelly Kinkade
|
ad6d6fbaa6
|
further tweak building construction labor identification
It's always more complicated than you expect....
|
2016-12-01 14:36:46 -06:00 |
|
Kelly Kinkade
|
1fa997612f
|
Merge pull request #5 from ab9rf/labormanager-0.43.03-working
Mysteriously disappearing code reinserted
|
2016-12-01 11:12:39 -06:00 |
|
Kelly Kinkade
|
1d97638579
|
Mysteriously disappearing code reinserted
|
2016-12-01 11:10:52 -06:00 |
|
Kelly Kinkade
|
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 |
|
Kelly Kinkade
|
77a1264a94
|
Fix deconstruction of buildings containing items
|
2016-12-01 11:06:40 -06:00 |
lethosor
|
a8eb10f111
|
Merge remote-tracking branch 'nocico/develop' into develop
|
2016-11-29 01:55:28 -05:00 |
|
Lethosor
|
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 |
|
Kelly Kinkade
|
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 |
|
Kelly Kinkade
|
d5d0775f1a
|
Remove redundant cast
|
2016-11-29 00:22:34 -06:00 |
nocico
|
5c16b5a2b7
|
labormanager: multimaterial constructions
|
2016-11-28 23:53:40 -06:00 |
|
nocico
|
d626990ac8
|
labormanager: trap components
|
2016-11-28 23:53:39 -06:00 |
|
nocico
|
442a12a9b2
|
labormanager: multimaterial constructions
|
2016-11-29 05:48:58 +02:00 |
|
nocico
|
15b7ba552d
|
labormanager: trap components
|
2016-11-29 05:48:58 +02:00 |
|
lethosor
|
ba4952491a
|
Update scripts
|
2016-11-28 00:02:59 -05:00 |
|
Lethosor
|
51c7039f92
|
Merge pull request #1024 from nocico/develop
labormanager: support for jobs in bowyer's shop
|
2016-11-27 23:57:39 -05:00 |
|
Kelly Kinkade
|
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 |
|
nocico
|
ae48612ebd
|
labormanager: support for jobs in bowyer's shop
|
2016-11-27 22:47:53 -06:00 |
|
nocico
|
5405c76746
|
labormanager: support for jobs in bowyer's shop
|
2016-11-28 05:40:03 +02:00 |
|
nocico
|
0acd1c9059
|
make labormanager know building instruments is furniture hauling
|
2016-11-26 21:09:31 -06:00 |
|
nocico
|
10384fe720
|
make labormanager know building instruments is furniture hauling
|
2016-11-26 21:07:02 -06:00 |
|
Kelly Kinkade
|
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 |
|
Kelly Kinkade
|
ad84217687
|
fix white space to make travis happy
|
2016-11-26 20:55:10 -06:00 |
|
Kelly Kinkade
|
47426e3e00
|
Use attributes in calculating assignment weight
|
2016-11-26 20:55:10 -06:00 |
|
Kelly Kinkade
|
a28c4db69a
|
Finish clipped sentence. (erk.)
|
2016-11-26 20:55:10 -06:00 |
|
Kelly Kinkade
|
61baaa0c37
|
Docs for labormanager
|
2016-11-26 20:55:10 -06:00 |
|
Kelly Kinkade
|
cbcb148182
|
Better job assignment algorithm for labormanager.
|
2016-11-26 20:55:09 -06:00 |
|
Kelly Kinkade
|
491d53b76f
|
fix white space to make travis happy
|
2016-11-26 18:08:48 -06:00 |
|
Kelly Kinkade
|
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 |
|
Kelly Kinkade
|
338f6029a7
|
Use attributes in calculating assignment weight
|
2016-11-26 17:55:08 -06:00 |
|
Kelly Kinkade
|
fe1dd01535
|
Better job assignment algorithm for labormanager.
|
2016-11-26 17:55:08 -06:00 |
|
Kelly Kinkade
|
8eb4f17b23
|
Use attributes in calculating assignment weight
|
2016-11-26 17:37:26 -06:00 |
|
lethosor
|
b723378a62
|
Add nocico to Authors.rst (f71d195)
|
2016-11-26 14:06:31 -05:00 |
|
Lethosor
|
50dd773d6f
|
Merge pull request #1020 from nocico/develop
make labormanager know building instruments is furniture hauling
|
2016-11-26 12:55:53 -05:00 |
|
nocico
|
f71d19578c
|
make labormanager know building instruments is furniture hauling
|
2016-11-26 13:39:20 +02:00 |
|
lethosor
|
08840ccabf
|
Add abbradar to Authors.rst (da3c6404f)
|
2016-11-23 19:20:20 -05:00 |
|
lethosor
|
dd28079f30
|
Fix ruby.cpp compilation on win64
|
2016-11-22 22:43:48 -05:00 |
|
lethosor
|
13eb5e702b
|
bump to alpha2
|
2016-11-22 20:50:19 -05:00 |
|
lethosor
|
b41ace2f8f
|
Update scripts (travis)
|
2016-11-22 20:49:38 -05:00 |
|
lethosor
|
206e9ef993
|
Re-enable Travis IRC notifications
|
2016-11-22 17:31:36 -05:00 |
|
lethosor
|
c7a35d7ece
|
fix remotefortressreader protobuf error in clean builds
|
2016-11-22 17:24:36 -05:00 |
|
lethosor
|
647ef4d556
|
Fix labormanager whitespace
|
2016-11-22 17:17:56 -05:00 |
|
lethosor
|
80e0a91670
|
Update .travis.yml for 0.43.05
|
2016-11-22 16:59:34 -05:00 |
|
lethosor
|
45d138191e
|
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
|
2016-11-17 23:02:05 -05:00 |
|
lethosor
|
df9b5bca73
|
Allow ruby plugin to try more than one library path, including libruby.so on Linux
|
2016-11-17 10:31:48 -05:00 |
|
lethosor
|
dce00a5034
|
Partial compilation fixes for advtools, misery
|
2016-11-16 15:21:13 -05:00 |
|
lethosor
|
1e41cdc7f6
|
Fix labormanager docs
|
2016-11-16 15:20:22 -05:00 |
|
lethosor
|
c05f3d7d30
|
Update scripts
|
2016-11-14 14:18:34 -05:00 |