From f8130acf00a74e71d8bb13563d046f4b3e52a3ac Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Sat, 9 Jan 2021 21:58:49 +0100
Subject: [PATCH] Set version to 3.12.0

---
 CHANGELOG.md   | 7 ++++++-
 client/pom.xml | 8 +++++---
 common/pom.xml | 2 +-
 master/pom.xml | 2 +-
 server/pom.xml | 2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1a9af11..632c52c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,12 @@
-NEXT
+3.12.0
 ========================
 * Added "record later" tab to "bookmark" models
 * Added config option to show the total number of models in the title bar
+* Added support for hlsdl. Some sites (MV Live, LiveJasmin, Showup) are 
+  excluded, because they need some special behavior while the download is
+  running. hlsdl can be activated in the settings under "Advanced" or with
+  the config properties "useHlsdl", "hlsdlExecutable" and "loghlsdlOutput".
+  The used bandwidth calculation does not work with hlsdl.
 * Fixed problem with Cam4 playlist URLs, thanks @gohufrapoc
 
 3.11.0
diff --git a/client/pom.xml b/client/pom.xml
index 1857d6d4..c97847b0 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>ctbrec</groupId>
 		<artifactId>master</artifactId>
-		<version>3.11.0</version>
+		<version>3.12.0</version>
 		<relativePath>../master</relativePath>
 	</parent>
 
@@ -106,7 +106,7 @@
 					<plugin>
 						<groupId>com.akathist.maven.plugins.launch4j</groupId>
 						<artifactId>launch4j-maven-plugin</artifactId>
-						<version>1.7.22</version>
+						<version>1.7.25</version>
 						<executions>
 							<execution>
 								<id>l4j-win</id>
@@ -132,7 +132,9 @@
 										<bundledJre64Bit>true</bundledJre64Bit>
 										<minVersion>15</minVersion>
 										<maxHeapSize>512</maxHeapSize>
-										<opt>-Dfile.encoding=utf-8</opt>
+										<opts>
+											<opt>-Dfile.encoding=utf-8</opt>
+										</opts>
 									</jre>
 									<versionInfo>
 										<fileVersion>${project.version}.0</fileVersion>
diff --git a/common/pom.xml b/common/pom.xml
index 4d831a05..6b0fbee3 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>ctbrec</groupId>
 		<artifactId>master</artifactId>
-		<version>3.11.0</version>
+		<version>3.12.0</version>
 		<relativePath>../master</relativePath>
 	</parent>
 
diff --git a/master/pom.xml b/master/pom.xml
index 96ce2cf1..146e0658 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>ctbrec</groupId>
 	<artifactId>master</artifactId>
 	<packaging>pom</packaging>
-	<version>3.11.0</version>
+	<version>3.12.0</version>
 
 	<modules>
 		<module>../common</module>
diff --git a/server/pom.xml b/server/pom.xml
index 4e879c40..d9a98733 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
         <groupId>ctbrec</groupId>
         <artifactId>master</artifactId>
-        <version>3.11.0</version>
+        <version>3.12.0</version>
         <relativePath>../master</relativePath>
     </parent>