From 266e5403745730d964300197cfaca7d40a4ccabe Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 31 Aug 2022 11:59:33 -0400
Subject: [PATCH 01/24] Add bedrock update support

---
 app/classes/shared/file_helpers.py |  7 ++++++-
 app/classes/shared/server.py       | 32 ++++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/app/classes/shared/file_helpers.py b/app/classes/shared/file_helpers.py
index 04ec3305..28edbef7 100644
--- a/app/classes/shared/file_helpers.py
+++ b/app/classes/shared/file_helpers.py
@@ -64,6 +64,11 @@ class FileHelpers:
         FileHelpers.copy_dir(src_path, dest_path)
         FileHelpers.del_dirs(src_path)
 
+    @staticmethod
+    def move_dir_exist(src_path, dest_path):
+        FileHelpers.copy_dir(src_path, dest_path, True)
+        FileHelpers.del_dirs(src_path)
+
     @staticmethod
     def move_file(src_path, dest_path):
         FileHelpers.copy_file(src_path, dest_path)
@@ -290,7 +295,7 @@ class FileHelpers:
                 for item in os.listdir(full_root_path):
                     if os.path.isdir(os.path.join(full_root_path, item)):
                         try:
-                            FileHelpers.move_dir(
+                            FileHelpers.move_dir_exist(
                                 os.path.join(full_root_path, item),
                                 os.path.join(new_dir, item),
                             )
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 0b2c5b96..cee0a8e9 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -9,6 +9,7 @@ import threading
 import logging.config
 import subprocess
 import html
+import urllib.request
 
 # TZLocal is set as a hidden import on win pipeline
 from tzlocal import get_localzone
@@ -1100,13 +1101,32 @@ class ServerInstance:
             self.settings["executable"],
         )
 
-        # copies to backup dir
-        FileHelpers.copy_file(current_executable, backup_executable)
+        try:
+            # copies to backup dir
+            FileHelpers.copy_file(current_executable, backup_executable)
+        except FileNotFoundError:
+            logger.error("Could not create backup of jarfile. File not found.")
 
-        # boolean returns true for false for success
-        downloaded = Helpers.download_file(
-            self.settings["executable_update_url"], current_executable
-        )
+        if HelperServers.get_server_type_by_id(self.server_id) != "minecraft-bedrock":
+            # boolean returns true for false for success
+            downloaded = Helpers.download_file(
+                self.settings["executable_update_url"], current_executable
+            )
+        else:
+            print("in download")
+            # downloads zip from remote url
+            urllib.request.urlretrieve(
+                self.settings["executable_update_url"],
+                os.path.join(self.settings["path"], "bedrock_server.zip"),
+            )
+            unzip_path = os.path.join(self.settings["path"], "bedrock_server.zip")
+            unzip_path = self.helper.wtol_path(unzip_path)
+            # unzips archive that was downloaded.
+            FileHelpers.unzip_file(unzip_path)
+            # adjusts permissions for execution if os is not windows
+            if not self.helper.is_os_windows():
+                os.chmod(os.path.join(self.settings["path"], "bedrock_server"), 0o0775)
+            downloaded = True
 
         while self.stats_helper.get_server_stats()["updating"]:
             if downloaded and not self.is_backingup:

From 600de2be0c93afdf2c5298c84ec3a664afb2bcc0 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 31 Aug 2022 12:18:52 -0400
Subject: [PATCH 02/24] Fix executable backups

Cleanup after ourselves
---
 app/classes/shared/server.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index cee0a8e9..8866b09a 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1079,22 +1079,23 @@ class ServerInstance:
         )
         # checks if backup directory already exists
         if os.path.isdir(backup_dir):
-            backup_executable = os.path.join(backup_dir, "old_server.jar")
+            backup_executable = os.path.join(backup_dir, self.settings["executable"])
         else:
             logger.info(
                 f"Executable backup directory not found for Server: {self.name}."
                 f" Creating one."
             )
             os.mkdir(backup_dir)
-            backup_executable = os.path.join(backup_dir, "old_server.jar")
+            backup_executable = os.path.join(backup_dir, self.settings["executable"])
 
-            if os.path.isfile(backup_executable):
-                # removes old backup
-                logger.info(f"Old backup found for server: {self.name}. Removing...")
-                os.remove(backup_executable)
-                logger.info(f"Old backup removed for server: {self.name}.")
-            else:
-                logger.info(f"No old backups found for server: {self.name}")
+        if len(os.listdir(backup_dir)) > 0:
+            # removes old backup
+            logger.info(f"Old backups found for server: {self.name}. Removing...")
+            for item in os.listdir(backup_dir):
+                os.remove(os.path.join(backup_dir, item))
+            logger.info(f"Old backups removed for server: {self.name}.")
+        else:
+            logger.info(f"No old backups found for server: {self.name}")
 
         current_executable = os.path.join(
             Helpers.get_os_understandable_path(self.settings["path"]),
@@ -1113,7 +1114,6 @@ class ServerInstance:
                 self.settings["executable_update_url"], current_executable
             )
         else:
