mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2025-06-12 05:07:46 +02:00
chore: resolve conflicts and merge upstream
This commit is contained in:
@ -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();
|
||||
|
Reference in New Issue
Block a user