From 6bdbf5b0ddaa045a8fc6ff91e91dc30cb3d21e3f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Apr 2020 21:33:02 -0400
Subject: [PATCH] Update to 0.47.04-r1, update xml, scripts, changelog version

---
 CMakeLists.txt     | 4 ++--
 docs/changelog.txt | 2 ++
 library/xml        | 2 +-
 scripts            | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8dd5dc86c..5a5e8312b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,8 +180,8 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.47.04")
-set(DFHACK_RELEASE "beta1")
-set(DFHACK_PRERELEASE TRUE)
+set(DFHACK_RELEASE "r1")
+set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 16105efc2c..d3ed3e51c8 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -39,6 +39,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+# 0.47.04-r1
+
 ## Fixes
 - Fixed translation of certain types of in-game names
 - Fixed a crash in ``find()`` for some types when no world is loaded
diff --git a/library/xml b/library/xml
index 08d81cea7c..0792fc0202 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 08d81cea7c32fee3fd55deb434d9f43e3b228497
+Subproject commit 0792fc0202fb6a04bfdaa262bc36a3b14c8581e5
diff --git a/scripts b/scripts
index b3c2e14029..2079b9fb69 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit b3c2e14029ebc544ea677738e3d155eaf732ef4c
+Subproject commit 2079b9fb69b8b4db48aa35ec54a96f5cca7cc8ef