-            print("in download")
             # downloads zip from remote url
             urllib.request.urlretrieve(
                 self.settings["executable_update_url"],
@@ -1126,6 +1126,10 @@ class ServerInstance:
             # adjusts permissions for execution if os is not windows
             if not self.helper.is_os_windows():
                 os.chmod(os.path.join(self.settings["path"], "bedrock_server"), 0o0775)
+
+            # we'll delete the zip we downloaded now
+
+            os.remove(os.path.join(self.settings["path"], "bedrock_server.zip"))
             downloaded = True
 
         while self.stats_helper.get_server_stats()["updating"]:

From 0f820433f137bcd0aaf248ad824734eabfa517f0 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 31 Aug 2022 12:39:52 -0400
Subject: [PATCH 03/24] Remove log path from config for bedrock

---
 app/classes/web/panel_handler.py                | 13 +++++++------
 app/frontend/templates/panel/server_config.html |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index a8bac6e2..7fa42d77 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1500,12 +1500,13 @@ class PanelHandler(BaseHandler):
                 if Helpers.is_os_windows():
                     server_path.replace(" ", "^ ")
                     server_path = Helpers.wtol_path(server_path)
-                log_path = self.get_argument("log_path", None)
-                if Helpers.is_os_windows():
-                    log_path.replace(" ", "^ ")
-                    log_path = Helpers.wtol_path(log_path)
-                if not self.helper.validate_traversal(server_obj.path, log_path):
-                    log_path = ""
+                log_path = self.get_argument("log_path", "")
+                if log_path:
+                    if Helpers.is_os_windows():
+                        log_path.replace(" ", "^ ")
+                        log_path = Helpers.wtol_path(log_path)
+                    if not self.helper.validate_traversal(server_obj.path, log_path):
+                        log_path = ""
                 executable = self.get_argument("executable", None)
                 execution_command = self.get_argument("execution_command", None)
                 server_ip = self.get_argument("server_ip", None)
diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html
index e1c38e1e..d19b482d 100644
--- a/app/frontend/templates/panel/server_config.html
+++ b/app/frontend/templates/panel/server_config.html
@@ -67,7 +67,7 @@
                     placeholder="{{ translate('serverConfig', 'serverPath', data['lang']) }}" required>
 
                 </div>
-
+                {% if data['server_stats']['server_type'] != "minecraft-bedrock" %}
                 <div class="form-group">
                   <label for="log_path">{{ translate('serverConfig', 'serverLogLocation', data['lang']) }} <small
                       class="text-muted ml-1"> - {{ translate('serverConfig', 'serverLogLocationDesc', data['lang'])
@@ -76,6 +76,7 @@
                     value="{{ data['server_stats']['server_id']['log_path']  }}"
                     placeholder="{{ translate('serverConfig', 'serverLogLocation', data['lang']) }}" required>
                 </div>
+                {% end %}
 
                 <div class="form-group">
                   <label for="executable">{{ translate('serverConfig', 'serverExecutable', data['lang']) }} <small

From 9350ed07d74d88ae72e6e507ce8d3b20bb3217c0 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Wed, 31 Aug 2022 19:04:04 +0100
Subject: [PATCH 04/24] Add bedrock remote url helper

---
 app/classes/shared/helpers.py | 36 +++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 40a57219..be278578 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -107,6 +107,42 @@ class Helpers:
             logger.error(f"Unable to check for new crafty version! \n{e}")
         return False
 
+    @staticmethod
+    def get_latest_bedrock_url():
+        """
+        Get latest bedrock executable url \n\n
+        returns url if successful, False if not
+        """
+        url = "https://minecraft.net/en-us/download/server/bedrock/"
+        headers = {
+            "Accept-Encoding": "identity",
+            "Accept-Language": "en",
+            "User-Agent": (
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+                "AppleWebKit/537.36 (KHTML, like Gecko) "
+                "Chrome/104.0.0.0 Safari/537.36"
+            ),
+        }
+        target_win = 'https://minecraft.azureedge.net/bin-win/[^"]*'
+        target_linux = 'https://minecraft.azureedge.net/bin-linux/[^"]*'
+
+        try:
+            # Get minecraft server download page
+            # (hopefully the don't change the structure)
+            download_page = get(url, headers=headers)
+
+            # Search for our string targets
+            win_download_url = re.search(target_win, download_page.text).group(0)
+            linux_download_url = re.search(target_linux, download_page.text).group(0)
+
+            if os.name == "nt":
+                return win_download_url
+
+            return linux_download_url
+        except Exception as e:
+            logger.error(f"Unable to resolve remote bedrock download url! \n{e}")
+        return False
+
     @staticmethod
     def find_java_installs():
         # If we're windows return oracle java versions,

From fdf1a5a41d3f8dca31e7853c6fcbbcab37d945ef Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Wed, 31 Aug 2022 19:46:07 +0100
Subject: [PATCH 05/24] Add url helper to bedrock update

---
 app/classes/shared/server.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 8866b09a..c49b33ff 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1116,7 +1116,7 @@ class ServerInstance:
         else:
             # downloads zip from remote url
             urllib.request.urlretrieve(
-                self.settings["executable_update_url"],
+                Helpers.get_latest_bedrock_url(),
                 os.path.join(self.settings["path"], "bedrock_server.zip"),
             )
             unzip_path = os.path.join(self.settings["path"], "bedrock_server.zip")
@@ -1128,7 +1128,6 @@ class ServerInstance:
                 os.chmod(os.path.join(self.settings["path"], "bedrock_server"), 0o0775)
 
             # we'll delete the zip we downloaded now
-
             os.remove(os.path.join(self.settings["path"], "bedrock_server.zip"))
             downloaded = True
 

From 0c9e10f18ac10bb4438de993ef6519dab0d7215e Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Wed, 31 Aug 2022 19:50:35 +0100
Subject: [PATCH 06/24] Fix sec overly permissive file permissions

775 is too permissive for this  file, '-rwxr--r--' is more than enough
B103: Test for setting permissive file permissions
https://bandit.readthedocs.io/en/latest/plugins/b103_set_bad_file_permissions.html
---
 app/classes/shared/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index c49b33ff..1f106e48 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1125,7 +1125,7 @@ class ServerInstance:
             FileHelpers.unzip_file(unzip_path)
             # adjusts permissions for execution if os is not windows
             if not self.helper.is_os_windows():
-                os.chmod(os.path.join(self.settings["path"], "bedrock_server"), 0o0775)
+                os.chmod(os.path.join(self.settings["path"], "bedrock_server"), 0o0744)
 
             # we'll delete the zip we downloaded now
             os.remove(os.path.join(self.settings["path"], "bedrock_server.zip"))

From 96c4fa3bdd6253eaf8a0bbe43dd6aa01b5676b2b Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Wed, 31 Aug 2022 20:04:39 +0100
Subject: [PATCH 07/24] Validate bedrock url before download with urllib

Even though there will be an incredibly small chance of tampering
this is to make bandit happy
"Bandit Test ID B310"
https://stackoverflow.com/a/53040523/18355876
---
 app/classes/shared/server.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 1f106e48..bd8d29f6 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1115,10 +1115,13 @@ class ServerInstance:
             )
         else:
             # downloads zip from remote url
-            urllib.request.urlretrieve(
-                Helpers.get_latest_bedrock_url(),
-                os.path.join(self.settings["path"], "bedrock_server.zip"),
-            )
+            bedrock_url = Helpers.get_latest_bedrock_url()
+            if bedrock_url.lower().startswith("https"):
+                urllib.request.urlretrieve(
+                    bedrock_url,
+                    os.path.join(self.settings["path"], "bedrock_server.zip"),
+                )
+
             unzip_path = os.path.join(self.settings["path"], "bedrock_server.zip")
             unzip_path = self.helper.wtol_path(unzip_path)
             # unzips archive that was downloaded.

From b274f0d3b029a1741364f4063ff58b648e0868a3 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 31 Aug 2022 19:36:43 -0400
Subject: [PATCH 08/24] Remove update url from config

---
 app/classes/web/panel_handler.py                | 2 +-
 app/frontend/templates/panel/server_config.html | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 7fa42d77..c0169014 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1511,7 +1511,7 @@ class PanelHandler(BaseHandler):
                 execution_command = self.get_argument("execution_command", None)
                 server_ip = self.get_argument("server_ip", None)
                 server_port = self.get_argument("server_port", None)
-                executable_update_url = self.get_argument("executable_update_url", None)
+                executable_update_url = self.get_argument("executable_update_url", "")
                 show_status = int(float(self.get_argument("show_status", "0")))
             else:
                 execution_command = server_obj.execution_command
diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html
index d19b482d..b065ef6f 100644
--- a/app/frontend/templates/panel/server_config.html
+++ b/app/frontend/templates/panel/server_config.html
@@ -139,6 +139,7 @@
                   </div>
 
                   {% if data['super_user'] %}
+                  {% if data['server_stats']['server_type'] != "minecraft-bedrock" %}
                   <div class="form-group">
                     <label for="executable_update_url">{{ translate('serverConfig', 'exeUpdateURL', data['lang']) }}
                       <small class="text-muted ml-1"> - {{ translate('serverConfig', 'exeUpdateURLDesc', data['lang'])
@@ -147,6 +148,7 @@
                       value="{{ data['server_stats']['server_id']['executable_update_url']  }}"
                       placeholder="{{ translate('serverConfig', 'exeUpdateURL', data['lang']) }}">
                   </div>
+                  {% end %}
 
                   <div class="form-group">
                     <label for="server_ip">{{ translate('serverConfig', 'serverIP', data['lang']) }} <small

From a07eb58db797d12812c05c45317f08e0a8924905 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 31 Aug 2022 19:45:19 -0400
Subject: [PATCH 09/24] Add bedrock server creation

---
 app/classes/shared/import_helper.py           |  34 +
 app/classes/shared/main_controller.py         |  43 +
 app/classes/shared/server.py                  |   2 +-
 app/classes/web/server_handler.py             |  19 +-
 app/frontend/templates/base.html              |   2 +-
 .../templates/server/bedrock_wizard.html      | 780 ++++++++++--------
 app/translations/de_DE.json                   |   2 +-
 app/translations/en_EN.json                   |   2 +-
 app/translations/es_ES.json                   |   4 +-
 app/translations/fi_FI.json                   |   4 +-
 app/translations/fr_FR.json                   |   4 +-
 app/translations/fy_NL.json                   |   4 +-
 app/translations/hr_HR.json                   |   4 +-
 app/translations/id_ID.json                   |   4 +-
 app/translations/it_IT.json                   |   4 +-
 app/translations/lv_LV.json                   |   4 +-
 app/translations/nl_BE.json                   |   4 +-
 app/translations/nl_NL.json                   |   4 +-
 app/translations/pl_PL.json                   |   4 +-
 app/translations/pt_BR.json                   |   4 +-
 app/translations/zh_CN.json                   |   4 +-
 21 files changed, 566 insertions(+), 370 deletions(-)

diff --git a/app/classes/shared/import_helper.py b/app/classes/shared/import_helper.py
index 769ebc3a..b5f8d193 100644
--- a/app/classes/shared/import_helper.py
+++ b/app/classes/shared/import_helper.py
@@ -3,6 +3,7 @@ import time
 import shutil
 import logging
 import threading
+import urllib
 
 from app.classes.controllers.server_perms_controller import PermissionsServers
 from app.classes.controllers.servers_controller import ServersController
@@ -214,3 +215,36 @@ class ImportHelpers:
                 os.chmod(full_jar_path, 0o2760)
         # deletes temp dir
         FileHelpers.del_dirs(temp_dir)
+
+    def download_bedrock_server(self, path, new_id):
+        download_thread = threading.Thread(
+            target=self.download_threaded_bedrock_server,
+            daemon=True,
+            args=(path, new_id),
+            name=f"{new_id}_download",
+        )
+        download_thread.start()
+
+    def download_threaded_bedrock_server(self, path, new_id):
+        # downloads zip from remote url
+        bedrock_url = Helpers.get_latest_bedrock_url()
+        if bedrock_url.lower().startswith("https"):
+            urllib.request.urlretrieve(
+                bedrock_url,
+                os.path.join(path, "bedrock_server.zip"),
+            )
+
+        unzip_path = os.path.join(path, "bedrock_server.zip")
+        unzip_path = self.helper.wtol_path(unzip_path)
+        # unzips archive that was downloaded.
+        FileHelpers.unzip_file(unzip_path)
+        # adjusts permissions for execution if os is not windows
+        if not self.helper.is_os_windows():
+            os.chmod(os.path.join(path, "bedrock_server"), 0o0744)
+
+        # we'll delete the zip we downloaded now
+        os.remove(os.path.join(path, "bedrock_server.zip"))
+        ServersController.finish_import(new_id)
+        server_users = PermissionsServers.get_server_user_list(new_id)
+        for user in server_users:
+            self.helper.websocket_helper.broadcast_user(user, "send_start_reload", {})
diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index cfda4c8d..68645b86 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -697,6 +697,49 @@ class Controller:
         )
         return new_id
 
+    def create_bedrock_server(self, server_name, user_id):
+        server_id = Helpers.create_uuid()
+        new_server_dir = os.path.join(self.helper.servers_dir, server_id)
+        backup_path = os.path.join(self.helper.backup_path, server_id)
+        server_exe = "bedrock_server"
+        if Helpers.is_os_windows():
+            # if this is windows we will override the linux bedrock server name.
+            server_exe = "bedrock_server.exe"
+            new_server_dir = Helpers.wtol_path(new_server_dir)
+            backup_path = Helpers.wtol_path(backup_path)
+            new_server_dir.replace(" ", "^ ")
+            backup_path.replace(" ", "^ ")
+
+        Helpers.ensure_dir_exists(new_server_dir)
+        Helpers.ensure_dir_exists(backup_path)
+
+        full_jar_path = os.path.join(new_server_dir, server_exe)
+
+        if Helpers.is_os_windows():
+            server_command = f'"{full_jar_path}"'
+        else:
+            server_command = f"./{server_exe}"
+        logger.debug("command: " + server_command)
+        server_log_file = ""
+        server_stop = "stop"
+
+        new_id = self.register_server(
+            server_name,
+            server_id,
+            new_server_dir,
+            backup_path,
+            server_command,
+            server_exe,
+            server_log_file,
+            server_stop,
+            "19132",
+            user_id,
+            server_type="minecraft-bedrock",
+        )
+        ServersController.set_import(new_id)
+        self.import_helper.download_bedrock_server(new_server_dir, new_id)
+        return new_id
+
     def import_bedrock_zip_server(
         self,
         server_name: str,
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index bd8d29f6..2a80965b 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -338,7 +338,7 @@ class ServerInstance:
                     "eula =true",
                 ]
 
-        if not e_flag:
+        if not e_flag and self.settings["type"] == "minecraft-java":
             if user_id:
                 self.helper.websocket_helper.broadcast_user(
                     user_id, "send_eula_bootbox", {"id": self.server_id}
diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index c13198ed..1c1d6fc6 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -97,6 +97,7 @@ class ServerHandler(BaseHandler):
             "version_data": self.helper.get_version_string(),
             "user_data": exec_user,
             "user_role": exec_user_role,
+            "online": Helpers.check_internet(),
             "roles": list_roles,
             "super_user": exec_user["superuser"],
             "user_crafty_permissions": exec_user_crafty_permissions,
@@ -173,7 +174,6 @@ class ServerHandler(BaseHandler):
                 )
                 return
 
-            page_data["online"] = Helpers.check_internet()
             page_data["server_types"] = self.controller.server_jars.get_serverjar_data()
             page_data["js_server_types"] = json.dumps(
                 self.controller.server_jars.get_serverjar_data()
@@ -548,25 +548,14 @@ class ServerHandler(BaseHandler):
                     self.get_remote_ip(),
                 )
             else:
-                if len(server_parts) != 2:
-                    self.redirect("/panel/error?error=Invalid server data")
-                    return
-                server_type, server_version = server_parts
-                # TODO: add server type check here and call the correct server
-                # add functions if not a jar
-                new_server_id = self.controller.create_jar_server(
-                    server_type,
-                    server_version,
+
+                new_server_id = self.controller.create_bedrock_server(
                     server_name,
-                    min_mem,
-                    max_mem,
-                    port,
                     exec_user["user_id"],
                 )
                 self.controller.management.add_to_audit_log(
                     exec_user["user_id"],
-                    f"created a {server_version} {str(server_type).capitalize()} "
-                    f'server named "{server_name}"',
+                    "created a Bedrock " f'server named "{server_name}"',
                     # Example: Admin created a 1.16.5 Bukkit server named "survival"
                     new_server_id,
                     self.get_remote_ip(),
diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html
index 1ab50da8..bfe530b9 100755
--- a/app/frontend/templates/base.html
+++ b/app/frontend/templates/base.html
@@ -378,7 +378,7 @@
         }
         bootbox.confirm({
           title: "{% raw translate('error', 'eulaTitle', data['lang']) %}",
-          message: "{% raw translate('error', 'eulaMsg', data['lang']) %} <br><br><a href='https://account.mojang.com/documents/minecraft_eula' target='_blank'>EULA</a><br><br>{% raw translate('error', 'eulaAgree', data['lang']) %}",
+          message: "{% raw translate('error', 'eulaMsg', data['lang']) %} <br><br><a href='https://www.minecraft.net/en-us/eula' target='_blank'>EULA</a><br><br>{% raw translate('error', 'eulaAgree', data['lang']) %}",
           buttons: {
             confirm: {
               label: 'Yes',
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index 42ab590c..465a9e10 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -7,445 +7,575 @@
 <div class="content-wrapper">
   <ul class="nav nav-tabs col-md-12 tab-simple-styled " role="tablist">
     <li class="nav-item term-nav-item">
-        <a class="nav-link" href="/server/step1" role="tab" aria-selected="false">
+      <a class="nav-link" href="/server/step1" role="tab" aria-selected="false">
         <i class="fas fa-file-signature"></i>Minecraft-Java</a>
     </li>
     <li class="nav-item term-nav-item">
       <a class="nav-link active" href="/server/bedrock_step1" role="tab" aria-selected="false">
         <i class="fas fa-file-signature"></i>Minecraft-Bedrock</a>
     </li>
-</ul>
-<br>
-<div class="d-none" id="overlay" onclick="hide(event)"></div>
-    <div class="row">
-      <div class="col-sm-6 grid-margin stretch-card">
-        <div class="card">
-          <div class="card-body">
-
-            <h4>{{ translate('serverWizard', 'importServer', data['lang']) }}</h4>
-            <br />
-            <p class="card-description">
-
-              <form method="post" class="server-wizard" onSubmit="wait_msg(true)">
-                {% raw xsrf_form_html() %}
-                <input type="hidden" value="import_jar" name="create_type">
-                <div class="row">
-
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-                      <input type="text" class="form-control" id="server_name" name="server_name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
-                    </div>
-                  </div>
-
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <label for="server">{{ translate('serverWizard', 'serverPath', data['lang']) }} <small>{{ translate('serverWizard', 'absoluteServerPath', data['lang']) }}</small></label>
-                      <input type="text" class="form-control" id="server_path" name="server_path" placeholder="/var/opt/server" required>
-                    </div>
-                  </div>
-
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
-                      <input type="text" class="form-control" id="server_jar" name="server_jar" value="" placeholder="bedrock_server" required>
-                    </div>
-                  </div>
+  </ul>
+  <br>
+  <div class="d-none" id="overlay" onclick="hide(event)"></div>
+  <div class="row">
+    {% if data['online'] %}
+    <div class="col-sm-6 grid-margin stretch-card">
+      <div class="card">
+        <div class="card-body">
 
+          <h4>{{ translate('serverWizard', 'newServer', data['lang']) }}</h4>
+          <br />
+          <p class="card-description">
 
+          <form method="post" name="create_server" class="server-wizard" onSubmit="wait_msg()">
+            {% raw xsrf_form_html() %}
+            <div class="row">
 
+              <div class="col-sm-12 col-md-12">
+                <div class="form-group">
+                  <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
+                  <input type="text" class="form-control" id="server_name" name="server_name"
+                    placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
                 </div>
-                <br />
-                <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) }}</small></h4>
-                <hr>
-                <div class="row">
+              </div>
 
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <label for="port2">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small></small></label>
-                      <input type="number" class="form-control" id="port2" name="port" value="19132" step="1" min="1" required>
+            </div>
+
+            <div class="col-sm-12">
+              <div class="form-group">
+                <div id="accordion-1">
+                  <div class="card">
+                    <div class="card-header p-2" id="Role-1">
+                      <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-1" aria-expanded="true"
+                        aria-controls="collapseRole-1">
+                        <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
+                        <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                          data['lang']) }}</small>
+                      </p>
                     </div>
-                  </div>
-                  <div class="col-sm-12">
-                    <div class="form-group">
-                      <div id="accordion-2">
-                        <div class="card">
-                          <div class="card-header p-2" id="Role-2">
-                            <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-2" aria-expanded="true" aria-controls="collapseRole-2">
-                              <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate', data['lang']) }}</small>
-                            </p>
-                          </div>
-                          <div id="collapseRole-2" class="collapse" aria-labelledby="Role-2" data-parent="">
-                            <div class="card-body scroll">
-                              <div class="form-group">
-                                {% for r in data['roles'] %}
-                                  <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}" type="checkbox">&nbsp;
-                                  {{ r['role_name'].capitalize() }}</label></span>
-                                {% end %}
-                              </div>
-                            </div>
-                          </div>
+                    <div id="collapseRole-1" class="collapse" aria-labelledby="Role-1" data-parent="">
+                      <div class="card-body scroll">
+                        <div class="form-group">
+                          {% for r in data['roles'] %}
+                          <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}"
+                                type="checkbox">&nbsp;
+                              {{ r['role_name'].capitalize() }}</label></span>
+                          {% end %}
                         </div>
                       </div>
                     </div>
                   </div>
                 </div>
