Commit Graph

8749 Commits (26934e6185a71ad708c9960c599e53d8f8bae833)
 

Author SHA1 Message Date
Lethosor 26934e6185
Fix typo in changelog 2018-12-28 15:22:34 -05:00
JapaMala c01dbc7cd2 Merge remote-tracking branch 'dfhack/master' into remote_reader
# Conflicts:
#	docs/changelog.txt
#	scripts
2018-12-28 00:08:13 -06:00
lethosor 315852a251 labormanager: fix -Wreorder warning 2018-12-27 19:46:36 -05:00
lethosor 9fe24e1b3f Update changelog and bump version to r2 2018-12-27 19:39:43 -05:00
lethosor f8dd215012 Update scripts and related changelog entries 2018-12-27 17:57:55 -05:00
lethosor e74946f62e Update xml and related changelog entries 2018-12-27 17:37:13 -05:00
lethosor 3e2c898e1a Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
Also move changelog entries to misc improvements per #1383
2018-12-27 16:52:30 -05:00
Lethosor 58fd98cb12
Merge pull request #1386 from billw2012/lm-disable-labor
labormanager: add option to disable the management of a labor.
2018-12-27 16:49:01 -05:00
lethosor 32edeffc3f Remove unused find_package(Threads) 2018-12-27 16:31:57 -05:00
lethosor 5554b0d89f Merge remote-tracking branch 'suokko/runtime_debug_prints' into develop
Missing update to Plugins.rst from web editor
2018-12-27 16:30:47 -05:00
lethosor a2f8742128 Merge remote-tracking branch 'suokko/runtime_debug_prints' into develop
Also fix and reorganize changelog
2018-12-27 16:28:25 -05:00
Lethosor 0ccfc8be35
Fix a few typos in docs and reorganize a bit 2018-12-27 16:21:24 -05:00
JapaMala 368d70c2d7 Use VIRTUAL_CAST_VAR correctly. 2018-12-26 01:10:51 -06:00
JapaMala 84578d7052 Remove both debug dump functions. They aren't needed anymore. 2018-12-26 01:04:31 -06:00
Japa 9d9b6b377b
Update changelog.txt 2018-12-26 00:42:12 -06:00
JapaMala e6f7900c52 Force UTF-8 string literals. 2018-12-26 00:39:16 -06:00
JapaMala bacd3e6790 Revert jsoncpp update that wasdone by mistake. 2018-12-26 00:35:24 -06:00
JapaMala 45985fe5a9 Merge remote-tracking branch 'dfhack/develop' into remote_reader 2018-12-26 00:23:05 -06:00
JapaMala 09e7fd62bb Updated changelog. 2018-12-26 00:22:25 -06:00
JapaMala d73124ebf7 Use FOR_ENUM_ITEMS instead of the silly for loop I had. 2018-12-26 00:14:38 -06:00
JapaMala 4b7e0d3c56 Convert unicode to escaped characters, and some formatting niceness 2018-12-26 00:11:08 -06:00
JapaMala 701ac66f8e Update DF version define. (mainly used to be able to keep backwards compatibility) 2018-12-26 00:06:49 -06:00
JapaMala 95d3086fe6 Remove tabs 2018-12-26 00:05:17 -06:00
Lethosor 0209e76f19
Merge pull request #1385 from ab9rf/labormanager-cleaning
labormanager: assign more dwarves to cleaning
2018-12-23 23:14:53 -05:00
lethosor 13c6bfc1b2 Merge remote-tracking branch 'sgayda2/memory_fixes' into develop 2018-12-22 11:54:31 -05:00
lethosor dfbb2416d9 Update docs for nestboxes (#1395) 2018-12-20 21:29:48 -05:00
lethosor 92482d63f5 Merge remote-tracking branch 'ab9rf/nestboxes' into develop 2018-12-20 20:57:09 -05:00
PatrikLundell ef57295c02 Added coal search to embark-assistant 2018-12-04 14:58:10 +01:00
PatrikLundell 0916d69373 Added coal search to embark-assistant 2018-12-04 14:57:44 +01:00
PatrikLundell 8f9cbfeafd Added coal search to embark-assistant 2018-12-04 14:57:23 +01:00
PatrikLundell 1ef7f0746c Added coal search to embark-assistant 2018-12-04 14:56:55 +01:00
PatrikLundell efeb0504cc Added coal search to embark-assistant 2018-12-04 14:55:59 +01:00
PatrikLundell 5f6376e76e Added coal search to embark-assistant 2018-12-04 14:55:16 +01:00
PatrikLundell 32aaa37070 Added coal search to embark-assistant 2018-12-04 14:54:28 +01:00
JapaMala 435e44d99b Merge branch 'develop' of https://github.com/DFHack/dfhack into remote_reader 2018-12-02 08:57:15 -06:00
JapaMala f8f5615691 Update structures. 2018-12-02 08:52:32 -06:00
JapaMala e5d14fe8c1 Remove VSCode junk 2018-12-02 08:51:32 -06:00
lethosor b913076451 Update xml, stonesense, changelog
Merged DFHack/df-structures#296 and (modified) attached changelog
entry
2018-11-24 17:09:24 -05:00
lethosor 368f8d0504 Remove and replace checks for OnBreak 2018-11-24 14:52:26 -05:00
Lethosor 34b8a41ad9
Merge pull request #1403 from BenLubar/imgbot
[ImgBot] optimizes images
2018-11-14 16:43:36 -05:00
Japa Mala Illo 67ce858772 Changed some debug stuff to use new variable names from the xmls 2018-11-11 16:21:15 -06:00
Japa Mala Illo 6aea842f1b Added tree info data to protos, not used yet. 2018-10-28 10:45:32 -05:00
Japa Mala Illo 2445559c30 update XML 2018-10-28 10:34:19 -05:00
Japa Mala Illo 85a4fef1d8 Added unknowns to saved tree export. 2018-10-28 10:22:55 -05:00
Japa Mala Illo d677880131 Fix issues with missing onbreak flag 2018-10-28 10:22:03 -05:00
Japa Mala Illo 836c011b33 Changed the plant tiles to more descriptive names. 2018-10-28 09:33:26 -05:00
Japa Mala Illo 7b6b83bdcf added a command to dump all trees in the map for debug. 2018-10-28 02:01:01 -05:00
Japa Mala Illo 3cfff21149 Update XMLs 2018-10-22 18:23:43 -05:00
billw2012 fefef2e121 Deprioritize dwarves with unmanged labors assigned, some renaming from disabled to unmanaged. 2018-08-31 20:53:06 +01:00
ImgBotApp 0809de2d56
[ImgBot] optimizes images
*Total -- 141.35kb -> 100.12kb (29.17%)

/reversing/doc/building-facing/screw/4.png -- 2.68kb -> 1.46kb (45.67%)
/reversing/doc/building-facing/screw/2-windows.png -- 4.59kb -> 2.54kb (44.59%)
/docs/images/hotkeys.png -- 56.84kb -> 31.62kb (44.38%)
/reversing/doc/building-facing/screw/3.png -- 2.62kb -> 1.48kb (43.58%)
/reversing/doc/building-facing/screw/2.png -- 2.68kb -> 1.53kb (43.18%)
/reversing/doc/building-facing/screw/1.png -- 2.66kb -> 1.56kb (41.58%)
/reversing/doc/building-facing/horizontal_axle/1.png -- 2.74kb -> 1.62kb (40.83%)
/reversing/doc/building-facing/horizontal_axle/2.png -- 2.78kb -> 1.66kb (40.32%)
/reversing/doc/building-facing/waterwheel/linux.png -- 3.94kb -> 2.76kb (29.89%)
/reversing/doc/building-facing/horizontal_axle/2-windows.png -- 14.74kb -> 12.88kb (12.63%)
/reversing/doc/building-facing/bridge/linux1.png -- 13.42kb -> 11.85kb (11.7%)
/reversing/doc/building-facing/bridge/windows.png -- 15.11kb -> 13.71kb (9.32%)
/reversing/doc/building-facing/waterwheel/windows.png -- 16.52kb -> 15.46kb (6.45%)
2018-08-30 06:18:07 +00:00