Merge branch 'develop' into docs

develop
myk002 2022-07-28 05:52:50 -07:00
commit 4dea700ac9
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
3 changed files with 3 additions and 1 deletions

@ -42,6 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## Misc Improvements
- Init scripts: ``dfhack.init`` and other init scripts have moved to ``dfhack-config/init/``. If you have customized your ``dfhack.init`` file and want to keep your changes, please move the part that you have customized to the new location at ``dfhack-config/init/dfhack.init``. If you do not have changes that you want to keep, do not copy anything, and the new defaults will be used automatically.
- `keybinding`: support backquote (\`) as a hotkey
- `manipulator`: add a library of useful default professions
- `manipulator`: move professions configuration from ``professions/`` to ``dfhack-config/professions/`` to keep it together with other dfhack configuration. If you have saved professions that you would like to keep, please manually move them to the new folder.
- ``materials.ItemTraitsDialog``: added a default ``on_select``-handler which toggles the traits.

@ -45,6 +45,7 @@ static void find_active_keybindings(df::viewscreen *screen)
sorted_keys.clear();
vector<string> valid_keys;
for (char c = 'A'; c <= 'Z'; c++)
{
valid_keys.push_back(string(&c, 1));

@ -1 +1 @@
Subproject commit 78b7554a17d7d385986b2f801d5791485e740afb
Subproject commit b9d49dfc36dae9b8b1bf91c2a8e8179ca554abdc