-                <button type="submit" class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang']) }}</button>
-                <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang']) }}</button>
-
-              </form>
-            </p>
-          </div>
+              </div>
+            </div>
+            <button onclick="eula_confirm()" type="button" class="btn btn-primary mr-2">{{ translate('serverWizard',
+              'buildServer',
+              data['lang']) }}</button>
+            <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
+              }}</button>
         </div>
+        </form>
+        </p>
       </div>
-      <div class="col-sm-6 grid-margin stretch-card">
-        <div class="card">
-          <div class="card-body">
-
-            <h4>{{ translate('serverWizard', 'importZip', data['lang']) }}</h4>
-            <br />
-            <p class="card-description">
-
-              <form name="zip" method="post" class="server-wizard" onSubmit="wait_msg(true)">
-                {% raw xsrf_form_html() %}
-                <input type="hidden" value="import_zip" name="create_type">
-
-                <div class="row">
-                  <div class="col-sm-9">
-                    <div class="col-sm-12">
-                      <div class="form-group">
-                        <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-                        <input type="text" class="form-control" id="server_name" name="server_name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
-                      </div>
-                    </div>
-
-                    <div class="col-sm-12">
-                      <div class="form-group">
-                        <label for="server">{{ translate('serverWizard', 'zipPath', data['lang']) }} <small>{{ translate('serverWizard', 'absoluteZipPath', data['lang']) }}</small></label>
-                        <input type="text" class="form-control" id="server_path" name="server_path" placeholder="/var/opt/server.zip" required>
-                      </div>
-                    </div>
-
-                    <div class="col-sm-12">
-                      <div class="form-group">
-                        <label for="server">{{ translate('serverWizard', 'selectRoot', data['lang']) }} <small>{{ translate('serverWizard', 'explainRoot', data['lang']) }}</small></label>
-                        <br>
-                        <button class="btn btn-primary mr-2" id="root_files_button" type="button">{{ translate('serverWizard', 'clickRoot', data['lang']) }}</button>
-                      </div>
-                    </div>
-
-
-                    <div class="col-sm-12">
-                      <div class="form-group">
-                        <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
-                        <input type="text" class="form-control" id="server_jar" name="server_jar" value="" placeholder="bedrock_server" required>
-                      </div>
-                    </div>
-                  </div>
     </div>
+    {% end %}
+    <div class="col-sm-6 grid-margin stretch-card">
+      <div class="card">
+        <div class="card-body">
+
+          <h4>{{ translate('serverWizard', 'importServer', data['lang']) }}</h4>
+          <br />
+          <p class="card-description">
+
+          <form method="post" class="server-wizard" onSubmit="wait_msg(true)">
+            {% raw xsrf_form_html() %}
+            <input type="hidden" value="import_jar" name="create_type">
+            <div class="row">
+
+              <div class="col-sm-12">
+                <div class="form-group">
+                  <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
+                  <input type="text" class="form-control" id="server_name" name="server_name" value=""
+                    placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+                </div>
+              </div>
+
+              <div class="col-sm-12">
+                <div class="form-group">
+                  <label for="server">{{ translate('serverWizard', 'serverPath', data['lang']) }} <small>{{
+                      translate('serverWizard', 'absoluteServerPath', data['lang']) }}</small></label>
+                  <input type="text" class="form-control" id="server_path" name="server_path"
+                    placeholder="/var/opt/server" required>
+                </div>
+              </div>
+
+              <div class="col-sm-12">
+                <div class="form-group">
+                  <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
+                  <input type="text" class="form-control" id="server_jar" name="server_jar" value=""
+                    placeholder="bedrock_server" required>
+                </div>
+              </div>
 
 
 
-                  <div class="col-sm-12">
-                    <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) }}</small></h4>
-                    <hr>
-                    <div class="row">
+            </div>
+            <br />
+            <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small
+                style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
+                data['lang']) }}</small></h4>
+            <hr>
+            <div class="row">
 
-                      <div class="col-sm-12">
-                        <div class="form-group">
-                          <label for="port3">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small></small></label>
-                          <input type="number" class="form-control" id="port3" name="port" value="19132" step="1" min="1" required>
-                        </div>
+              <div class="col-sm-12">
+                <div class="form-group">
+                  <label for="port2">{{ translate('serverWizard', 'serverPort', data['lang']) }}
+                    <small></small></label>
+                  <input type="number" class="form-control" id="port2" name="port" value="19132" step="1" min="1"
+                    required>
+                </div>
+              </div>
+              <div class="col-sm-12">
+                <div class="form-group">
+                  <div id="accordion-2">
+                    <div class="card">
+                      <div class="card-header p-2" id="Role-2">
+                        <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-2" aria-expanded="true"
+                          aria-controls="collapseRole-2">
+                          <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
+                          <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                            data['lang']) }}</small>
+                        </p>
                       </div>
-
-                      <div class="col-sm-12">
-                        <div class="form-group">
-                          <div id="accordion-3">
-                            <div class="card">
-                              <div class="card-header p-2" id="Role-3">
-                                <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true" aria-controls="collapseRole-3">
-                                  <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate', data['lang']) }}</small>
-                                </p>
-                              </div>
-                              <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
-                                <div class="card-body scroll">
-                                  <div class="form-group">
-                                    {% for r in data['roles'] %}
-                                      <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}" type="checkbox">&nbsp;
-                                      {{ r['role_name'].capitalize() }}</label></span>
-                                    {% end %}
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
+                      <div id="collapseRole-2" class="collapse" aria-labelledby="Role-2" data-parent="">
+                        <div class="card-body scroll">
+                          <div class="form-group">
+                            {% for r in data['roles'] %}
+                            <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}"
+                                  type="checkbox">&nbsp;
+                                {{ r['role_name'].capitalize() }}</label></span>
+                            {% end %}
                           </div>
                         </div>
                       </div>
-                      <div class="col-sm-12" style="visibility: hidden;">
-                        <div class="form-group">
-                          <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <button type="submit" class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton',
+              data['lang']) }}</button>
+            <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
+              }}</button>
+
+          </form>
+          </p>
+        </div>
+      </div>
+    </div>
+    <div class="col-sm-6 grid-margin stretch-card">
+      <div class="card">
+        <div class="card-body">
+
+          <h4>{{ translate('serverWizard', 'importZip', data['lang']) }}</h4>
+          <br />
+          <p class="card-description">
+
+          <form name="zip" method="post" class="server-wizard" onSubmit="wait_msg(true)">
+            {% raw xsrf_form_html() %}
+            <input type="hidden" value="import_zip" name="create_type">
+
+            <div class="row">
+              <div class="col-sm-9">
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
+                    <input type="text" class="form-control" id="server_name" name="server_name" value=""
+                      placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+                  </div>
+                </div>
+
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="server">{{ translate('serverWizard', 'zipPath', data['lang']) }} <small>{{
+                        translate('serverWizard', 'absoluteZipPath', data['lang']) }}</small></label>
+                    <input type="text" class="form-control" id="server_path" name="server_path"
+                      placeholder="/var/opt/server.zip" required>
+                  </div>
+                </div>
+
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="server">{{ translate('serverWizard', 'selectRoot', data['lang']) }} <small>{{
+                        translate('serverWizard', 'explainRoot', data['lang']) }}</small></label>
+                    <br>
+                    <button class="btn btn-primary mr-2" id="root_files_button" type="button">{{
+                      translate('serverWizard', 'clickRoot', data['lang']) }}</button>
+                  </div>
+                </div>
+
+
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
+                    <input type="text" class="form-control" id="server_jar" name="server_jar" value=""
+                      placeholder="bedrock_server" required>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+
+
+            <div class="col-sm-12">
+              <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small
+                  style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
+                  data['lang']) }}</small></h4>
+              <hr>
+              <div class="row">
+
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="port3">{{ translate('serverWizard', 'serverPort', data['lang']) }}
+                      <small></small></label>
+                    <input type="number" class="form-control" id="port3" name="port" value="19132" step="1" min="1"
+                      required>
+                  </div>
+                </div>
+
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <div id="accordion-3">
+                      <div class="card">
+                        <div class="card-header p-2" id="Role-3">
+                          <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                            aria-controls="collapseRole-3">
+                            <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang'])
+                            }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                              data['lang']) }}</small>
+                          </p>
                         </div>
