diff --git a/docs/changelog.txt b/docs/changelog.txt index 512f5f1cd..1fa16e58f 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -35,8 +35,13 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ======== making a new DFHack release! ======== ================================================================================ # Future + +## Fixes +- `modtools/item-trigger`: fixed token format in help text + ## Misc Improvements - Reorganized changelogs and improved changelog editing process +- `modtools/item-trigger`: added support for multiple type/material/contaminant conditions ================================================================================ diff --git a/scripts b/scripts index 4e3b9aa4e..7d7dd8a74 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 4e3b9aa4e32e0b552c01f9a1e4a6eaa3af0cdb58 +Subproject commit 7d7dd8a7498e975a19231435e7cb225025042a78