From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 16 May 2015 17:39:30 +0000 (+0200)
Subject: Preparing release 2.1.4
X-Git-Tag: 2.1.4~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3bf2b810bb7211ae7c4d999751820b9066132f4b;p=GitHub%2FWoltLab%2FWCF.git

Preparing release 2.1.4
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 333a3b576b..adf255f1df 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
 		<packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
 		<packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
 		<isapplication>1</isapplication>
-		<version>2.1.3</version> <!-- codename: typhoon -->
-		<date>2015-04-14</date>
+		<version>2.1.4</version> <!-- codename: typhoon -->
+		<date>2015-05-16</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -135,35 +135,15 @@
 		<instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
 	</instructions>
 	
-	<!-- Heads up! Keep all update blocks below in sync! -->
-	
-	<instructions type="update" fromversion="2.1.2">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
-		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-	</instructions>
-	
-	<instructions type="update" fromversion="2.1.2 pl 1">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
-		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-	</instructions>
-	
-	<instructions type="update" fromversion="2.1.2 pl 2">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
-		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-	</instructions>
-	
-	<instructions type="update" fromversion="2.1.2 pl 3">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
-		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-	</instructions>
-	
-	<instructions type="update" fromversion="2.1.2 pl 4">
+	<instructions type="update" fromversion="2.1.3">
 		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
+		
+		<instruction type="language" run="standalone">language/*.xml</instruction>
+		
+		<instruction type="bbcode">bbcode.xml</instruction>
+		<instruction type="objectType">objectType.xml</instruction>
+		<instruction type="option">option.xml</instruction>
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 570c02e4e6..9be9043f8b 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -38,7 +38,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.1.3 (Typhoon)');
+define('WCF_VERSION', '2.1.4 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());