-                      </div>
-                      <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
-                        <div class="modal-dialog" role="document">
-                          <div class="modal-content">
-                            <div class="modal-header">
-                              <h5 class="modal-title" id="exampleModalLongTitle">{{ translate('serverWizard', 'selectZipDir', data['lang']) }}</h5>
-                              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                                <span aria-hidden="true">&times;</span>
-                              </button>
-                            </div>
-                            <div class="modal-body">
-                              <div class="tree-ctx-item" id="main-tree-div" data-path="" style="overflow: scroll; max-height:75%;">
-                                <input type="radio" id="main-tree-input" name="root_path" value="" checked>
-                                  <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
-                                    <i class="far fa-folder"></i>
-                                    <i class="far fa-folder-open"></i>
-                                    {{ translate('serverFiles', 'files', data['lang']) }}
-                                    </span>
-                                </input>
-                              </div>
-                            </div>
-                            <div class="modal-footer">
-                              <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ translate('serverWizard', 'close', data['lang']) }}</button>
-                              <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary">{{ translate('serverWizard', 'save', data['lang']) }}</button>
+                        <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                          <div class="card-body scroll">
+                            <div class="form-group">
+                              {% for r in data['roles'] %}
+                              <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}"
+                                    type="checkbox">&nbsp;
+                                  {{ r['role_name'].capitalize() }}</label></span>
+                              {% end %}
                             </div>
                           </div>
                         </div>
                       </div>
                     </div>
-                    <button id="zip_submit" type="submit" title="You must select server root dir first" disabled class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang']) }}</button>
-                    <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang']) }}</button>
                   </div>
                 </div>
-              </form>
-            </p>
-          </div>
+                <div class="col-sm-12" style="visibility: hidden;">
+                  <div class="form-group">
+                    <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
+                  </div>
+                </div>
+                <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
+                  aria-hidden="true">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <h5 class="modal-title" id="exampleModalLongTitle">{{ translate('serverWizard',
+                          'selectZipDir', data['lang']) }}</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                      </div>
+                      <div class="modal-body">
+                        <div class="tree-ctx-item" id="main-tree-div" data-path=""
+                          style="overflow: scroll; max-height:75%;">
+                          <input type="radio" id="main-tree-input" name="root_path" value="" checked>
+                          <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
+                            <i class="far fa-folder"></i>
+                            <i class="far fa-folder-open"></i>
+                            {{ translate('serverFiles', 'files', data['lang']) }}
+                          </span>
+                          </input>
+                        </div>
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">{{
+                          translate('serverWizard', 'close', data['lang']) }}</button>
+                        <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary">{{
+                          translate('serverWizard', 'save', data['lang']) }}</button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <button id="zip_submit" type="submit" title="You must select server root dir first" disabled
+                class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
+                }}</button>
+              <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
+                }}</button>
+            </div>
         </div>
+        </form>
+        </p>
       </div>
+    </div>
+  </div>
 </div>
 <style>
-.scroll {
+  .scroll {
     max-height: 12em;
     overflow-y: auto;
-}
-.menu-btn {
+  }
+
+  .menu-btn {
     font-size: 0.9em;
     padding: 2px 10px;
-}
-.menu {
+  }
+
+  .menu {
     padding-top: 10px;
     z-index: 200;
     margin-top: 4px;
     position: absolute;
     background-color: #2a2c44;
-}
-.menu-option {
+  }
+
+  .menu-option {
     padding: 6px 20px 6px;
     color: white;
-}
-#overlay {
+  }
+
+  #overlay {
     position: absolute;
     top: 0px;
     left: 0px;
     width: 100%;
     height: 100%;
     z-index: 100;
-}
+  }
 </style>
 <style>
   /* Remove default bullets */
- .tree-view,
- .tree-nested {
-   list-style-type: none;
-   margin: 0;
-   padding: 0;
-   margin-left: 10px;
- }
+  .tree-view,
+  .tree-nested {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    margin-left: 10px;
+  }
 
- /* Style the items */
- .tree-item,
- .files-tree-title {
-   cursor: pointer;
-   user-select: none; /* Prevent text selection */
- }
+  /* Style the items */
+  .tree-item,
+  .files-tree-title {
+    cursor: pointer;
+    user-select: none;
+    /* Prevent text selection */
+  }
 
- /* Create the caret/arrow with a unicode, and style it */
- .tree-caret .fa-folder {
-   display: inline-block;
- }
- .tree-caret .fa-folder-open {
-   display: none;
- }
+  /* Create the caret/arrow with a unicode, and style it */
+  .tree-caret .fa-folder {
+    display: inline-block;
+  }
 
- /* Rotate the caret/arrow icon when clicked on (using JavaScript) */
- .tree-caret-down .fa-folder {
-   display: none;
- }
- .tree-caret-down .fa-folder-open {
-   display: inline-block;
- }
+  .tree-caret .fa-folder-open {
+    display: none;
+  }
 
- /* Hide the nested list */
- .tree-nested {
-   display: none;
- }
+  /* Rotate the caret/arrow icon when clicked on (using JavaScript) */
+  .tree-caret-down .fa-folder {
+    display: none;
+  }
+
+  .tree-caret-down .fa-folder-open {
+    display: inline-block;
+  }
+
+  /* Hide the nested list */
+  .tree-nested {
+    display: none;
+  }
 </style>
 
 {% end %}
 
 {% block js%}
 <script>
