Commit Graph

4780 Commits

Author SHA1 Message Date
6abac40184
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-11-05 21:51:43 -04: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
DioEgizio
2901039a48 feat(actions): macOS-Legacy package
still no updater part though

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-14 14:08:05 +02:00
flow
b2a5d8daf4
fix: don't include opted out versions with the 'Any' filter on the MD
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-12 10:26:14 -03:00
flow
19ee736e1d
Merge pull request #1190 from TayouVR/merged-launch-button1 2022-10-11 16:21:41 -03:00
Tayou
aaba99dc10
Update launcher/ui/MainWindow.cpp
make " Offline" string for profilers translatable

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
2022-10-11 14:58:34 +02:00
Tayou
93a2e0f777
Merge Launch Buttons
Signed-off-by: Tayou <tayou@gmx.net>
2022-10-10 23:23:06 +02:00
Sefa Eyeoglu
aabcca5059
Merge pull request #1175 from Ozynt/patch-1 2022-10-09 20:20:05 +02:00
Ozynt
7e67fd8c79
Update LaunchController.cpp
Signed-off-by: Ozynt <104643560+Ozynt@users.noreply.github.com>
2022-10-09 13:20:50 +02:00
Ozynt
fecf1ffcb9
Update LaunchController.cpp
Signed-off-by: Ozynt <104643560+Ozynt@users.noreply.github.com>
2022-10-09 13:19:38 +02:00
Sefa Eyeoglu
fafc9cf9ca
Merge pull request #1033 from Scrumplex/multi-arch-support 2022-10-08 20:12:40 +02:00
Sefa Eyeoglu
3111e6a721
chore: add missing license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-08 20:12:07 +02:00
flow
e436f471a0
Merge pull request #1177 from DioEgizio/codeql
bye LGTM 👋
2022-10-08 15:04:23 -03:00
flow
28f84902f6
Merge pull request #1185 from DioEgizio/fix-tooltip
Fix outdated 'Disable mod metadata' button's warning message.
2022-10-08 14:34:59 -03:00
Trisave
ebee50eedc
Improve default light and dark themes (#1174) 2022-10-08 14:33:24 -03:00
flow
e0ef09dfe1
Merge pull request #1183 from Scrumplex/fix-capabilities-first-run 2022-10-08 14:29:14 -03:00
DioEgizio
f26049009e fix: mod updating isn't upcoming anymore :p
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-08 16:20:46 +02:00
Sefa Eyeoglu
787234a53a
Merge pull request #1163 from flowln/fix_list_icons 2022-10-08 12:12:38 +02:00
Sefa Eyeoglu
fc3a64056c
Merge pull request #1154 from Scrumplex/epic-formatting-codes 2022-10-08 12:12:26 +02:00
Sefa Eyeoglu
6ebc9abb80
fix: update capabilities before first-run wizard
On first run, the condition for the wizard would return, before running
updateCapabilities(). This moves that call up, as its only dependency is
the settings system.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-06 14:46:13 +02:00
DioEgizio
80e9eed35a fix: remove old unused lgtm.yml, exclude cpp/fixme-comment
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-04 16:17:57 +02:00
DioEgizio
23b3990f99 feat(code scanning): enable security-and-quality query
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-04 16:17:57 +02:00
DioEgizio
41276403df feat(actions): add codeql code scanning
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-04 16:17:57 +02:00
Sefa Eyeoglu
e3e9e39498
Merge pull request #1171 from vedantmgoyal2009/patch-1 2022-10-02 15:08:59 +02:00
txtsd
f315025a8d
Merge pull request #1167 from Scrumplex/epic-commandline 2022-10-02 00:41:34 +05:30