renovate[bot]
|
d9cd6f9c50
|
chore(deps): update hendrikmuhs/ccache-action action to v1.2.10
|
2023-08-08 18:20:26 +00:00 |
|
TheKodeToad
|
e079cbb055
|
Fix actions
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-07 13:51:26 +01:00 |
|
Sefa Eyeoglu
|
7004388105
|
Merge pull request #1227 from Ryex/packaging/appimage-updates
|
2023-08-07 13:18:06 +02:00 |
|
Tayou
|
9afa7cc91f
|
Merge branch 'develop' into icon-indexing
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
|
2023-08-07 10:32:38 +02:00 |
|
Rachel Powers
|
9a9a4fcfd4
|
Apply suggestions from code review
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-08-06 13:16:30 -07:00 |
|
Sefa Eyeoglu
|
74fe2fb2a6
|
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
|
2023-08-06 21:54:00 +02:00 |
|
seth
|
eeb5fdbc9f
|
feat(nix): add darwin support
Signed-off-by: seth <getchoo@tuta.io>
|
2023-08-06 15:52:32 -04:00 |
|
Sefa Eyeoglu
|
a83e5be8f2
|
fix: makeShared for QByteArray
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-06 21:51:03 +02:00 |
|
seth
|
75c7df46a7
|
Merge pull request #1493 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
|
2023-08-06 15:41:48 -04:00 |
|
seth
|
efaf4024ab
|
Merge pull request #1464 from Ryex/fix/windows-console-attach
[Windows] Fix attaching logs to console
|
2023-08-06 15:37:44 -04:00 |
|
Sefa Eyeoglu
|
99fd1e622c
|
chore: replace fabricmc icons with SVG
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-06 17:46:33 +02:00 |
|
github-actions[bot]
|
37e5f6af48
|
chore(nix): update lockfile
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/8e8d955c22df93dbe24f19ea04f47a74adbdc5ec' (2023-07-04)
→ 'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/4bc72cae107788bf3f24f30db2e2f685c9298dc9?dir=lib' (2023-06-29)
→ 'github:NixOS/nixpkgs/9e1960bc196baf6881340d53dccb203a951745a2?dir=lib' (2023-08-01)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/d2b52322f35597c62abf56de91b0236746b2a03d' (2023-07-29)
→ 'github:nixos/nixpkgs/0d2fb29f5071a12d7983319c2c2576be6a130582' (2023-08-05)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/1e2443dd3f669eb65433b2fc26a3065e05a7dc9c' (2023-07-29)
→ 'github:cachix/pre-commit-hooks.nix/3139c4d1f7732cab89f06492bdd4677b877e3785' (2023-08-05)
|
2023-08-06 00:17:51 +00:00 |
|
Sefa Eyeoglu
|
5b8c997180
|
Merge pull request #1456 from Trial97/icons
|
2023-08-05 22:50:52 +02:00 |
|
Sefa Eyeoglu
|
7c547f6452
|
Merge pull request #1370 from Trial97/pack_changelog
|
2023-08-05 22:50:38 +02:00 |
|
Trial97
|
f7e8ec1855
|
format files
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 21:17:38 +03:00 |
|
Trial97
|
72de2d5254
|
Added missing header
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 21:08:16 +03:00 |
|
TheKodeToad
|
f25d0a4e0e
|
Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-05 18:01:53 +01:00 |
|
Trial97
|
1d3f2674d1
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 19:21:37 +03:00 |
|
Trial97
|
f9ebcb5d2e
|
Merge branch 'refactor/net-split-headers-to-proxy-class' of https://github.com/Ryex/PrismLauncher into refactor/NetActions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 19:16:57 +03:00 |
|
Trial97
|
b2fdd83594
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 19:09:10 +03:00 |
|
Trial97
|
91eb30f037
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog
|
2023-08-05 19:04:53 +03:00 |
|
Trial97
|
d936b25868
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 19:04:15 +03:00 |
|
Trial97
|
e7c2274893
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file
|
2023-08-05 19:02:11 +03:00 |
|
Trial97
|
377fc0352a
|
Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons
|
2023-08-05 19:00:12 +03:00 |
|
Trial97
|
939a2d67ed
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 18:21:09 +03:00 |
|
Sefa Eyeoglu
|
304e294ea7
|
Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class
|
2023-08-04 20:31:43 +02:00 |
|
Sefa Eyeoglu
|
ae793f6cf1
|
Merge pull request #1459 from Scrumplex/format
|
2023-08-04 19:42:36 +02:00 |
|
Sefa Eyeoglu
|
1d638e018a
|
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-04 19:41:47 +02:00 |
|
seth
|
50c7d39e08
|
Merge pull request #1483 from DioEgizio/update-qt652
[macOS,Windows] Update to Qt 6.5.2
|
2023-08-04 12:05:45 -04:00 |
|
TheKodeToad
|
c5bffed21e
|
Merge branch 'PrismLauncher:develop' into skinfix
|
2023-08-04 16:29:30 +01:00 |
|
TheKodeToad
|
d48dd7eb6a
|
Use override-based setting for online fixes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-04 16:00:02 +01:00 |
|
DioEgizio
|
b013133cc1
|
chore: update to qt 6.5.2
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
|
2023-08-03 09:24:47 +02:00 |
|
TheKodeToad
|
1bafa36c17
|
icon -> iconName
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-02 20:33:01 +01:00 |
|
TheKodeToad
|
afaf6f894c
|
Merge branch 'PrismLauncher:develop' into better-component-installation
|
2023-08-02 20:27:37 +01:00 |
|
TheKodeToad
|
8b3c465a50
|
Use protected inheritance for BasePageProvider
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-02 20:24:15 +01:00 |
|
TheKodeToad
|
40c614b3a5
|
Pressed -> Clicked (doh)
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-02 20:23:30 +01:00 |
|
Sefa Eyeoglu
|
ac36a2289f
|
Merge pull request #1452 from getchoo/sparkle-disable
|
2023-08-02 19:28:01 +02:00 |
|
Sefa Eyeoglu
|
fa2b784f7e
|
Merge branch 'develop' into sparkle-disable
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 19:27:48 +02:00 |
|
Sefa Eyeoglu
|
01e17806f6
|
Merge pull request #1391 from Trial97/prism_export2
|
2023-08-02 19:27:14 +02:00 |
|
Sefa Eyeoglu
|
f561e7febf
|
Merge pull request #1476 from Scrumplex/fix-saving-metaurl
|
2023-08-02 19:24:24 +02:00 |
|
Sefa Eyeoglu
|
39d4f0df66
|
fix: don't reset meta url on launch
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:56:54 +02:00 |
|
Sefa Eyeoglu
|
1d468ac35a
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:35 +02:00 |
|
Sefa Eyeoglu
|
ce2ca13815
|
fix: add missing headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:08 +02:00 |
|
TheKodeToad
|
f256b836f4
|
Make more options generic
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-02 18:35:08 +02:00 |
|
TheKodeToad
|
71fb38c91f
|
Fix alignment properties
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-02 18:35:08 +02:00 |
|
Sefa Eyeoglu
|
076c189948
|
fix: format all languages using clang-format
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:08 +02:00 |
|
Sefa Eyeoglu
|
9f66f6495a
|
fix: fix undisciplined multiple inheritance
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:07 +02:00 |
|
Sefa Eyeoglu
|
c07a857359
|
fix: remove irregular enum initialization
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:07 +02:00 |
|
Sefa Eyeoglu
|
76df836378
|
fix: simplify switch statement
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:07 +02:00 |
|
Sefa Eyeoglu
|
a545f67a21
|
fix: take JavaCheckResult by const reference
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:07 +02:00 |
|