From 4125248b1b6d33a962e2afbe8f8ad43bddd969d8 Mon Sep 17 00:00:00 2001
From: Oreo Oreoniv <28255085+zKoz210@users.noreply.github.com>
Date: Tue, 5 Jan 2021 13:54:41 +0300
Subject: [PATCH 1/2] Remove aria-description

---
 resources/scripts/components/server/Console.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/scripts/components/server/Console.tsx b/resources/scripts/components/server/Console.tsx
index a818c887e..6594b0595 100644
--- a/resources/scripts/components/server/Console.tsx
+++ b/resources/scripts/components/server/Console.tsx
@@ -223,7 +223,6 @@ export default () => {
                         type={'text'}
                         placeholder={'Type a command...'}
                         aria-label={'Console command input.'}
-                        aria-description={'Type a command and press enter to send to server.'}
                         disabled={!instance || !connected}
                         onKeyDown={handleCommandKeyDown}
                     />

From ef3f8586c5454ee05c8b87bb819e6efea048efef Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Wed, 6 Jan 2021 21:45:06 -0800
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 541c2df60..7f04a6d88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v1.2.1
+### Fixed
+* Fixes URL-encoding of filenames when working in the filemanager to fix issues when moving, renaming, or deleting files.
+* Fixes URL-encoding of email addresses when requesting a password reset.
+
+### Added
+* Adds the ability for users to select a base Java Docker image for most Minecraft specific eggs shipped as defaults.
+
 ## v1.2.0
 ### Fixed
 * Fixes newest backup being deleted when creating a new one using the schedule tasks, rather than the oldest backup.