diff options
| author | Petr Mrázek <peterix@gmail.com> | 2020-03-26 10:38:13 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2020-03-26 10:38:13 +0100 |
| commit | e6cc65cf69b3fb2c1fa08e6768669f826048af20 (patch) | |
| tree | 441c28d0b9769bd1b33312a437be991f584cb039 | |
| parent | ebb17cb5f8b4b7771c28bb0286846aa52d29d6a0 (diff) | |
| download | MultiMC-0.6.10.tar MultiMC-0.6.10.tar.gz MultiMC-0.6.10.tar.lz MultiMC-0.6.10.tar.xz MultiMC-0.6.10.zip | |
NOISSUE no means no, #20.6.10
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | api/logic/minecraft/MojangVersionFormat.cpp | 4 | ||||
| -rw-r--r-- | api/logic/minecraft/OneSixVersionFormat.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b3b451e1..ede71307 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ set(MultiMC_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fetc ######## Set version numbers ######## set(MultiMC_VERSION_MAJOR 0) set(MultiMC_VERSION_MINOR 6) -set(MultiMC_VERSION_HOTFIX 9) +set(MultiMC_VERSION_HOTFIX 10) # Build number set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.") diff --git a/api/logic/minecraft/MojangVersionFormat.cpp b/api/logic/minecraft/MojangVersionFormat.cpp index 0f6cf6a6..33d3c54c 100644 --- a/api/logic/minecraft/MojangVersionFormat.cpp +++ b/api/logic/minecraft/MojangVersionFormat.cpp @@ -130,10 +130,6 @@ void MojangVersionFormat::readVersionProperties(const QJsonObject &in, VersionFi { Bits::readString(in, "id", out->minecraftVersion); Bits::readString(in, "mainClass", out->mainClass); - if(out->mainClass.contains("forgewrapper") || out->mainClass.contains("zekerzhayard")) { - out->mainClass.clear(); - out->addProblem(ProblemSeverity::Error, QObject::tr("Forge workarounds have no place in MultiMC.")); - } Bits::readString(in, "minecraftArguments", out->minecraftArguments); if(out->minecraftArguments.isEmpty()) { diff --git a/api/logic/minecraft/OneSixVersionFormat.cpp b/api/logic/minecraft/OneSixVersionFormat.cpp index 6f3b926b..3d3cf916 100644 --- a/api/logic/minecraft/OneSixVersionFormat.cpp +++ b/api/logic/minecraft/OneSixVersionFormat.cpp @@ -151,6 +151,10 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc QJsonObject libObj = requireObject(libVal); // parse the library auto lib = libraryFromJson(libObj, filename); + if(lib->rawName().artifactId() == "ForgeWrapper") { + out->mainClass.clear(); + out->addProblem(ProblemSeverity::Error, QObject::tr("Forge workarounds have no place in MultiMC.")); + } out->libraries.append(lib); } }; |