-  document.getElementById("root_files_button").addEventListener("click", function(){
-    if(document.forms["zip"]["server_path"].value != ""){
-      if(document.getElementById('root_files_button').classList.contains('clicked')){
+  function eula_confirm() {
+    bootbox.confirm({
+      title: "{% raw translate('error', 'eulaTitle', data['lang']) %}",
+      message: "{% raw translate('error', 'eulaMsg', data['lang']) %} <br><br><a href='https://www.minecraft.net/en-us/eula' target='_blank'>EULA</a><br><br>{% raw translate('error', 'eulaAgree', data['lang']) %}",
+      buttons: {
+        confirm: {
+          label: 'Yes',
+          className: 'btn-info'
+        },
+        cancel: {
+          label: 'No',
+          className: 'btn-secondary'
+        }
+      },
+      callback: function (result) {
+        if (result == true) {
+          document.create_server.submit();
+        }
+        else {
+          return;
+        }
+      }
+    })
+  }
+</script>
+<script>
+  document.getElementById("root_files_button").addEventListener("click", function () {
+    if (document.forms["zip"]["server_path"].value != "") {
+      if (document.getElementById('root_files_button').classList.contains('clicked')) {
         document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate('serverFiles', 'files', data['lang']) }}</span></input>'
-      }else{
+      } else {
         document.getElementById('root_files_button').classList.add('clicked')
       }
-    path = document.forms["zip"]["server_path"].value;
-    console.log(document.forms["zip"]["server_path"].value)
-    var token = getCookie("_xsrf");
-    var dialog = bootbox.dialog({
-      message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
-      closeButton: false
-  });
-    $.ajax({
-      type: "POST",
-      headers: {'X-XSRFToken': token},
-      url: '/ajax/unzip_server?id=-1&path='+path,
-    });
-  }else{
-    bootbox.alert("You must input a path before selecting this button");
-  }
+      path = document.forms["zip"]["server_path"].value;
+      console.log(document.forms["zip"]["server_path"].value)
+      var token = getCookie("_xsrf");
+      var dialog = bootbox.dialog({
+        message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
+        closeButton: false
+      });
+      $.ajax({
+        type: "POST",
+        headers: { 'X-XSRFToken': token },
+        url: '/ajax/unzip_server?id=-1&path=' + path,
+      });
+    } else {
+      bootbox.alert("You must input a path before selecting this button");
+    }
   });
 </script>
 
 <script>
-function dropDown(event) {
+  function dropDown(event) {
     event.target.parentElement.children[1].classList.remove("d-none");
     document.getElementById("overlay").classList.remove("d-none");
-}
-function hide(event) {
+  }
+  function hide(event) {
     var items = document.getElementsByClassName('menu');
     for (let i = 0; i < items.length; i++) {
-        items[i].classList.add("d-none");
+      items[i].classList.add("d-none");
     }
     document.getElementById("overlay").classList.add("d-none");
-}
-
-  function wait_msg(importing){
-    bootbox.alert({
-        title: importing ? '{% raw translate("serverWizard", "importing", data['lang']) %}' : '{% raw translate("serverWizard", "downloading", data['lang']) %}',
-        message: '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data['lang']) %}',
-      });
   }
 
-  function show_file_tree(){
+  function wait_msg(importing) {
+    bootbox.alert({
+      title: importing ? '{% raw translate("serverWizard", "importing", data['lang']) %}': '{% raw translate("serverWizard", "downloading", data['lang']) %}',
+      message: '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data['lang']) %}',
+    });
+  }
+
+  function show_file_tree() {
     $("#dir_select").modal();
   }
 
-    function getTreeView(path) {
-      document.getElementById('zip_submit').disabled = false;
-      path = path
+  function getTreeView(path) {
+    document.getElementById('zip_submit').disabled = false;
+    path = path
 
-      $.ajax({
-        type: "GET",
-        url: '/ajax/get_zip_tree?id=-1&path='+path,
-        dataType: 'text',
-        success: function(data){
-          console.log("got response:");
-          console.log(data);
+    $.ajax({
+      type: "GET",
+      url: '/ajax/get_zip_tree?id=-1&path=' + path,
+      dataType: 'text',
+      success: function (data) {
+        console.log("got response:");
+        console.log(data);
 
-          dataArr = data.split('\n');
-          serverDir = dataArr.shift(); // Remove & return first element (server directory)
-          text = dataArr.join('\n');
+        dataArr = data.split('\n');
+        serverDir = dataArr.shift(); // Remove & return first element (server directory)
+        text = dataArr.join('\n');
 
-          try{
-            document.getElementById('main-tree-div').innerHTML += text;
-            document.getElementById('main-tree').parentElement.classList.add("clicked");
-          }catch{
-            document.getElementById('files-tree').innerHTML = text;
-          }
-
-
-          document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
-          document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
-
-        },
-      });
-    }
-
-    function getToggleMain(event) {
-      path = event.target.parentElement.getAttribute('data-path');
-          document.getElementById("files-tree").classList.toggle("d-block");
-          document.getElementById(path+"span").classList.toggle("tree-caret-down");
-          document.getElementById(path+"span").classList.toggle("tree-caret");
-      }
-
-
-    function getDirView(event) {
-        path = event.target.parentElement.getAttribute('data-path');
-
-        if (document.getElementById(path).classList.contains('clicked')){
-
-        var toggler = document.getElementById(path+"span");
-
-        if (toggler.classList.contains('files-tree-title')){
-            document.getElementById(path+"ul").classList.toggle("d-block");
-            document.getElementById(path+"span").classList.toggle("tree-caret-down");
+        try {
+          document.getElementById('main-tree-div').innerHTML += text;
+          document.getElementById('main-tree').parentElement.classList.add("clicked");
+        } catch {
+          document.getElementById('files-tree').innerHTML = text;
         }
-        return;
-      }else{
+
+
+        document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
+        document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
+
+      },
+    });
+  }
+
+  function getToggleMain(event) {
+    path = event.target.parentElement.getAttribute('data-path');
+    document.getElementById("files-tree").classList.toggle("d-block");
+    document.getElementById(path + "span").classList.toggle("tree-caret-down");
+    document.getElementById(path + "span").classList.toggle("tree-caret");
+  }
+
+
+  function getDirView(event) {
+    path = event.target.parentElement.getAttribute('data-path');
+
+    if (document.getElementById(path).classList.contains('clicked')) {
+
+      var toggler = document.getElementById(path + "span");
+
+      if (toggler.classList.contains('files-tree-title')) {
+        document.getElementById(path + "ul").classList.toggle("d-block");
+        document.getElementById(path + "span").classList.toggle("tree-caret-down");
+      }
+      return;
+    } else {
       $.ajax({
         type: "GET",
-        url: '/ajax/get_zip_dir?id=-1&path='+path,
+        url: '/ajax/get_zip_dir?id=-1&path=' + path,
         dataType: 'text',
-        success: function(data){
+        success: function (data) {
           console.log("got response:");
 
           dataArr = data.split('\n');
           serverDir = dataArr.shift(); // Remove & return first element (server directory)
           text = dataArr.join('\n');
 
-          try{
-            document.getElementById(path+"span").classList.add('tree-caret-down');
+          try {
+            document.getElementById(path + "span").classList.add('tree-caret-down');
             document.getElementById(path).innerHTML += text;
             document.getElementById(path).classList.add("clicked");
-          }catch{
+          } catch {
             console.log("Bad")
           }
 
           var toggler = document.getElementById(path);
 
-            if (toggler.classList.contains('files-tree-title')){
-            document.getElementById(path+"span").addEventListener("click", function caretListener() {
-              document.getElementById(path+"ul").classList.toggle("d-block");
-              document.getElementById(path+"span").classList.toggle("tree-caret-down");
+          if (toggler.classList.contains('files-tree-title')) {
+            document.getElementById(path + "span").addEventListener("click", function caretListener() {
+              document.getElementById(path + "ul").classList.toggle("d-block");
+              document.getElementById(path + "span").classList.toggle("tree-caret-down");
             });
           }
         },
       });
     }
-    }
-    if (webSocket) {
-      webSocket.on('send_temp_path', function (data) {
-        setTimeout(function(){
-          var x = document.querySelector('.bootbox');
-          if (x) {
-            x.remove()
-          }
-          var x = document.querySelector('.modal-backdrop');
-          if (x) {
-            x.remove()
-          }
-          document.getElementById('main-tree-input').setAttribute('value', data.path)
-          getTreeView(data.path);
-          show_file_tree();
+  }
+  if (webSocket) {
+    webSocket.on('send_temp_path', function (data) {
+      setTimeout(function () {
+        var x = document.querySelector('.bootbox');
+        if (x) {
+          x.remove()
+        }
+        var x = document.querySelector('.modal-backdrop');
+        if (x) {
+          x.remove()
+        }
+        document.getElementById('main-tree-input').setAttribute('value', data.path)
+        getTreeView(data.path);
+        show_file_tree();
 
       }, 5000);
-      });
-    }
+    });
+  }
 
 </script>
-{% end %}
+{% end %}
\ No newline at end of file
diff --git a/app/translations/de_DE.json b/app/translations/de_DE.json
index 2becaa47..fb5a5d32 100644
--- a/app/translations/de_DE.json
+++ b/app/translations/de_DE.json
@@ -168,7 +168,7 @@
         "embarassing": "Oh je, das ist peinlich.",
         "error": "Fehler!",
         "eulaAgree": "Stimmen Sie zu?",
-        "eulaMsg": "Sie müssen der EULA zustimmen. Eine Kopie der Mojang EULA ist unter dieser Nachricht verlinkt.",
+        "eulaMsg": "Sie müssen der EULA zustimmen. Eine Kopie der Minecraft EULA ist unter dieser Nachricht verlinkt.",
         "eulaTitle": "Der EULA zustimmen",
         "hereIsTheError": "Das ist der Fehler",
         "internet": "Wir haben festgestellt, dass der Rechner, auf dem Crafty läuft, keine Verbindung zum Internet hat. Client-Verbindungen zum Server können dadurch eingeschränkt sein.",
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json
index 0f510b90..9724aa54 100644
--- a/app/translations/en_EN.json
+++ b/app/translations/en_EN.json
@@ -168,7 +168,7 @@
         "embarassing": "Oh my, well, this is embarrassing.",
         "error": "Error!",
         "eulaAgree": "Do you agree?",
-        "eulaMsg": "You must agree to the EULA. A copy of the Mojang EULA is linked under this message.",
+        "eulaMsg": "You must agree to the EULA. A copy of the Minecraft EULA is linked under this message.",
         "eulaTitle": "Agree To EULA",
         "fileTooLarge": "Upload failed. File upload too large. Contact system administrator for assistance.",
         "hereIsTheError": "Here is the error",
diff --git a/app/translations/es_ES.json b/app/translations/es_ES.json
index 28f8d6e1..980eca0a 100644
--- a/app/translations/es_ES.json
+++ b/app/translations/es_ES.json
@@ -169,7 +169,7 @@
         "embarassing": "Oh por, bueno, esto es vergonzoso.",
         "error": "Error!",
         "eulaAgree": "Estás de acuerdo?",
-        "eulaMsg": "Debes aceptar el EULA. Una copia del EULA de Mojang esta vinculada debajo de este mensaje.",
+        "eulaMsg": "Debes aceptar el EULA. Una copia del EULA de Minecraft esta vinculada debajo de este mensaje.",
         "eulaTitle": "Aceptar EULA",
         "fileTooLarge": "Subida fallida. Carga de archivo demasiado grande. Póngase en contacto con el administrador del sistema para obtener ayuda.",
         "hereIsTheError": "Aquí está el error.",
@@ -537,4 +537,4 @@
         "userSettings": "Configuracion de Usuario.",
         "uses": "Número de usos habilitados. (-1 == sin límite)."
     }
-}
+}
\ No newline at end of file
diff --git a/app/translations/fi_FI.json b/app/translations/fi_FI.json
index c51dfbd0..2292da65 100644
--- a/app/translations/fi_FI.json
+++ b/app/translations/fi_FI.json
@@ -192,7 +192,7 @@
         "embarassing": "No, tämähän on noloa.",
         "error": "Virhe!",
         "eulaAgree": "Oletko samaa mieltä?",
-        "eulaMsg": "Sinun on hyväksyttävä EULA. Kopio Mojang EULA:sta on linkitetty tämän viestin alla.",
+        "eulaMsg": "Sinun on hyväksyttävä EULA. Kopio Minecraft EULA:sta on linkitetty tämän viestin alla.",
         "eulaTitle": "Hyväksy EULA",
         "fileTooLarge": "Lataus epäonnistui. Tiedosto on liian suuri. Ota yhteyttä järjestelmänvalvojaan saadaksesi apua.",
         "hereIsTheError": "Tässä on virhe",
@@ -560,4 +560,4 @@
         "userSettings": "Käyttäjäasetukset",
         "uses": "Sallittujen käyttäkertojen määtä (-1 == Ei rajaa)"
     }
-}
+}
\ No newline at end of file
diff --git a/app/translations/fr_FR.json b/app/translations/fr_FR.json
index 44d150f3..b1706e87 100644
--- a/app/translations/fr_FR.json
+++ b/app/translations/fr_FR.json
@@ -168,7 +168,7 @@
         "embarassing": "Oulà, c'est embarrassant.",
         "error": "Erreur !",
         "eulaAgree": "Êtes-vous d'accord?",
-        "eulaMsg": "Vous devez accepter le EULA. Une copie du CLUF de Mojang est liée sous ce message.",
+        "eulaMsg": "Vous devez accepter le EULA. Une copie du CLUF de Minecraft est liée sous ce message.",
         "eulaTitle": "Accepter le EULA",
         "fileTooLarge": "Echec du chargement. Le fichier est trop gros. Demande de l'aide à l'administrateur système.",
         "hereIsTheError": "Il y a une erreur",
@@ -536,4 +536,4 @@
         "userSettings": "Paramètres Utilisateur",
         "uses": "Nombre d'utilisation Authorisé (-1 == Illimité)"
     }
-}
+}
\ No newline at end of file
diff --git a/app/translations/fy_NL.json b/app/translations/fy_NL.json
index 2c4c0fd4..9342204f 100644
--- a/app/translations/fy_NL.json
+++ b/app/translations/fy_NL.json
@@ -167,7 +167,7 @@
         "embarassing": "Och, dit is beskamsum.",
         "error": "Error!",
         "eulaAgree": "Binne jo akkoard?",
-        "eulaMsg": "Jo moatte ynstimme mei de EULA. In kopy fan 'e Mojang EULA is keppele ûnder dit berjocht.",
+        "eulaMsg": "Jo moatte ynstimme mei de EULA. In kopy fan 'e Minecraft EULA is keppele ûnder dit berjocht.",
         "eulaTitle": "Akseptearje mei EULA",
         "hereIsTheError": "Hjir is de error",
         "internet": "Wy hawwe ûntdutsen dat de masine dy't Crafty draait gjin ferbining hat mei it ynternet. Clientferbiningen mei de server kinne beheind wêze.",
@@ -529,4 +529,4 @@
         "userSettings": "Brûkersynstellingen",
         "uses": "Oantal gebrûk tastien (-1==Gjin limyt)"
     }
-}
+}
\ No newline at end of file
diff --git a/app/translations/hr_HR.json b/app/translations/hr_HR.json
index 26b5ae2c..8d0658ee 100644
--- a/app/translations/hr_HR.json
+++ b/app/translations/hr_HR.json
@@ -167,7 +167,7 @@
         "embarassing": "Uhh, ovo je sramotno.",
         "error": "Greška!",
         "eulaAgree": "Slažete li se?",
-        "eulaMsg": "Morate prihvatiti EULA-u. Poveznica Mojangove EULA-e se nalazi ispod ove poruke.",
+        "eulaMsg": "Morate prihvatiti EULA-u. Poveznica Minecraft EULA-e se nalazi ispod ove poruke.",
         "eulaTitle": "Prihvatite EULA-u",
         "hereIsTheError": "Ovdje je pogreška",
         "internet": "Otkrili smo da uređaj koji pokreće Crafty nije povezan s internetom. Povezivanje klijenta s poslužiteljem može biti ograničeno.",
@@ -529,4 +529,4 @@
         "userSettings": "Korisničke postavke",
         "uses": "Broj dopuštenih upotreba (-1==Bez ograničenja)"
     }
-}
+}
\ No newline at end of file
diff --git a/app/translations/id_ID.json b/app/translations/id_ID.json
index 539aaa0b..10c22374 100644
--- a/app/translations/id_ID.json
+++ b/app/translations/id_ID.json
@@ -168,7 +168,7 @@
         "embarassing": "Oh tidak, ini adalah hal yang memalukan",
         "error": "Error!",
         "eulaAgree": "Apakah anda setuju?",
-        "eulaMsg": "Anda harus menyetujui EULA. Salinan Mojang EULA ditautkan di bawah pesan ini.",
+        "eulaMsg": "Anda harus menyetujui EULA. Salinan Minecraft EULA ditautkan di bawah pesan ini.",
         "eulaTitle": "Setuju Ke EULA",
         "fileTooLarge": "Gagal menggungah. File yang ingin di unggah terlalu besar. Kontak administrator system untuk pengawasan",
         "hereIsTheError": "Disini Error nya",
@@ -536,4 +536,4 @@
         "userSettings": "Pengaturan Pengguna",
         "uses": "Jumlah penggunaan yang diizinkan (-1==No Limit)"
     }
-}
+}
\ No newline at end of file
diff --git a/app/translations/it_IT.json b/app/translations/it_IT.json
index 28754bc9..eefb8594 100644
--- a/app/translations/it_IT.json
+++ b/app/translations/it_IT.json
@@ -167,7 +167,7 @@
         "embarassing": "Oh my, well, this is embarrassing.",
         "error": "Error!",
         "eulaAgree": "Do you agree?",
-        "eulaMsg": "You must agree to the EULA. A copy of the Mojang EULA is linked under this message.",
+        "eulaMsg": "You must agree to the EULA. A copy of the Minecraft EULA is linked under this message.",
         "eulaTitle": "Agree To EULA",
         "hereIsTheError": "Here is the error",
         "internet": "We have detected the machine running Crafty has no connection to the internet. Client connections to the server may be limited.",
@@ -529,4 +529,4 @@
         "userSettings": "Impostazioni Utente",
         "uses": "Numero di usi permessi (-1==Nessun limite)"
     }
-}
+}
\ No newline at end of file
diff --git a/app/translations/lv_LV.json b/app/translations/lv_LV.json
index 9ce3d82e..eb852755 100644
--- a/app/translations/lv_LV.json
+++ b/app/translations/lv_LV.json
@@ -168,7 +168,7 @@
         "embarassing": "Ak nu, tas ir apkaunojoši.",
         "error": "Kļūda!",
         "eulaAgree": "Vai jūs piekrītat?",
