From f52635cab6435f800b40621b0d789ffc2f6d62fc Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Wed, 14 Jun 2023 19:19:10 -0400 Subject: [PATCH 1/2] Fix format on serverjars warning --- app/frontend/templates/server/wizard.html | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html index ec251739..69f9e5af 100644 --- a/app/frontend/templates/server/wizard.html +++ b/app/frontend/templates/server/wizard.html @@ -172,17 +172,7 @@ - {% if not data["server_api"] %} -
-

 {{ translate('error', 'serverJars1', data['lang']) }} {{ translate('error', 'craftyStatus', data['lang']) }} -  {{ translate('error', 'serverJars2', data['lang']) }}

-
- - - {% if not data["server_api"] and data["online"] %}
@@ -194,9 +184,7 @@

 {{ translate('error', 'noInternet', data['lang']) }}

{% end %} - {% end %}
- From fe03b3a9a831753251b50f74fdadbaac61b46ad6 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Tue, 18 Jul 2023 22:14:41 +0100 Subject: [PATCH 2/2] Update changelog !601 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1552e4a6..5359f6c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ TBD - Fix text/formatting issue on server config page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/602)) - Bump required version of PyYAML to 6.0.1 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/609)) - Fix enable/disable schedule toggles on schedule list ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/606)) +- Fix formatting on Creation page when server jars is unavailable ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/601)) ### Refactor - Replace "in_file" helper method ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/605)) ### Tweaks