From d6be5549aff63242f204af38812602ca08789db2 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 3 Apr 2018 11:31:14 -0400
Subject: [PATCH 1/3] Update scripts (dfhack/scripts#50)

---
 docs/changelog.txt | 5 +++++
 scripts            | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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

From f6a222751b3c5083a61c0b1d32d46b5eea86bf40 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 3 Apr 2018 11:36:06 -0400
Subject: [PATCH 2/3] Update xml (osx64 renderer)

---
 docs/changelog.txt | 2 ++
 library/xml        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 1fa16e58f..7f6c82bd2 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -43,6 +43,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Reorganized changelogs and improved changelog editing process
 - `modtools/item-trigger`: added support for multiple type/material/contaminant conditions
 
+## Structures
+-@ ``renderer``: fixed vtable addresses on 64-bit OS X
 
 ================================================================================
 # 0.44.09-alpha1
diff --git a/library/xml b/library/xml
index 61a240140..d02e2063c 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 61a240140332b9e3dbafbd8b3f0455c3bdd617a3
+Subproject commit d02e2063c52f685cd4b0d1bc28ba81f0c7b1e70a

From 490946cc5ee834f043e557314210d46508c99ce9 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 3 Apr 2018 11:36:11 -0400
Subject: [PATCH 3/3] Strip markers from multi-line changelog entries

---
 docs/gen_changelog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/gen_changelog.py b/docs/gen_changelog.py
index fcc6cb1f2..f5746dbf2 100644
--- a/docs/gen_changelog.py
+++ b/docs/gen_changelog.py
@@ -60,7 +60,7 @@ def parse_changelog():
             if multiline:
                 multiline += line
             elif '[[[' in line:
-                multiline = line
+                multiline = line.replace('[[[', '')
 
             if ']]]' in multiline:
                 line = multiline.replace(']]]', '')