External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2026-01-02 05:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/MultiMC/MultiMC5 into develop

Browse Source
This commit is contained in:
Sebastian-byte
2021-01-29 19:34:45 -05:00
parent 5d43246a61 8eee4e3e6c
commit 70d987b3a5
24 changed files with 399 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp
View File

@@ -117,7 +117,7 @@ void PackInstallTask::install()
if(file.serverOnly) continue;
auto relpath = FS::PathCombine("minecraft", file.path, file.name);
auto path = FS::PathCombine(m_stagingPath , relpath);
auto path = FS::PathCombine(m_stagingPath, relpath);
qDebug() << "Will download" << file.url << "to" << path;
auto dl = Net::Download::makeFile(file.url, path);

11
api/logic/modplatform/technic/TechnicPackProcessor.cpp
View File

@@ -176,7 +176,16 @@ void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings, const
if (libraryName.startsWith("net.minecraftforge:forge:") && libraryName.contains('-'))
{
components->setComponentVersion("net.minecraftforge", libraryName.section('-', 1));
QString libraryVersion = libraryName.section(':', 2);
if (!libraryVersion.startsWith("1.7.10-"))
{
components->setComponentVersion("net.minecraftforge", libraryName.section('-', 1));
}
else
{
// 1.7.10 versions sometimes look like 1.7.10-10.13.4.1614-1.7.10, this filters out the 10.13.4.1614 part
components->setComponentVersion("net.minecraftforge", libraryName.section('-', 1, 1));
}
}
else if (libraryName.startsWith("net.minecraftforge:minecraftforge:"))
{