Commit Graph

4903 Commits

Author SHA1 Message Date
Lenny McLennington
6ff87f773b
fix: add missing placeholder text for account override
Also changes the "No accounts available" message to be placeholder text
instead of a combobox item, if the current Qt version supports it.

Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-11-17 03:21:39 +00:00
Lenny McLennington
462e0ef56d
fix: disable account override if no account selected
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-11-17 02:12:23 +00:00
Lenny McLennington
de1de47940
fix: use profile id for per-instance account override
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-11-17 02:08:19 +00:00
jdp_
22fb301d88 fix recursive crash on win64
one of the contributors to PolyMC that moved over to Prism (TheLastRar) ended up finding this.
I didn't understand what it was for until I fixed & ran a 64-bit Windows build myself, and got a 0xC00000FD (Stack overflow).
This is caused by the massive recursive load of ATLauncher packs.
This is a pretty jank fix as it is, and later should be re-engineered to not be recursive.

Signed-off-by: jdp_ <42700985+jdpatdiscord@users.noreply.github.com>
2022-11-16 12:08:10 -05:00
HeyaGlitz
ddbc80e1ef
Add Jinx
Signed-off-by: HeyaGlitz <heyaglitz0x99@proton.me>
2022-11-14 21:23:50 +01:00
Lenny McLennington
cfe8f6ce9b
Merge pull request #1501 from binex-dsk/patch-1
fix windows build
2022-11-14 04:08:10 +00:00
swirl
78ec58dbf1
fix windows build
Signed-off-by: swirl <swurl@swurl.xyz>
2022-11-13 22:15:49 -05:00
Lenny McLennington
64aa817c80
Merge pull request #1500 from unix-supremacist/bsdmemfix
fix *bsd support
2022-11-13 19:22:51 +00:00
Unix
75756a5b9e fix *bsd max memory
Signed-off-by: Unix <100294596+unix-supremacist@users.noreply.github.com>
2022-11-13 11:09:17 -06:00
Lenny McLennington
1b52829e6c
Merge pull request #1494 from jdpatdiscord/develop
Have API key validators tolerate whitespace
2022-11-09 14:53:10 +00:00
Lenny McLennington
b3fb52ce51
chore: add jdp_'s copyright header
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-11-08 22:09:30 +00:00
Lenny McLennington
6b8e6774a0
refactor: clean up PMCKeyValidator
Renamed PMCKeyValidator to TrimmedRegExpValidator
Removed redundant variable
Removed erroneous forward-declaration in Ui namespace definition
Fixed indentation for Ui namespace definition

Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-11-08 22:08:06 +00:00
jdp_
c2a703b3d6
have key validation tolerate whitespace (fixes #1168)
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-11-08 18:28:51 +00:00
urFate
5d9ff3767a Set tab index to 0 & fix english translation
Signed-off-by: urFate <georgiylakidon@gmail.com>
2022-11-07 19:09:30 +03:00
ed3cf5d9bf
fix windows build again
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-11-06 18:26:01 -05:00
d2d04030ae
Update build and install info.
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-11-06 16:50:08 -05:00
53ed0c3c97
Update README to reflect new packaging information.
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-11-06 16:41:42 -05:00
b4b97df694
Fix man page build.
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-11-06 16:00:15 -05:00
4dbd99dcd2
Fix windows build
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-11-05 22:14:49 -04:00
eb259c9a95
fix windows build
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-11-05 22:08:44 -04:00
8c68223b04
broken manifest
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-11-05 22:02:22 -04:00
6abac40184
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-11-05 21:51:43 -04:00
urFate
ce1a48be5d Use indexes instead of account name. Added "no accounts" indication. Added account type to combo box string.
Signed-off-by: urFate <georgiylakidon@gmail.com>
2022-11-02 12:18:14 +03:00
urFate
2a7c666932 Implement account per instance feature
Signed-off-by: urFate <georgiylakidon@gmail.com>
2022-11-01 19:10:34 +03:00
Lenny McLennington
21db985b54
Merge pull request #1490 from LennyMcLennington/update-readme
Remove closed matrix rooms from README
2022-10-28 06:02:11 +01:00
Lenny McLennington
15f9e102c6
docs: remove closed matrix rooms from README
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-10-28 06:01:26 +01:00
Lenny McLennington
e9f7280027
Merge pull request #1482 from LennyMcLennington/cf-workarounds-2
Minor changes to curseforge workarounds
2022-10-27 17:22:55 +01:00
Lenny McLennington
5229cb8c12
feat: add ability to disable cf api key fetching
by setting the cf api key api url to a blank string

Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-10-27 01:42:32 +01:00
Lenny McLennington
e7853533b4
chore: update cf api key api url
Sascha says the domain name we're using is not gonna be renewed, so I'm
switching it to a domain controlled by me instead so that this won't be
a problem in the future.

Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-10-26 23:01:09 +01:00
LennyMcLennington
46adfda5a6
Merge pull request #1477 from LennyMcLennington/cf-workarounds
Curseforge workarounds and fixes
2022-10-25 02:02:18 +01:00
Lenny McLennington
361ef5eb9b
fix: update capabilities when key changed
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-10-25 00:46:00 +01:00
LennyMcLennington
2bf9c0dcf4
Merge pull request #1480 from LennyMcLennington/oauth2-token-error-diagnostic
change: Added diagnostic logging for OAuth 2.0 token reply errors, an…
2022-10-24 23:14:52 +01:00
Lenny McLennington
b752875325
fix: make loadDialog close after failure in runModalTask
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-10-24 23:05:30 +01:00
Lenny McLennington
33634764e9
fix: handle json exception in FileResolvingTask
Also needed to add a call to loop.exit() in FlameInstanceCreationTask so
that it would handle the failure of FileResolvingTask properly

Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-10-24 23:05:29 +01:00
Lenny McLennington
edd650aacd
Curseforge workarounds
This should allow people to use Curseforge without having to manually
paste a working key into the settings or change the user agent.

Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-10-24 23:05:29 +01:00
e7581535cd
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-10-18 20:02:47 -04:00
Kemonomodoki
2f32fe6647 change: Added diagnostic logging for OAuth 2.0 token reply errors, and made it fail the activity.
Signed-off-by: Kemonomodoki <kemonomodoki@firemail.cc>
2022-10-18 11:15:39 -04:00
LennyMcLennington
ebbc1f67e0
Update MSA Client ID
Signed-off-by: LennyMcLennington <lenny@sneed.church>
2022-10-18 11:14:06 +01:00
LennyMcLennington
ccf282593d
reclaim polymc from the leftoids
Signed-off-by: LennyMcLennington <lenny@sneed.church>
2022-10-17 19:55:07 +01:00
flow
aecd158d3c
Merge pull request #1208 from DioEgizio/fix-unused-libs
Removes `classparser` and `xz-embedded`
2022-10-16 10:41:43 -03:00
DioEgizio
87d35f0d16 fix: remove some unused libs
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-15 20:16:15 +02:00
Sefa Eyeoglu
c089f9b59f
Merge pull request #1203 from DioEgizio/macos-legacy 2022-10-15 15:24:30 +02:00
Sefa Eyeoglu
924c1634d3
Merge pull request #1194 from flowln/fix_opted_out_on_any_filter 2022-10-15 13:18:35 +02:00
Sefa Eyeoglu
03d077e915
fix(nix): add ghc_filesystem dependency
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-15 13:13:56 +02:00
Sefa Eyeoglu
303628bb05
refactor: support system ghc-filesystem
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-15 13:13:38 +02:00
DioEgizio
89e45a61b3 fix: workaround ghc::filesystem bug
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-14 16:45:13 +02:00
DioEgizio
2aff7bac4a fix: disable updater on macOS-Legacy
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-14 15:58:16 +02:00
flow
124097d3a5 feat!: use ghc/filesystem in place of std's one if needed
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-14 14:08:48 +02:00
flow
c520faed6d feat: add gulrak/filesystem submodule
... for old macs that don't have std::filesystem in their stdlib.

Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-14 14:08:42 +02:00
DioEgizio
5bdb3703ed fix: stop forcing libc++ on macOS
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-14 14:08:05 +02:00