Merge pull request #815 from Scrumplex/fix-funny

Merge pull request #816 from Scrumplex/bump-6.3
chore: bump to 6.3
2023-02-03 18:44:33 +01:00 · 2023-02-03 18:44:13 +01:00 · 2023-02-03 18:40:10 +01:00
2 changed files with 2 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -139,7 +139,7 @@ set(Launcher_HELP_URL "https://prismlauncher.org/wiki/help-pages/%1" CACHE STRIN

 ######## Set version numbers ########
 set(Launcher_VERSION_MAJOR 6)
-set(Launcher_VERSION_MINOR 2)
+set(Launcher_VERSION_MINOR 3)

 set(Launcher_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}")
 set(Launcher_VERSION_NAME4 "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.0.0")
--- a/launcher/minecraft/OneSixVersionFormat.cpp
+++ b/launcher/minecraft/OneSixVersionFormat.cpp
@ -123,7 +123,7 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc
        out->uid = root.value("fileId").toString();
    }

-    const QRegularExpression valid_uid_regex{ QRegularExpression::anchoredPattern(QStringLiteral(R"(\w+(?:\.\w+)*)")) };
+    const QRegularExpression valid_uid_regex{ QRegularExpression::anchoredPattern(QStringLiteral(R"([a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]+)*)")) };
    if (!valid_uid_regex.match(out->uid).hasMatch()) {
        qCritical() << "The component's 'uid' contains illegal characters! UID:" << out->uid;
        out->addProblem(
Author	SHA1	Message	Date
Sefa Eyeoglu	39bba9cbfa	Merge pull request #815 from Scrumplex/fix-funny	2023-02-03 18:44:33 +01:00
Sefa Eyeoglu	104c231740	Merge pull request #816 from Scrumplex/bump-6.3	2023-02-03 18:44:13 +01:00
Sefa Eyeoglu	bc376b22c7	chore: bump to 6.3 Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-02-03 18:40:10 +01:00