From 21ffc27920a15a92f2addc098d1fcdfc6197d87d Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sun, 19 Jan 2025 20:43:36 +0000 Subject: [PATCH 1/4] Prepare 4.4.6 release base --- CHANGELOG.md | 11 +++++++++++ README.md | 2 +- app/config/version.json | 2 +- sonar-project.properties | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af4945db..fb3b8689 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,15 @@ # Changelog +## --- [4.4.6] - 2024/TBD +### New features +TBD +### Bug fixes +TBD +### Tweaks +TBD +### Lang +TBD +

+ ## --- [4.4.5] - 2024/01/19 ### Refactor - Refactor and standardize all JSON validator errors returning human readable translations ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/786)) diff --git a/README.md b/README.md index 5345299b..b350cf78 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Crafty Logo](app/frontend/static/assets/images/logo_long.svg)](https://craftycontrol.com) -# Crafty Controller 4.4.5 +# Crafty Controller 4.4.6 > Python based Control Panel for your Minecraft Server ## What is Crafty Controller? diff --git a/app/config/version.json b/app/config/version.json index 8fcaeff4..96ab759d 100644 --- a/app/config/version.json +++ b/app/config/version.json @@ -1,5 +1,5 @@ { "major": 4, "minor": 4, - "sub": 5 + "sub": 6 } diff --git a/sonar-project.properties b/sonar-project.properties index 114926e2..ba9f049f 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,7 +3,7 @@ sonar.organization=crafty-controller # This is the name and version displayed in the SonarCloud UI. sonar.projectName=Crafty 4 -sonar.projectVersion=4.4.5 +sonar.projectVersion=4.4.6 sonar.python.version=3.9, 3.10, 3.11 sonar.exclusions=app/migrations/**, app/frontend/static/assets/vendors/** From 637b41ec6098a350f4d1b81b7d4d8a2437a48bd8 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 19 Jan 2025 19:51:25 -0500 Subject: [PATCH 2/4] Fix dictionary get --- app/classes/minecraft/mc_ping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/classes/minecraft/mc_ping.py b/app/classes/minecraft/mc_ping.py index df63ae01..a2c2ac67 100644 --- a/app/classes/minecraft/mc_ping.py +++ b/app/classes/minecraft/mc_ping.py @@ -94,7 +94,7 @@ class Players(list): class Player: def __init__(self, data): self.id = data.get("id", "") - self.name = data("name", "Anonymous") + self.name = data.get("name", "Anonymous") def __str__(self): return self.name From f44eddb1dae842b5366bfeebda05293a1afd4179 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Mon, 20 Jan 2025 01:39:11 +0000 Subject: [PATCH 3/4] Update changelog !824 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb3b8689..bcdec7c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ### New features TBD ### Bug fixes -TBD +- Fix traceback on stats page for data missing data.get ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/824)) ### Tweaks TBD ### Lang From 476637fa690243b81ed4ccd4aecdb7191d46ca3c Mon Sep 17 00:00:00 2001 From: Zedifus Date: Mon, 20 Jan 2025 01:44:42 +0000 Subject: [PATCH 4/4] Close changelog 4.4.6 --- CHANGELOG.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcdec7c6..c0bea69c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,7 @@ # Changelog -## --- [4.4.6] - 2024/TBD -### New features -TBD +## --- [4.4.6] - 2024/01/20 ### Bug fixes - Fix traceback on stats page for data missing data.get ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/824)) -### Tweaks -TBD -### Lang -TBD

## --- [4.4.5] - 2024/01/19