From 91a31af7fa936c0150193302e44bc76982d3c8f3 Mon Sep 17 00:00:00 2001
From: Niklas Stich <32730297+niklasstich@users.noreply.github.com>
Date: Thu, 11 Apr 2024 15:12:10 +0200
Subject: [PATCH] Update changelog and bump version

---
 .../Resources/View/Shared/MainLayout.de.resx          |  2 +-
 .../Resources/View/Shared/MainLayout.en.resx          |  2 +-
 AuthoringTool/electron.manifest.json                  |  2 +-
 Changelog.md                                          | 11 +++++++++++
 Presentation/Resources/View/HeaderBar.de.resx         |  2 +-
 Presentation/Resources/View/HeaderBar.en.resx         |  2 +-
 Shared/Constants.cs                                   |  2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/AuthoringTool/Resources/View/Shared/MainLayout.de.resx b/AuthoringTool/Resources/View/Shared/MainLayout.de.resx
index cb859f23..f7ce6cf4 100644
--- a/AuthoringTool/Resources/View/Shared/MainLayout.de.resx
+++ b/AuthoringTool/Resources/View/Shared/MainLayout.de.resx
@@ -24,6 +24,6 @@
         </value>
     </resheader>
     <data name="PageTitle" xml:space="preserve">
-        <value>Autorentool v2.1.1</value>
+        <value>Autorentool v2.1.2</value>
     </data>
 </root>
\ No newline at end of file
diff --git a/AuthoringTool/Resources/View/Shared/MainLayout.en.resx b/AuthoringTool/Resources/View/Shared/MainLayout.en.resx
index a0148c14..17011b84 100644
--- a/AuthoringTool/Resources/View/Shared/MainLayout.en.resx
+++ b/AuthoringTool/Resources/View/Shared/MainLayout.en.resx
@@ -16,6 +16,6 @@
         </value>
     </resheader>
     <data name="PageTitle" xml:space="preserve">
-        <value>Authoring tool v2.1.1</value>
+        <value>Authoring tool v2.1.2</value>
     </data>
 </root>
\ No newline at end of file
diff --git a/AuthoringTool/electron.manifest.json b/AuthoringTool/electron.manifest.json
index 6a226249..15e8c290 100644
--- a/AuthoringTool/electron.manifest.json
+++ b/AuthoringTool/electron.manifest.json
@@ -20,7 +20,7 @@
     "appId": "com.AuthoringTool.app",
     "productName": "AuthoringTool",
     "copyright": "Copyright © 2023 Team AdLer",
-    "buildVersion": "2.1.1",
+    "buildVersion": "2.1.2",
     "compression": "maximum",
     "directories": {
       "output": "../../../bin/Desktop_Publish"
diff --git a/Changelog.md b/Changelog.md
index e5094c29..9ff9ec91 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,6 +19,17 @@
 
 </details>
 
+## [2.1.2] - 2024-04-11
+
+### Changed
+- Changed a typo in the German version of the Create World dialog.
+- Changed an inconsistency of wording where the action of deleting a learning world was incorrectly referred to as closing it instead.
+
+### Fixed
+- Fixed a bug where the program would crash if you try to delete learning content which is currently opened in a program that holds a lock on the file. (#504)
+- Fixed a bug where deleting a learning world would incorrectly be undoable (#506)
+
+
 ## [2.1.1] - 2024-03-15
 
 ### Added
diff --git a/Presentation/Resources/View/HeaderBar.de.resx b/Presentation/Resources/View/HeaderBar.de.resx
index 448ca387..ea4b7770 100644
--- a/Presentation/Resources/View/HeaderBar.de.resx
+++ b/Presentation/Resources/View/HeaderBar.de.resx
@@ -22,7 +22,7 @@
         <value>Autorentool</value>
     </data>
     <data name="AuthoringTool.Version" xml:space="preserve">
-        <value>v2.1.1</value>
+        <value>v2.1.2</value>
     </data>
     <data name="3DWorld.Generate.Text" xml:space="preserve">
         <value>Veröffentlichen der Lernwelt</value>
diff --git a/Presentation/Resources/View/HeaderBar.en.resx b/Presentation/Resources/View/HeaderBar.en.resx
index d0480d6c..78ef6fba 100644
--- a/Presentation/Resources/View/HeaderBar.en.resx
+++ b/Presentation/Resources/View/HeaderBar.en.resx
@@ -22,7 +22,7 @@
         <value>Authoring tool</value>
     </data>
     <data name="AuthoringTool.Version" xml:space="preserve">
-        <value>v2.1.1</value>
+        <value>v2.1.2</value>
     </data>
     <data name="3DWorld.Generate.Text" xml:space="preserve">
         <value>Publish learning world</value>
diff --git a/Shared/Constants.cs b/Shared/Constants.cs
index 66cf7f47..4d46ceee 100644
--- a/Shared/Constants.cs
+++ b/Shared/Constants.cs
@@ -2,6 +2,6 @@ namespace Shared;
 
 public static class Constants
 {
-    public const string ApplicationVersion = "2.1.1";
+    public const string ApplicationVersion = "2.1.2";
     public const string AtfVersion = "2.0";
 }
\ No newline at end of file