-        "eulaMsg": "Jums ir jāpiekrīt EULA. Kopija no Mojang EULA ir saitēta zem šī ziņojuma.",
+        "eulaMsg": "Jums ir jāpiekrīt EULA. Kopija no Minecraft EULA ir saitēta zem šī ziņojuma.",
         "eulaTitle": "Piekrist EULA",
         "fileTooLarge": "Augšupielāde neizdevās. Faila augšupielāde ir pārāk liela. Sazinies ar sistēmas administratoru priekš palīdzības.",
         "hereIsTheError": "Rekur ir kļūda",
@@ -536,4 +536,4 @@
         "userSettings": "Lietotāju Iestatījumi",
         "uses": "Dauzums, cik reizes lietot (-1==Bez Limita)"
     }
-}
+}
\ No newline at end of file
diff --git a/app/translations/nl_BE.json b/app/translations/nl_BE.json
index b715cdae..2ad43441 100644
--- a/app/translations/nl_BE.json
+++ b/app/translations/nl_BE.json
@@ -168,7 +168,7 @@
         "embarassing": "Oh, nou, dit is gênant.",
         "error": "Fout!",
         "eulaAgree": "Bent u het eens?",
-        "eulaMsg": "U moet akkoord gaan met de EULA. Een kopie van de Mojang EULA is gelinkt onder dit bericht.",
+        "eulaMsg": "U moet akkoord gaan met de EULA. Een kopie van de Minecraft EULA is gelinkt onder dit bericht.",
         "eulaTitle": "Akkoord gaan met EULA",
         "fileTooLarge": "Uploaden mislukt. Bestand uploaden te groot. Neem contact op met de systeembeheerder voor assistentie",
         "hereIsTheError": "Hier is de fout",
@@ -536,4 +536,4 @@
         "userSettings": "Gebruikersinstellingen",
         "uses": "Aantal toegestane gebruiken (-1==Geen Limiet)"
     }
-}
+}
\ No newline at end of file
diff --git a/app/translations/nl_NL.json b/app/translations/nl_NL.json
index 82f2f204..0b48898f 100644
--- a/app/translations/nl_NL.json
+++ b/app/translations/nl_NL.json
@@ -167,7 +167,7 @@
         "embarassing": "Oh, oeps, dit is gênant.",
         "error": "Error!",
         "eulaAgree": "Stem je in met de EULA?",
-        "eulaMsg": "Je moet instemmen met de EULA. Een kopie van de Mojang EULA is onder dit bericht gelinkt.",
+        "eulaMsg": "Je moet instemmen met de EULA. Een kopie van de Minecraft EULA is onder dit bericht gelinkt.",
         "eulaTitle": "Instemmen met de EULA",
         "hereIsTheError": "Hier is de error",
         "internet": "We hebben gedetecteerd dat de serverhost geen internetverbinding heeft. Client connecties zijn mogelijk gelimiteerd.",
@@ -529,4 +529,4 @@
         "userSettings": "Gebruikersinstellingen",
         "uses": "Aantal keer toegestaan (-1==Geen limiet)"
     }
-}
+}
\ No newline at end of file
diff --git a/app/translations/pl_PL.json b/app/translations/pl_PL.json
index 90d42e7a..8fb9739c 100644
--- a/app/translations/pl_PL.json
+++ b/app/translations/pl_PL.json
@@ -168,7 +168,7 @@
         "embarassing": "Oh, więc, to jest żenujące.",
         "error": "Błąd!",
         "eulaAgree": "Czy się zgadzasz?",
-        "eulaMsg": "Musisz się zgodzić na EULA. Kopia EULA Mojangu jest zalinkowana pod tą wiadomością.",
+        "eulaMsg": "Musisz się zgodzić na EULA. Kopia EULA Minecraft jest zalinkowana pod tą wiadomością.",
         "eulaTitle": "Zgódź się na EULA",
         "fileTooLarge": "Upload nie udany. Plik jest za duży. Skontaktuj się z administratorem dla pomocy.",
         "hereIsTheError": "Tu jest problem",
@@ -537,4 +537,4 @@
         "userSettings": "Ustawienia użytkownika",
         "uses": "Ilość użyć (-1==Bez limitu)"
     }
-}
+}
\ No newline at end of file
diff --git a/app/translations/pt_BR.json b/app/translations/pt_BR.json
index 2b61b75d..af23d2c9 100644
--- a/app/translations/pt_BR.json
+++ b/app/translations/pt_BR.json
@@ -168,7 +168,7 @@
         "embarassing": "Oh. Bem, isso é constrangedor",
         "error": "Erro!",
         "eulaAgree": "Você concorda?",
-        "eulaMsg": "Você deve concordar com os Termos de Licença. Uma cópia dos Termos de Licença da Mojang está linkado abaixo desta mensagem.",
+        "eulaMsg": "Você deve concordar com os Termos de Licença. Uma cópia dos Termos de Licença da Minecraft está linkado abaixo desta mensagem.",
         "eulaTitle": "Concordar com os Termos de Licença",
         "fileTooLarge": "Upload falhou. Arquivo muito grande. Contato o administrador do sistema para assistência.",
         "hereIsTheError": "Aqui está o erro",
@@ -537,4 +537,4 @@
         "userSettings": "Configurações do Usuário",
         "uses": "Número de Usos Permitidos (-1==Sem Limite)"
     }
-}
+}
\ No newline at end of file
diff --git a/app/translations/zh_CN.json b/app/translations/zh_CN.json
index 46234138..9b4be554 100644
--- a/app/translations/zh_CN.json
+++ b/app/translations/zh_CN.json
@@ -168,7 +168,7 @@
         "embarassing": "哦，天哪，这太尴尬了。",
         "error": "错误！",
         "eulaAgree": "你同意吗？",
-        "eulaMsg": "你必须同意最终用户许可协议（EULA）。一份 Mojang EULA 副本的链接在此消息下方。",
+        "eulaMsg": "你必须同意最终用户许可协议（EULA）。一份 Minecraft EULA 副本的链接在此消息下方。",
         "eulaTitle": "同意最终用户许可协议（EULA）",
         "fileTooLarge": "上传失败。上传的文件过大。联系系统管理员以获取协助。",
         "hereIsTheError": "错误如下",
@@ -536,4 +536,4 @@
         "userSettings": "用户设置",
         "uses": "使用次数限制（-1==无限制）"
     }
-}
+}
\ No newline at end of file

From bd38fcd6e40c7a29c5bc5ae51ffb612432d063d5 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 31 Aug 2022 19:59:46 -0400
Subject: [PATCH 10/24] Add try/except around download

---
 app/classes/shared/server.py | 43 ++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index bd8d29f6..072045d9 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1115,24 +1115,33 @@ class ServerInstance:
             )
         else:
             # downloads zip from remote url
