diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-08-19 00:38:40 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-08-19 00:38:40 +0300 |
| commit | ab6301d5a1a2a77d12d73f4ff7088551d6b8aa2e (patch) | |
| tree | ef416fc819e833a5319da76e9abf30110a0c932f /launcher/ui | |
| parent | c5bac475e86ec1c4e0053bd330eabedcbca124f6 (diff) | |
| parent | 3098aecf9760074a291bd8460ce749e556baad3a (diff) | |
| download | PrismLauncher-ab6301d5a1a2a77d12d73f4ff7088551d6b8aa2e.tar.gz PrismLauncher-ab6301d5a1a2a77d12d73f4ff7088551d6b8aa2e.tar.bz2 PrismLauncher-ab6301d5a1a2a77d12d73f4ff7088551d6b8aa2e.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Diffstat (limited to 'launcher/ui')
| -rw-r--r-- | launcher/ui/dialogs/InstallLoaderDialog.cpp | 4 | ||||
| -rw-r--r-- | launcher/ui/dialogs/SkinUploadDialog.ui | 6 | ||||
| -rw-r--r-- | launcher/ui/pages/modplatform/CustomPage.cpp | 3 | ||||
| -rw-r--r-- | launcher/ui/pages/modplatform/CustomPage.ui | 10 |
4 files changed, 16 insertions, 7 deletions
diff --git a/launcher/ui/dialogs/InstallLoaderDialog.cpp b/launcher/ui/dialogs/InstallLoaderDialog.cpp index 840a328f..541119d1 100644 --- a/launcher/ui/dialogs/InstallLoaderDialog.cpp +++ b/launcher/ui/dialogs/InstallLoaderDialog.cpp @@ -129,7 +129,9 @@ InstallLoaderDialog::InstallLoaderDialog(std::shared_ptr<PackProfile> profile, c QList<BasePage*> InstallLoaderDialog::getPages() { - return { // Forge + return { // NeoForge + new InstallLoaderPage("net.neoforged", "neoforged", tr("NeoForge"), {}, profile), + // Forge new InstallLoaderPage("net.minecraftforge", "forge", tr("Forge"), {}, profile), // Fabric new InstallLoaderPage("net.fabricmc.fabric-loader", "fabricmc", tr("Fabric"), Version("1.14"), profile), diff --git a/launcher/ui/dialogs/SkinUploadDialog.ui b/launcher/ui/dialogs/SkinUploadDialog.ui index 2c81a7fe..c6df92df 100644 --- a/launcher/ui/dialogs/SkinUploadDialog.ui +++ b/launcher/ui/dialogs/SkinUploadDialog.ui @@ -35,12 +35,6 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> - <size> - <width>28</width> - <height>16777215</height> - </size> - </property> <property name="text"> <string>Browse</string> </property> diff --git a/launcher/ui/pages/modplatform/CustomPage.cpp b/launcher/ui/pages/modplatform/CustomPage.cpp index 4ac21b01..068fb3a3 100644 --- a/launcher/ui/pages/modplatform/CustomPage.cpp +++ b/launcher/ui/pages/modplatform/CustomPage.cpp @@ -127,6 +127,9 @@ void CustomPage::loaderFilterChanged() ui->loaderVersionList->setEmptyString(tr("No mod loader is selected.")); ui->loaderVersionList->setEmptyMode(VersionListView::String); return; + } else if (ui->neoForgeFilter->isChecked()) { + ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, minecraftVersion); + m_selectedLoader = "net.neoforged"; } else if (ui->forgeFilter->isChecked()) { ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, minecraftVersion); m_selectedLoader = "net.minecraftforge"; diff --git a/launcher/ui/pages/modplatform/CustomPage.ui b/launcher/ui/pages/modplatform/CustomPage.ui index 0d89b595..23351ccd 100644 --- a/launcher/ui/pages/modplatform/CustomPage.ui +++ b/launcher/ui/pages/modplatform/CustomPage.ui @@ -195,6 +195,16 @@ </widget> </item> <item> + <widget class="QRadioButton" name="neoForgeFilter"> + <property name="text"> + <string>NeoForge</string> + </property> + <attribute name="buttonGroup"> + <string notr="true">loaderBtnGroup</string> + </attribute> + </widget> + </item> + <item> <widget class="QRadioButton" name="forgeFilter"> <property name="text"> <string>Forge</string> |