diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-04-03 22:17:06 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-04-03 22:17:06 +0200 |
| commit | b29ef49415a96d0f9e49cc97095742206a4cb5c6 (patch) | |
| tree | 90cb6dac6db300b85d5ec8565b884d959b61d023 /logic | |
| parent | f184eff71a5df81b2b4db1e9247d87373628f413 (diff) | |
| download | MultiMC-b29ef49415a96d0f9e49cc97095742206a4cb5c6.tar MultiMC-b29ef49415a96d0f9e49cc97095742206a4cb5c6.tar.gz MultiMC-b29ef49415a96d0f9e49cc97095742206a4cb5c6.tar.lz MultiMC-b29ef49415a96d0f9e49cc97095742206a4cb5c6.tar.xz MultiMC-b29ef49415a96d0f9e49cc97095742206a4cb5c6.zip | |
NOISSUE fix some forge version processing issues
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/minecraft/forge/ForgeInstaller.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/logic/minecraft/forge/ForgeInstaller.cpp b/logic/minecraft/forge/ForgeInstaller.cpp index 155a2cac..353328ab 100644 --- a/logic/minecraft/forge/ForgeInstaller.cpp +++ b/logic/minecraft/forge/ForgeInstaller.cpp @@ -99,7 +99,7 @@ void ForgeInstaller::prepare(const QString &filename, const QString &universalUr QJsonObject installObj = installVal.toObject(); QString libraryName = installObj.value("path").toString(); internalPath = installObj.value("filePath").toString(); - m_forgeVersionString = installObj.value("version").toString().remove("Forge").trimmed(); + m_forgeVersionString = installObj.value("version").toString().remove("Forge", Qt::CaseInsensitive).trimmed(); // where do we put the library? decode the mojang path GradleSpecifier lib(libraryName); @@ -265,9 +265,16 @@ bool ForgeInstaller::add(OneSixInstance *to) m_forge_json->fileId = id(); m_forge_json->version = m_forgeVersionString; m_forge_json->dependsOnMinecraftVersion = to->intendedVersionId(); - m_forge_json->minecraftVersion.clear(); m_forge_json->order = 5; + // reset some things we do not want to be passed along. + m_forge_json->m_releaseTime = QDateTime(); + m_forge_json->m_updateTime = QDateTime(); + m_forge_json->minimumLauncherVersion = -1; + m_forge_json->type.clear(); + m_forge_json->minecraftArguments.clear(); + m_forge_json->minecraftVersion.clear(); + QSaveFile file(filename(to->instanceRoot())); if (!file.open(QFile::WriteOnly)) { |