External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-13 20:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't assume forge for FTB instances. Fix FTB related stuff.

Browse Source
This commit is contained in:
Jan Dalheimer
2014-02-21 18:01:06 +01:00
parent 43881b9cdb
commit f54705e1c5
11 changed files with 206 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
logic/OneSixVersion.cpp
View File

@@ -26,10 +26,10 @@ OneSixVersion::OneSixVersion(OneSixInstance *instance, QObject *parent)
clear();
}
bool OneSixVersion::reload(QWidget *widgetParent, const bool onlyVanilla)
bool OneSixVersion::reload(QWidget *widgetParent, const bool onlyVanilla, const QStringList &external)
{
beginResetModel();
bool ret = OneSixVersionBuilder::build(this, m_instance, widgetParent, onlyVanilla);
bool ret = OneSixVersionBuilder::build(this, m_instance, widgetParent, onlyVanilla, external);
endResetModel();
return ret;
}
@@ -104,6 +104,7 @@ QList<std::shared_ptr<OneSixLibrary> > OneSixVersion::getActiveNormalLibs()
QList<std::shared_ptr<OneSixLibrary> > output;
for (auto lib : libraries)
{
qDebug() << "Checking" << lib->rawName() << lib->isActive() << !lib->isNative();
if (lib->isActive() && !lib->isNative())
{
output.append(lib);