Commit Graph

316 Commits

Author SHA1 Message Date
Sefa Eyeoglu
3697d70b48
fix: reorganize icon themes
Rename MultiMC to Legacy
Simple (Colored) is now the first icon theme
Custom is now the last icon theme, which also fixes a loading issue when
Legacy was selected
Fix loading of Legacy theme
2022-03-05 20:29:54 +01:00
timoreo22
8bdd2befe9
Merge pull request #205 from timoreo22/fix-version-select
Fixed wrong version info
2022-03-01 16:56:10 +01:00
Ezekiel Smith
e1f28be151
Merge pull request #163 from txtsd/windows_data_dir
Replace build layouts with Launcher_PORTABLE cmake flag
2022-03-02 00:03:31 +11:00
flow
4e8f075ff3
fix: Do not loop when its not a fabric mod on Flame version validation
Since there's no validation for forge mods since the start, we were just
looping with no porpuse in this situation.
2022-02-27 22:02:43 -03:00
flow
075d900d45
fix: Always tell Flame API which modloader we are using
Fixes #206 partially. Although we don't list mods that have no
compatibility with the mod loader we are using, mods that have support
for both loaders still show up, and the versions for both the loaders
are still shown.

Also simplifies a little the logic in
FlameModIndex::loadIndexedPackVersions
2022-02-27 16:07:45 -03:00
txtsd
5d1ca33b84
Apply suggestions from code review
Co-authored-by: LennyMcLennington <lenny@sneed.church>
2022-02-27 08:35:47 -08:00
timoreo
ccc493cb2b
Cleanly free NetJob in flame modpack 2022-02-27 13:14:12 +01:00
timoreo
2745325ae0
Fixed wrong version info 2022-02-27 11:55:24 +01:00
Sefa Eyeoglu
88fc1e32ee
Merge pull request #201 from Scrumplex/fix-instancetype-reregistration 2022-02-26 14:37:27 +01:00
Sefa Eyeoglu
c9bf7f9896
fix: load instances no matter their instance type 2022-02-26 00:31:37 +01:00
flow
c4f4e9e620 merge upstream and resolve conflicts 2022-02-25 13:43:27 -03:00
Ezekiel Smith
f2b850ad20
Merge pull request #183 from timoreo22/fix-versions-segfault
Fixed segfault in mod download
2022-02-26 01:55:11 +11:00
Ezekiel Smith
ccc27d1b7c
Merge pull request #192 from Scrumplex/refactor-remove-legacy-instances
Drop legacy instances
2022-02-26 01:54:15 +11:00
flow
40a9828fba
fix: improve readability and set ok button as disabled by default 2022-02-23 19:17:33 -03:00
flow
04840d0638
fix(ui): add translation func to text in the confirm dialog 2022-02-23 14:44:55 -03:00
flow
38f12c50f7
Merge branch 'PolyMC:develop' into develop 2022-02-23 14:34:51 -03:00
Sefa Eyeoglu
ca8b62291f
fix: use legacy data path if it exists 2022-02-23 16:22:53 +05:30
txtsd
69d01204e0
Implement PR suggestions 2022-02-23 16:22:53 +05:30
txtsd
1e3b896fda
Replace layouts with LAUNCH_PORTABLE 2022-02-23 16:22:23 +05:30
Sefa Eyeoglu
e2c2a38005
Merge pull request #186 from theglitch76-forks/develop
Enable WSL support
2022-02-22 08:23:57 +01:00
flow
f8b0d6453a
fix: sort mod list in confirmation dialog 2022-02-21 23:25:33 -03:00
flow
0102e91940
feat: add confirm dialog for installing mods
When selecting multiple mods at once, it can become hard to keep track
of which ones you selected.

