0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: resolve conflicts and merge upstream

Browse Source
This commit is contained in:
flow
2022-03-24 18:24:51 -03:00
parent da43ed8ce1 92f3154e8f
commit e13ca94061
121 changed files with 3182 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
launcher/ui/pages/modplatform/ModPage.cpp
View File

@@ -95,7 +95,7 @@ void ModPage::onSelectionChanged(QModelIndex first, QModelIndex second)
for (int i = 0; i < current.versions.size(); i++) {
ui->versionSelectionBox->addItem(current.versions[i].version, QVariant(i));
}
if (ui->versionSelectionBox->count() == 0) { ui->versionSelectionBox->addItem(tr("No Valid Version found !"), QVariant(-1)); }
if (ui->versionSelectionBox->count() == 0) { ui->versionSelectionBox->addItem(tr("No valid version found."), QVariant(-1)); }
updateSelectionButton();
}
@@ -126,6 +126,11 @@ void ModPage::onModSelected()
/******** Make changes to the UI ********/
void ModPage::retranslate()
{
ui->retranslateUi(this);
}
void ModPage::updateModVersions()
{
auto packProfile = (dynamic_cast<MinecraftInstance*>(m_instance))->getPackProfile();