f451cfb3a5
Merge remote-tracking branches 'cdombroski/autobutcher' and 'cdombroski/siren.lua'
...
Also update NEWS
2015-01-05 16:59:08 -05:00
67f0aa774c
Merge remote-tracking branch 'lethosor/tweaks-2'
...
Conflicts:
NEWS
2015-01-05 16:54:24 -05:00
e9fd8cf231
Merge remote-tracking branch 'lethosor/embark-tools-mouse'
...
Also update NEWS
2015-01-05 16:53:06 -05:00
0cfe6a11a3
Merge remote-tracking branch 'eswald/alt-stuck'
...
Conflicts:
NEWS
2015-01-05 16:50:16 -05:00
0c768796e2
Merge remote-tracking branch 'danaris/fortplan'
...
Conflicts:
plugins/buildingplan.cpp
2015-01-05 16:47:35 -05:00
57f6a94133
Merge remote-tracking branch 'lethosor/osx-libstdc++'
...
Also update NEWS
2015-01-05 16:39:42 -05:00
7da9ab8f80
Merge remote-tracking branch 'lethosor/0.40.22-plugins'
...
Also update NEWS
2015-01-05 16:37:34 -05:00
83142b9657
Merge remote-tracking branch 'PeridexisErrant/keybinding-defaults'
...
Also update NEWS
2015-01-05 16:34:14 -05:00
3bc17dafab
Merge remote-tracking branch 'PeridexisErrant/digfort-checks'
...
Conflicts:
NEWS
2015-01-05 16:32:14 -05:00
8f60e0eb01
Merge remote-tracking branches 'lethosor/remove-embark' and 'lethosor/revert-401-dfhack-log'
...
Also update NEWS
2015-01-05 16:31:03 -05:00
2bc5fe26ee
Update NEWS
2015-01-05 16:29:03 -05:00
1d0b4deef6
Merge remote-tracking branch 'eswald/trackstop'
...
Conflicts:
NEWS
2015-01-05 16:22:18 -05:00
ad6b19f1b2
Merge remote-tracking branch 'PeridexisErrant/needs_porting-cleanup'
...
Conflicts:
NEWS
2015-01-05 16:21:24 -05:00
9b429eb944
Update NEWS
2015-01-04 12:04:12 -07:00
cc22c034ab
Update NEWS
2015-01-01 14:38:14 -05:00
e71408b40b
replace hellhole.cpp with hfs-pit.lua
...
A port/update. May not have great argument handling, and there's a few
magic numbers, but it's a huge improvement over a non-compiling plugin.
2014-12-24 18:24:52 +11:00
86cb328bc8
Update NEWS for fortplan
2014-12-23 17:48:44 -05:00
dba7d1bd5d
Add file checks to digfort
...
Checking file type and existence before we start avoids a few issues,
and prevents (highly) misleading feedback of "done" regardless of action
taken. Closes #453
2014-12-18 09:50:00 +11:00
0b7f890d87
Trackstop bugfix: No longer prevents cancelling building removal.
...
Thanks to Ramblurr for pointing this out.
2014-12-16 21:10:18 -07:00
f3826abc0c
cleaning up in needs_porting
...
Removed obsolete plugins. Started hotkeys port. Mostly-finished
position port. Corrected dwarfmonitor date display. Documented
putontable.lua in readme.
2014-12-15 23:11:23 +11:00
729f7e7236
stockpiles: update NEWS & Readme
2014-12-05 13:32:01 +01:00
085c18ab2a
update NEWS and README with new stockpiles UI info
2014-12-05 12:35:24 +01:00
e8411bd4a4
Update NEWS.
2014-12-04 23:58:19 -05:00
19e977528c
Merge branch 'autolabor-artisans' of https://github.com/pkdawson/dfhack into develop
...
Conflicts:
NEWS
2014-12-04 23:49:13 -05:00
d9ae3cc612
Removed removebadthoughts and updated Readme.rst and NEWS.
2014-11-30 09:26:04 -05:00
5dcec6f683
Add Putnam's remove-stress script
2014-11-30 22:30:13 +11:00
9dbe639919
Merge pull request #402 from Ramblurr/stockpiles
...
plugin: Stockpile Settings Serialization
2014-11-28 23:15:46 -05:00
5b1eb0e770
Merge remote-tracking branch 'lethosor/cmdprompt-cursor' into develop
2014-11-28 23:13:09 -05:00
5912f63253
Update NEWS.
2014-11-28 23:03:39 -05:00
794e1ee6f0
autolabor: Document and improve the talent pool parameter.
2014-11-27 21:13:20 +01:00
1c496fb255
add savestock and loadstock to NEWS and Readme.rst
2014-11-27 14:49:16 +01:00
4e69046c72
Update NEWS
2014-11-25 20:26:54 -05:00
a6b5ffef79
Update NEWS.
2014-11-20 00:05:33 -05:00
fc758fdbe4
NEWS: Consistent spacing
2014-11-15 16:48:06 -05:00
fa79f297a3
Update NEWS
2014-11-15 16:46:46 -05:00
61fa2fbda0
Merge remote-tracking branch 'falconne/plugin_automelt' into update-falconne-plugins
...
Conflicts:
NEWS
plugins/CMakeLists.txt
plugins/automelt.cpp
2014-11-15 16:31:51 -05:00
723d6af9f8
Merge https://github.com/Mchl/dfhack into develop. Manually remove trailing whitespace, update NEWS.
...
Conflicts:
scripts/forum-dwarves.lua
2014-11-15 15:33:48 -05:00
15194613f5
Manually add hobotron's superdwarf fix.
2014-11-15 15:23:00 -05:00
3021fa47db
Merge remote-tracking branches 'jjyg/develop', 'putnam/patch-4' and 'eswald/blank-histories' into develop
...
Conflicts:
NEWS
2014-11-15 15:07:20 -05:00
23b76d4672
Update NEWS.
2014-11-15 00:24:02 -05:00
ba8b964f8d
reaction-trigger-transition.lua should work now.
2014-11-15 00:06:10 -05:00
59ef4e0cc2
It is now possible to remove syndromes by SYN_CLASS.
2014-11-14 23:33:49 -05:00
4464d7318d
EventManager: make REPORT events only trigger for new reports, not ones that already exist in the save.
2014-11-14 22:07:48 -05:00
26ab2165b3
Updating NEWS
2014-11-14 18:58:57 -07:00
c7e0a13505
Merge branch 'adaptation-4015' of https://github.com/hobotron-df/dfhack into develop
...
Conflicts:
NEWS
2014-11-14 19:06:04 -05:00
a474bc4dea
Merge remote-tracking branch 'dfhack/develop' into develop
...
Conflicts:
NEWS
2014-11-14 18:58:21 -05:00
f9985ade7b
Update NEWS.
2014-11-14 18:57:09 -05:00
c40c4460ba
Merge remote-tracking branch 'putnam/fullhealfix' into develop
...
Conflicts:
NEWS
2014-11-14 18:56:21 -05:00
38c4edf858
Merge pull request #388 from Putnam3145/add-thought
...
Add "add-thought" script to main repo
2014-11-14 16:05:38 -05:00
0642333f97
Merge pull request #343 from PeridexisErrant/exportlegends-sites
...
exportlegends can do site maps, IDd field
2014-11-14 16:05:06 -05:00
lethosor
Eric Wald
PeridexisErrant
Timothy Collett
Casey Link
expwnent
expwnent
expwnent
Patrick Dawson
expwnent