-            bedrock_url = Helpers.get_latest_bedrock_url()
-            if bedrock_url.lower().startswith("https"):
-                urllib.request.urlretrieve(
-                    bedrock_url,
-                    os.path.join(self.settings["path"], "bedrock_server.zip"),
+            try:
+                bedrock_url = Helpers.get_latest_bedrock_url()
+                if bedrock_url.lower().startswith("https"):
+                    urllib.request.urlretrieve(
+                        bedrock_url,
+                        os.path.join(self.settings["path"], "bedrock_server.zip"),
+                    )
+
+                unzip_path = os.path.join(self.settings["path"], "bedrock_server.zip")
+                unzip_path = self.helper.wtol_path(unzip_path)
+                # unzips archive that was downloaded.
+                FileHelpers.unzip_file(unzip_path)
+                # adjusts permissions for execution if os is not windows
+                if not self.helper.is_os_windows():
+                    os.chmod(
+                        os.path.join(self.settings["path"], "bedrock_server"), 0o0744
+                    )
+
+                # we'll delete the zip we downloaded now
+                os.remove(os.path.join(self.settings["path"], "bedrock_server.zip"))
+                downloaded = True
+            except Exception as e:
+                logger.critical(
+                    f"Failed to download bedrock executable for update \n{e}"
                 )
-
-            unzip_path = os.path.join(self.settings["path"], "bedrock_server.zip")
-            unzip_path = self.helper.wtol_path(unzip_path)
-            # unzips archive that was downloaded.
-            FileHelpers.unzip_file(unzip_path)
-            # adjusts permissions for execution if os is not windows
-            if not self.helper.is_os_windows():
-                os.chmod(os.path.join(self.settings["path"], "bedrock_server"), 0o0744)
-
-            # we'll delete the zip we downloaded now
-            os.remove(os.path.join(self.settings["path"], "bedrock_server.zip"))
-            downloaded = True
+                downloaded = True
+                return
 
         while self.stats_helper.get_server_stats()["updating"]:
             if downloaded and not self.is_backingup:

From 2becb657ca37d408da6740bfa854ca0b842b7638 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 31 Aug 2022 20:01:38 -0400
Subject: [PATCH 11/24] Put try/except around creation

---
 app/classes/shared/import_helper.py | 35 ++++++++++++++++-------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/classes/shared/import_helper.py b/app/classes/shared/import_helper.py
index b5f8d193..c216a041 100644
--- a/app/classes/shared/import_helper.py
+++ b/app/classes/shared/import_helper.py
@@ -226,24 +226,29 @@ class ImportHelpers:
         download_thread.start()
 
     def download_threaded_bedrock_server(self, path, new_id):
+
         # downloads zip from remote url
-        bedrock_url = Helpers.get_latest_bedrock_url()
-        if bedrock_url.lower().startswith("https"):
-            urllib.request.urlretrieve(
-                bedrock_url,
-                os.path.join(path, "bedrock_server.zip"),
-            )
+        try:
+            bedrock_url = Helpers.get_latest_bedrock_url()
+            if bedrock_url.lower().startswith("https"):
+                urllib.request.urlretrieve(
+                    bedrock_url,
+                    os.path.join(path, "bedrock_server.zip"),
+                )
 
-        unzip_path = os.path.join(path, "bedrock_server.zip")
-        unzip_path = self.helper.wtol_path(unzip_path)
-        # unzips archive that was downloaded.
-        FileHelpers.unzip_file(unzip_path)
-        # adjusts permissions for execution if os is not windows
-        if not self.helper.is_os_windows():
-            os.chmod(os.path.join(path, "bedrock_server"), 0o0744)
+            unzip_path = os.path.join(path, "bedrock_server.zip")
+            unzip_path = self.helper.wtol_path(unzip_path)
+            # unzips archive that was downloaded.
+            FileHelpers.unzip_file(unzip_path)
+            # adjusts permissions for execution if os is not windows
+            if not self.helper.is_os_windows():
+                os.chmod(os.path.join(path, "bedrock_server"), 0o0744)
+
+            # we'll delete the zip we downloaded now
+            os.remove(os.path.join(path, "bedrock_server.zip"))
+        except Exception as e:
+            logger.critical(f"Failed to download bedrock executable for update \n{e}")
 
-        # we'll delete the zip we downloaded now
-        os.remove(os.path.join(path, "bedrock_server.zip"))
         ServersController.finish_import(new_id)
         server_users = PermissionsServers.get_server_user_list(new_id)
         for user in server_users:

From 3e370c0ae4c486a0c45a97855076c29ff8f41247 Mon Sep 17 00:00:00 2001
From: Iain Powrie <zedifus@zediverse.gg>
Date: Thu, 1 Sep 2022 14:41:42 +0000
Subject: [PATCH 12/24] Apply 1 suggestion(s) to 1 file(s)

---
 app/classes/shared/import_helper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/shared/import_helper.py b/app/classes/shared/import_helper.py
index c216a041..6a55e876 100644
--- a/app/classes/shared/import_helper.py
+++ b/app/classes/shared/import_helper.py
@@ -247,7 +247,7 @@ class ImportHelpers:
             # we'll delete the zip we downloaded now
             os.remove(os.path.join(path, "bedrock_server.zip"))
         except Exception as e:
-            logger.critical(f"Failed to download bedrock executable for update \n{e}")
+            logger.critical(f"Failed to download bedrock executable during server creation! \n{e}")
 
         ServersController.finish_import(new_id)
         server_users = PermissionsServers.get_server_user_list(new_id)

From d5ecfe91286d3a5f0dd4f069c4d93e0e79d2ea9f Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Thu, 1 Sep 2022 12:46:37 -0400
Subject: [PATCH 13/24] Add spinner to update button

---
 app/classes/shared/server.py                  |  3 ++
 app/frontend/templates/panel/dashboard.html   |  3 +-
 .../templates/panel/server_config.html        | 28 ++++++++++++++++++-
 app/frontend/templates/panel/server_term.html |  3 +-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 072045d9..d3e443f9 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1173,6 +1173,9 @@ class ServerInstance:
                     self.helper.websocket_helper.broadcast_page(
                         "/panel/dashboard", "send_start_reload", {}
                     )
+                    self.helper.websocket_helper.broadcast_page(
+                        "/panel/server_detail", "remove_spinner", {}
+                    )
                 server_users = PermissionsServers.get_server_user_list(self.server_id)
                 for user in server_users:
                     self.helper.websocket_helper.broadcast_user(
diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html
index 23ebf2c7..c89d00b2 100644
--- a/app/frontend/templates/panel/dashboard.html
+++ b/app/frontend/templates/panel/dashboard.html
@@ -186,7 +186,8 @@
 
                     {% elif server['stats']['updating']%}
                     <!-- WHAT HAPPENED HERE -->
-                    <a data-id="{{server['server_data']['server_id']}}" class="">{{ translate('serverTerm', 'updating',
+                    <a data-id="{{server['server_data']['server_id']}}" class=""><i
+                        class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'updating',
                       data['lang']) }}</i></a>
                     {% elif server['stats']['waiting_start']%}
                     <!-- WHAT HAPPENED HERE -->
diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html
index b065ef6f..d6117683 100644
--- a/app/frontend/templates/panel/server_config.html
+++ b/app/frontend/templates/panel/server_config.html
@@ -253,14 +253,31 @@
                 <button onclick="send_command(serverId, 'update_executable');" id="update_executable"
                   style="max-width: 7rem;" class="btn btn-warning m-1 flex-grow-1 disabled">{{ translate('serverConfig',
                   'update', data['lang']) }}</button>
+                {% if data['server_stats']['updating'] %}
+                <button onclick="send_command(serverId, 'update_executable');" id="update_executable"
+                  style="max-width: 7rem;" class="btn btn-warning m-1 flex-grow-1 disabled">{{ translate('serverConfig',
+                  'update', data['lang']) }}&nbsp;<i id="update-spinner" class="fa fa-spinner fa-spin"></i></button>
+                {% else %}
+                <button onclick="send_command(serverId, 'update_executable');" id="update_executable"
+                  style="max-width: 7rem;" class="btn btn-warning m-1 flex-grow-1 disabled">{{ translate('serverConfig',
+                  'update', data['lang']) }}&nbsp;<i style="visibility: hidden;" id="update-spinner"
+                    class="fa fa-spinner fa-spin"></i></button>
+                {% end %}
                 <a class="btn btn-sm btn-danger disabled">{{ translate('serverConfig', 'deleteServer', data['lang'])
                   }}</a><br />
                 <small>{{ translate('serverConfig', 'stopBeforeDeleting', data['lang']) }}</small>
                 {% else %}
                 {% if not data['failed'] %}
+                {% if data['server_stats']['updating'] %}
                 <button onclick="send_command(serverId, 'update_executable');" id="update_executable"
                   style="max-width: 7rem;" class="btn btn-warning m-1 flex-grow-1">{{ translate('serverConfig',
-                  'update', data['lang']) }}</button>
+                  'update', data['lang']) }}&nbsp;<i id="update-spinner" class="fa fa-spinner fa-spin"></i></button>
+                {% else %}
+                <button onclick="send_command(serverId, 'update_executable');" id="update_executable"
+                  style="max-width: 7rem;" class="btn btn-warning m-1 flex-grow-1">{{ translate('serverConfig',
+                  'update', data['lang']) }}&nbsp;<i style="visibility: hidden;" id="update-spinner"
+                    class="fa fa-spinner fa-spin"></i></button>
+                {% end %}
                 {% end %}
                 {% if not data['failed'] %}
                 <button onclick="deleteConfirm()" class="btn btn-sm btn-danger">{{ translate('serverConfig',
@@ -356,6 +373,9 @@
   function send_command(serverId, command) {
     //<!--  this getCookie function is in base.html-->
     var token = getCookie("_xsrf");
+    if (command == "update_executable") {
+      document.getElementById("update-spinner").style.visibility = "visible";
+    }
 
     $.ajax({
       type: "POST",
@@ -508,6 +528,12 @@
     });
   }
 
+  $(document).ready(function () {
+    webSocket.on('remove_spinner', function () {
+      document.getElementById("update-spinner").style.visibility = "hidden";
+    });
+
+  });
 </script>
 
 {% end %}
\ No newline at end of file
diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html
index 83f31519..5c460568 100644
--- a/app/frontend/templates/panel/server_term.html
+++ b/app/frontend/templates/panel/server_term.html
@@ -55,7 +55,8 @@
             {% if data['permissions']['Commands'] in data['user_permissions'] %}
             {% if data['server_stats']['updating']%}
             <div id="update_control_buttons" class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0" style="visibility: visible">
-              <button onclick="" id="start-btn" style="max-width: 7rem;" class="btn btn-warning m-1 flex-grow-1 disabled">{{ translate('serverTerm', 'updating', data['lang']) }}</button>
+              <button onclick="" id="start-btn" style="max-width: 7rem;" class="btn btn-warning m-1 flex-grow-1 disabled"><i
+                class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'updating', data['lang']) }}</button>
               <button onclick="" id="restart-btn" style="max-width: 7rem;" class="btn btn-outline-primary m-1 flex-grow-1 disabled">{% raw translate('serverTerm', 'restart', data['lang']) %}</button>
               <button onclick="" id="stop-btn" style="max-width: 7rem;" class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate('serverTerm', 'stop', data['lang']) }}</button>
             </div>

From 99979f668b5bc3744e7c7b68c07468824ca0d197 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Thu, 1 Sep 2022 12:51:54 -0400
Subject: [PATCH 14/24] Fix black formatting

---
 app/classes/shared/import_helper.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/classes/shared/import_helper.py b/app/classes/shared/import_helper.py
index 6a55e876..88ee91fc 100644
--- a/app/classes/shared/import_helper.py
+++ b/app/classes/shared/import_helper.py
@@ -247,7 +247,9 @@ class ImportHelpers:
             # we'll delete the zip we downloaded now
             os.remove(os.path.join(path, "bedrock_server.zip"))
         except Exception as e:
-            logger.critical(f"Failed to download bedrock executable during server creation! \n{e}")
+            logger.critical(
+                f"Failed to download bedrock executable during server creation! \n{e}"
+            )
 
         ServersController.finish_import(new_id)
         server_users = PermissionsServers.get_server_user_list(new_id)

From d568b7c66479499d35c7b4cf840950cc2166a4d9 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Thu, 1 Sep 2022 14:18:04 -0400
Subject: [PATCH 15/24] Fix EULA message for legal reasons

Make EULA message look prettier
---
 app/frontend/templates/base.html                  | 2 +-
 app/frontend/templates/server/bedrock_wizard.html | 6 +++---
 app/translations/en_EN.json                       | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html