To address this, a dialog is now displayed
when you finish selecting the mods to download, showing you which ones
you selected and their filenames. From there, you can either accept it
and download the mods, or you can cancel it and go back to the mod
selection dialog.
2022-02-21 23:09:14 -03:00
flow
1004211a66
fix(ui): change text in selection button when there's no valid version 2022-02-21 22:52:50 -03:00
flow
f5cf4eb45f
feat(ui): allow downloading multiple mods from CurseForge at once 2022-02-21 21:53:21 -03:00
flow
512395e3f1
feat(ui): allow downloading multiple mods in Modrinth at once 2022-02-21 21:34:53 -03:00
flow
9c6727e27f
feat: change task container in ModDownloadDialog to a QHash
Previously, we used a unique_ptr to a ModDownloadTask to keep track of
the selected mod to download when we accepted the dialog.

In order to allow multiple mods to be selected at once for download,
this has been changed to a QHash where the key is the mods name (since
it doesn't seem right to allow for multiple versions of the same mod to
be downloaded at once), and the value is a pointer to the corresponding
ModDownloadTask.
2022-02-21 21:34:06 -03:00
Sefa Eyeoglu
624ab25cd4
refactor: set default InstanceType to OneSix 2022-02-21 22:59:07 +01:00
Sefa Eyeoglu
a70d1f1a91
refactor: drop LegacyInstance 2022-02-21 22:30:44 +01:00
Sefa Eyeoglu
3059f13011
refactor: drop migration for pre-component instances 2022-02-21 22:11:10 +01:00
Glitch
8556ff5eac Revert ba6a97557a
Let evil win.
2022-02-20 15:00:23 -06:00
timoreo
adacab3349
Fixed segfault when closing window while version info download is still going 2022-02-19 15:17:45 +01:00
Sefa Eyeoglu
80a29af497
fix: typo for account disabled error messages 2022-02-18 19:18:29 +01:00
Sefa Eyeoglu
c5d9944993
feat(accounts): interrupt MSAStep when client ID doesn't match 2022-02-18 12:32:24 +01:00
Sefa Eyeoglu
14717396eb
feat(accounts): save client id in MSAStep 2022-02-18 12:32:24 +01:00
Sefa Eyeoglu
9c71f364d2
feat(accounts): add disabled account state 2022-02-18 12:32:24 +01:00
Sefa Eyeoglu
be910374dc
feat(accounts): support msa-client-id value 2022-02-18 12:32:24 +01:00
LennyMcLennington
12c8a04458
Merge pull request #173 from Scrumplex/fix-application-cpp
fix: improve code readability in Application.cpp
2022-02-17 23:43:59 +00:00
swirl
7b4b997a34
Merge remote-tracking branch 'upstream/develop' into develop 2022-02-17 15:47:43 -05:00
Sefa Eyeoglu
6b4469c6cc
fix: combine errors if --launch is missing 2022-02-17 15:29:09 +01:00
Sefa Eyeoglu
037b0d7190
fix: improve code readability in Application.cpp 2022-02-16 17:33:28 +01:00
Lenny McLennington
929a035f96
Revert "make wsl work"
This reverts commit 5779f20fa1.
2022-02-13 18:47:54 +00:00
swirl
5779f20fa1
make wsl work 2022-02-13 13:35:15 -05:00
Sefa Eyeoglu
a309f4e721
fix: MSA = Microsoft Authentication 2022-02-12 21:27:35 +01:00
Sefa Eyeoglu
159d868b77
fix(ui): explain why 'Add Microsoft' might be disabled 2022-02-12 21:27:35 +01:00
Sefa Eyeoglu
0854e83ce4
feat: implement MSA client id override
Closes #11
2022-02-12 21:27:32 +01:00
Sefa Eyeoglu
bb02226870
feat(ui): add custom MSA client id setting 2022-02-12 21:05:42 +01:00
Sefa Eyeoglu
70a055bc27
Merge pull request #143 from Scrumplex/refactor-link-nbtpp-static 2022-02-12 17:47:38 +01:00
Sefa Eyeoglu
61db1c46be
fix: use our own prefix for rainbow lib 2022-02-12 17:02:54 +01:00
LennyMcLennington
7d912726d0
Merge pull request #134 from glowiak/patch-2
OpenBSD support and slackware build instructions
2022-02-12 03:30:24 +00:00
swirl
3cf81faabc
change "loader mods" to "mods"
Closes: #128
2022-02-11 22:09:47 -05:00