index bfe530b9..100ab16c 100755
--- a/app/frontend/templates/base.html
+++ b/app/frontend/templates/base.html
@@ -378,7 +378,7 @@
         }
         bootbox.confirm({
           title: "{% raw translate('error', 'eulaTitle', data['lang']) %}",
-          message: "{% raw translate('error', 'eulaMsg', data['lang']) %} <br><br><a href='https://www.minecraft.net/en-us/eula' target='_blank'>EULA</a><br><br>{% raw translate('error', 'eulaAgree', data['lang']) %}",
+          message: "{% raw translate('error', 'eulaMsg', data['lang']) %}<a href='https://www.minecraft.net/en-us/eula' target='_blank'>Minecraft EULA</a>",
           buttons: {
             confirm: {
               label: 'Yes',
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index 465a9e10..572da170 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -403,14 +403,14 @@
   function eula_confirm() {
     bootbox.confirm({
       title: "{% raw translate('error', 'eulaTitle', data['lang']) %}",
-      message: "{% raw translate('error', 'eulaMsg', data['lang']) %} <br><br><a href='https://www.minecraft.net/en-us/eula' target='_blank'>EULA</a><br><br>{% raw translate('error', 'eulaAgree', data['lang']) %}",
+      message: "{% raw translate('error', 'eulaMsg', data['lang']) %}<a href='https://www.minecraft.net/en-us/eula' target='_blank'>Minecraft EULA</a>&nbsp; {% raw translate('error', 'privMsg', data['lang']) %}<a target='_blank' href='https://privacy.microsoft.com/en-us/privacystatement'>Microsoft Privacy Policy</a>",
       buttons: {
         confirm: {
-          label: 'Yes',
+          label: "{% raw translate('error', 'agree', data['lang']) %}",
           className: 'btn-info'
         },
         cancel: {
-          label: 'No',
+          label: "{% raw translate('error', 'cancel', data['lang']) %}",
           className: 'btn-secondary'
         }
       },
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json
index 9724aa54..176cf2b8 100644
--- a/app/translations/en_EN.json
+++ b/app/translations/en_EN.json
@@ -168,8 +168,11 @@
         "embarassing": "Oh my, well, this is embarrassing.",
         "error": "Error!",
         "eulaAgree": "Do you agree?",
-        "eulaMsg": "You must agree to the EULA. A copy of the Minecraft EULA is linked under this message.",
+        "eulaMsg": "You must agree to the ",
+        "privMsg": "and the ",
         "eulaTitle": "Agree To EULA",
+        "agree": "Agree",
+        "cancel": "Cancel",
         "fileTooLarge": "Upload failed. File upload too large. Contact system administrator for assistance.",
         "hereIsTheError": "Here is the error",
         "internet": "We have detected the machine running Crafty has no connection to the internet. Client connections to the server may be limited.",

From 9a7a1cc5d8d89928080b4407b0edebe76d02acc5 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 3 Sep 2022 12:46:35 -0400
Subject: [PATCH 16/24] Change elif to else

---
 app/classes/shared/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index d3e443f9..285759b8 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1193,7 +1193,7 @@ class ServerInstance:
                 )
                 if was_started:
                     self.start_server()
-            elif not downloaded and not self.is_backingup:
+            else:
                 time.sleep(5)
                 server_users = PermissionsServers.get_server_user_list(self.server_id)
                 for user in server_users:

From 6559112e1ba4144c621aa48b9a6bd9a3b581e5f1 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 3 Sep 2022 13:16:03 -0400
Subject: [PATCH 17/24] Fix update logic

---
 app/classes/shared/server.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 285759b8..3fcc2b47 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1140,8 +1140,6 @@ class ServerInstance:
                 logger.critical(
                     f"Failed to download bedrock executable for update \n{e}"
                 )
-                downloaded = True
-                return
 
         while self.stats_helper.get_server_stats()["updating"]:
             if downloaded and not self.is_backingup:
@@ -1193,7 +1191,7 @@ class ServerInstance:
                 )
                 if was_started:
                     self.start_server()
-            else:
+            elif not downloaded and not self.is_backingup:
                 time.sleep(5)
                 server_users = PermissionsServers.get_server_user_list(self.server_id)
                 for user in server_users:

From 5d688522bd2561014087889849760888bfcdf888 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 3 Sep 2022 13:23:30 -0400
Subject: [PATCH 18/24] Fix backup logic

---
 app/classes/shared/server.py | 120 +++++++++++++++++++----------------
 1 file changed, 66 insertions(+), 54 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 3fcc2b47..8d37e26c 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1108,6 +1108,21 @@ class ServerInstance:
         except FileNotFoundError:
             logger.error("Could not create backup of jarfile. File not found.")
 
+        # wait for backup
+        while self.is_backingup:
+            time.sleep(10)
+
+        # check if backup was successful
+        if self.last_backup_failed:
+            server_users = PermissionsServers.get_server_user_list(self.server_id)
+            for user in server_users:
+                self.helper.websocket_helper.broadcast_user(
+                    user,
+                    "notification",
+                    "Backup failed for " + self.name + ". canceling update.",
+                )
+
+        # lets download the files
         if HelperServers.get_server_type_by_id(self.server_id) != "minecraft-bedrock":
             # boolean returns true for false for success
             downloaded = Helpers.download_file(
@@ -1141,39 +1156,13 @@ class ServerInstance:
                     f"Failed to download bedrock executable for update \n{e}"
                 )
 
-        while self.stats_helper.get_server_stats()["updating"]:
-            if downloaded and not self.is_backingup:
-                logger.info("Executable updated successfully. Starting Server")
+        if downloaded:
+            logger.info("Executable updated successfully. Starting Server")
 
-                self.stats_helper.set_update(False)
-                if len(self.helper.websocket_helper.clients) > 0:
-                    # There are clients
-                    self.check_update()
-                    server_users = PermissionsServers.get_server_user_list(
-                        self.server_id
-                    )
-                    for user in server_users:
-                        self.helper.websocket_helper.broadcast_user(
-                            user,
-                            "notification",
-                            "Executable update finished for " + self.name,
-                        )
-                    time.sleep(3)
-                    self.helper.websocket_helper.broadcast_page(
-                        "/panel/server_detail",
-                        "update_button_status",
-                        {
-                            "isUpdating": self.check_update(),
-                            "server_id": self.server_id,
-                            "wasRunning": was_started,
-                        },
-                    )
-                    self.helper.websocket_helper.broadcast_page(
-                        "/panel/dashboard", "send_start_reload", {}
-                    )
-                    self.helper.websocket_helper.broadcast_page(
-                        "/panel/server_detail", "remove_spinner", {}
-                    )
+            self.stats_helper.set_update(False)
+            if len(self.helper.websocket_helper.clients) > 0:
+                # There are clients
+                self.check_update()
                 server_users = PermissionsServers.get_server_user_list(self.server_id)
                 for user in server_users:
                     self.helper.websocket_helper.broadcast_user(
@@ -1181,29 +1170,52 @@ class ServerInstance:
                         "notification",
                         "Executable update finished for " + self.name,
                     )
-
-                self.management_helper.add_to_audit_log_raw(
-                    "Alert",
-                    "-1",
-                    self.server_id,
-                    "Executable update finished for " + self.name,
-                    self.settings["server_ip"],
+                time.sleep(3)
+                self.helper.websocket_helper.broadcast_page(
+                    "/panel/server_detail",
+                    "update_button_status",
+                    {
+                        "isUpdating": self.check_update(),
+                        "server_id": self.server_id,
+                        "wasRunning": was_started,
+                    },
                 )
-                if was_started:
-                    self.start_server()
-            elif not downloaded and not self.is_backingup:
-                time.sleep(5)
-                server_users = PermissionsServers.get_server_user_list(self.server_id)
-                for user in server_users:
-                    self.helper.websocket_helper.broadcast_user(
-                        user,
-                        "notification",
-                        "Executable update failed for "
-                        + self.name
-                        + ". Check log file for details.",
-                    )
-                logger.error("Executable download failed.")
-                self.stats_helper.set_update(False)
+                self.helper.websocket_helper.broadcast_page(
+                    "/panel/dashboard", "send_start_reload", {}
+                )
+                self.helper.websocket_helper.broadcast_page(
+                    "/panel/server_detail", "remove_spinner", {}
+                )
+            server_users = PermissionsServers.get_server_user_list(self.server_id)
+            for user in server_users:
+                self.helper.websocket_helper.broadcast_user(
+                    user,
+                    "notification",
+                    "Executable update finished for " + self.name,
+                )
+
+            self.management_helper.add_to_audit_log_raw(
+                "Alert",
+                "-1",
+                self.server_id,
+                "Executable update finished for " + self.name,
+                self.settings["server_ip"],
+            )
+            if was_started:
+                self.start_server()
+        else:
+            time.sleep(5)
+            server_users = PermissionsServers.get_server_user_list(self.server_id)
+            for user in server_users:
+                self.helper.websocket_helper.broadcast_user(
+                    user,
+                    "notification",
+                    "Executable update failed for "
+                    + self.name
+                    + ". Check log file for details.",
+                )
+            logger.error("Executable download failed.")
+            self.stats_helper.set_update(False)
 
     # **********************************************************************************
     #                               Minecraft Servers Statistics

From 1f95ad600c9f2c751d1b1b1fc7976f6e64206ba8 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 3 Sep 2022 13:26:51 -0400
Subject: [PATCH 19/24] Add return

---
 app/classes/shared/server.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 8d37e26c..5480f682 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1121,6 +1121,7 @@ class ServerInstance:
                     "notification",
                     "Backup failed for " + self.name + ". canceling update.",
                 )
+            return False
 
         # lets download the files
         if HelperServers.get_server_type_by_id(self.server_id) != "minecraft-bedrock":

From dd56b4be3755862406bb942101294e6b65ff0ef1 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 3 Sep 2022 13:42:30 -0400
Subject: [PATCH 20/24] update updates

---
 app/classes/shared/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 5480f682..a5c45b4f 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1171,6 +1171,7 @@ class ServerInstance:
                         "notification",
                         "Executable update finished for " + self.name,
                     )
+                # sleep so first notif can completely run
                 time.sleep(3)
                 self.helper.websocket_helper.broadcast_page(
                     "/panel/server_detail",
@@ -1205,7 +1206,6 @@ class ServerInstance:
             if was_started:
                 self.start_server()
         else:
-            time.sleep(5)
             server_users = PermissionsServers.get_server_user_list(self.server_id)
             for user in server_users:
                 self.helper.websocket_helper.broadcast_user(

From 9a118def24d3d9ad8299ebff661d7526b29fcfe3 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sun, 4 Sep 2022 21:05:02 +0100
Subject: [PATCH 21/24] Update changelog !441

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dc69fc9..0fcc9437 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Bug fixes
 - Fix performance issues on server metrics panels (Temporarily setting to 24hr query) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/440))
 - Fix no id on import3 servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/442))
+- Fix functionality of bedrock update ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/441))
 ### Tweaks
 TBD
 ### Lang

From 37bc41b207ec2cc7539a40d835b2946532bb99e2 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sun, 4 Sep 2022 21:14:05 +0100
Subject: [PATCH 22/24] Update changelog !443

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fcc9437..3ef75323 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 ## --- [4.0.12] - 2022/09/04
 ### New features
 - Win Portable Updater will now be included in Windows Package ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/446))
+- Bedrock Server Creator ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/443))
 ### Bug fixes
 - Fix performance issues on server metrics panels (Temporarily setting to 24hr query) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/440))
 - Fix no id on import3 servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/442))

From e9c74be057201f1b04180f758237c462602d8423 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 4 Sep 2022 16:21:33 -0400
Subject: [PATCH 23/24] Add ability to change metrics scale

---
 app/classes/controllers/servers_controller.py    |  5 ++---
 app/classes/models/server_stats.py               |  4 ++--
 app/classes/web/panel_handler.py                 | 15 ++++++++++++++-
 app/frontend/templates/panel/server_metrics.html | 15 +++++++++++++++
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/app/classes/controllers/servers_controller.py b/app/classes/controllers/servers_controller.py
index c9434b13..1bf81564 100644
--- a/app/classes/controllers/servers_controller.py
+++ b/app/classes/controllers/servers_controller.py
@@ -105,10 +105,9 @@ class ServersController(metaclass=Singleton):
         server_instance.update_server_instance()
         return ret
 
-    def get_history_stats(self, server_id):
-        now = datetime.datetime.now()
+    def get_history_stats(self, server_id, days):
         srv = ServersController().get_server_instance_by_id(server_id)
-        return srv.stats_helper.get_history_stats(server_id)
+        return srv.stats_helper.get_history_stats(server_id, days)
 
     @staticmethod
     def update_unloaded_server(server_obj):
diff --git a/app/classes/models/server_stats.py b/app/classes/models/server_stats.py
index d6c6efdc..29fdb856 100644
--- a/app/classes/models/server_stats.py
+++ b/app/classes/models/server_stats.py
@@ -138,8 +138,8 @@ class HelperServerStats:
             )
         return server_data
 
-    def get_history_stats(self, server_id):
-        max_age = datetime.datetime.now() - timedelta(days=1)
+    def get_history_stats(self, server_id, num_days):
+        max_age = datetime.datetime.now() - timedelta(days=num_days)
         return (
             ServerStats.select()
             .where(ServerStats.created > max_age)
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index a8bac6e2..a30f7d29 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -756,8 +756,21 @@ class PanelHandler(BaseHandler):
                 page_data["backup_path"] = Helpers.wtol_path(server_info["backup_path"])
 
             if subpage == "metrics":
+                try:
+                    days = int(self.get_argument("days", "1"))
+                except ValueError as e:
+                    self.redirect(
+                        f"/panel/error?error=Type error: Argument must be an int {e}"
+                    )
+                page_data["options"] = [1, 2, 3]
+                if not days in page_data["options"]:
+                    page_data["options"].insert(0, days)
+                else:
+                    page_data["options"].insert(
+                        0, page_data["options"].pop(page_data["options"].index(days))
+                    )
                 page_data["history_stats"] = self.controller.servers.get_history_stats(
-                    server_id
+                    server_id, days
                 )
 
             def get_banned_players_html():
diff --git a/app/frontend/templates/panel/server_metrics.html b/app/frontend/templates/panel/server_metrics.html
index 9bf46941..d10fec51 100644
--- a/app/frontend/templates/panel/server_metrics.html
+++ b/app/frontend/templates/panel/server_metrics.html
@@ -38,6 +38,16 @@
           <span class="d-block d-sm-none">
             {% include "parts/m_server_controls_list.html %}
           </span>
+          <div class="col-2">
+            <div class="form-group">
+              <label for="days">Metric Period</label>
+              <select required class="form-control form-control-lg select-css" id="days" name="days">
+                {% for value in data['options'] %}
+                <option value="{{value}}">{{value}} Day(s)</option>
+                {% end %}
+              </select>
+            </div>
+          </div>
           <button style="float: right; visibility: hidden;" class="btn btn-outline-success reset-button"
             id="reset-button"><i class="fas fa-undo"></i>&nbsp;{{ translate('serverMetrics', 'resetZoom', data['lang'])
             }}</button>
@@ -69,6 +79,7 @@
   }
 </style>
 <script type="text/javascript">
+  const serverId = new URLSearchParams(document.location.search).get('id')
   var zoomed = false;
   //line
   var ctxL = document.getElementById("lineChart").getContext('2d');
@@ -162,6 +173,10 @@
     }
   });
   $(window).ready(function () {
+    $('#days').on("change", function () {
+      let days = $('#days').find(":selected").val();
+      window.location.href = "/panel/server_detail?id=" + serverId + "&days=" + days + "&subpage=metrics"
+    });
     $('body').click(function () {
       $('.hints').popover("hide");
     });

From dd0f609d0ce14205027bed4c03f98ad8655d2680 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sun, 4 Sep 2022 21:31:10 +0100
Subject: [PATCH 24/24] Update changelog !448

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ef75323..f47beb06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 - Win Portable Updater will now be included in Windows Package ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/446))
 - Bedrock Server Creator ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/443))
 ### Bug fixes
-- Fix performance issues on server metrics panels (Temporarily setting to 24hr query) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/440))
+- Fix performance issues on server metrics panels 'with metrics range' ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/440)) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/448))
 - Fix no id on import3 servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/442))
 - Fix functionality of bedrock update ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/441))
 ### Tweaks