Commit Graph

9532 Commits

Author SHA1 Message Date
seth 01721b593b fix(flatpak): run tests for launcher
Signed-off-by: seth <getchoo@tuta.io>
2024-10-19 12:40:15 -04:00
seth 0bae14999f chore(flatpak): don't bundle JREs
After https://github.com/PrismLauncher/PrismLauncher/pull/2069, JREs can
be managed at runtime. This is great for the Flatpak, as previously
*all* JREs had to be installed and could not be updated independently of
the launcher's Flatpak. It also makes using unsupported Java versions
easier as the launcher can download any version in the sandbox

We don't need to include these anymore

Signed-off-by: seth <getchoo@tuta.io>
2024-10-19 12:40:15 -04:00
seth 522d105dbe fix(nix): enable checks
Signed-off-by: seth <getchoo@tuta.io>
2024-10-19 12:32:36 -04:00
Trial97 7519c63f2e Replace http with https on skins
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-19 01:11:27 +03:00
timoreo f60d6e4d48 Merge pull request #2917 from Trial97/asan_log
fix heap-use-after-free in modrinth creation task
2024-10-18 12:09:24 +02:00
Alexandru Ionut Tripon 43eb27b695 Merge pull request #2916 from Ryex/fix/progress_dialog_use_after_free
fix: ensure all connections to the ProgressDialogs's Task the dialog made are disconnected
2024-10-15 08:59:12 +03:00
Trial97 ac13579b99 fix heap-use-after-free in modrinth creation task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-14 11:10:54 +03:00
Rachel Powers a108b5b420 fix: ensure all connections to the ProgressDialogs's Task the dialog made are dissconnected
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-10-14 00:45:45 -07:00
Alexandru Ionut Tripon f239f4c17c Merge pull request #2914 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-10-13 22:46:00 +03:00
Alexandru Ionut Tripon 5685bc3407 Merge pull request #2913 from archessmn/fix/custom-command-tab-order
Fix tab order on custom command inputs
2024-10-13 09:49:13 +03:00
Alexandru Ionut Tripon bd01c47dc9 Merge pull request #2906 from TheKodeToad/no-recursive-remove-on-update
Prevent directories from being removed on instance update
2024-10-13 09:48:27 +03:00
github-actions[bot] 3c836ece71 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb?narHash=sha256-NOiTvBbRLIOe5F6RbHaAh6%2B%2BBNjsb149fGZd1T4%2BKBg%3D' (2024-10-04)
  → 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09)
2024-10-13 00:24:52 +00:00
Mia Moir 3a1c06de02 fix: Tab order on custom command inputs
The tab order on the custom command UI in the instance settings is off, it goes 0 -> 2 -> 1, This re-orders the ui file to fix the order the inputs are in.

Signed-off-by: Mia Moir <63592337+archessmn@users.noreply.github.com>
2024-10-12 23:47:58 +01:00
Alexandru Ionut Tripon ef0cb88dd3 Merge pull request #2907 from Ryex/fix/icon_cache_stack_overflow
Prevent infinite recursion when mod icon load fails
2024-10-12 12:21:09 +03:00
Alexandru Ionut Tripon 0b624a43d6 Merge pull request #2908 from Trial97/remove_client
remove client overrides instead of double deleting the normal ones
2024-10-12 00:49:57 +03:00
Trial97 97f4ead0fb remove client overrides instead of double deleting the normal ones
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-12 00:19:54 +03:00
Alexandru Ionut Tripon 78ceae9c17 Merge pull request #2887 from Trial97/filters_modpack
Add filters for modpack search
2024-10-12 00:07:14 +03:00
TheKodeToad 72cfad8fee Continue deleting before failing
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-11 21:35:13 +01:00
Rachel Powers 09c9da268f fix: prevent inf recursion when mod icon load fails; cut max pixmapcache to 1/4 previous value
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-10-11 13:26:20 -07:00
TheKodeToad 2bc6ae9756 Prevent directories from being removed on instance update
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-11 19:53:28 +01:00
Tayou 0c4c86c41f Merge pull request #2900 from TheKodeToad/log-utf8
Use UTF-8 to decode logs on Java 18 or newer
2024-10-11 19:10:55 +02:00
Edgars Cirulis 0beaa94311 ci: uprev qt install action to v4
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
2024-10-10 15:26:36 +03:00
Edgars Cirulis b39098dbc5 ci: fix qt-6.8 workflow
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
2024-10-10 15:26:19 +03:00
Edgars Cirulis 5b6d551650 chore: update Qt to 6.8.0
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
2024-10-10 03:45:35 +03:00
TheKodeToad 98adcc60a3 Use UTF-8 to decode logs on Java 18 or newer
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-09 17:15:53 +01:00
TheKodeToad 909114bf2a Change LaunchTask to only accept MinecraftInstance
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-09 15:07:09 +01:00
txtsd 2abbcdfa6f Merge pull request #2896 from PrismLauncher/renovate/actions-cache-4.x
chore(deps): update actions/cache action to v4.1.1
2024-10-09 13:01:15 +05:30
renovate[bot] 093313e591 chore(deps): update actions/cache action to v4.1.1 2024-10-09 07:14:47 +00:00
Alexandru Ionut Tripon c72cce6572 Merge pull request #2897 from Trial97/fix_crash
fix crash when no resorce version is available
2024-10-09 08:37:22 +03:00
TheKodeToad 4b66320f63 Move x-prism-launcher to unnamed table for consistency
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 22:51:03 +01:00
TheKodeToad a76f37760c Fix log spam when opening files from older versions
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 22:30:50 +01:00
Trial97 d31c947b36 fix crash when no resorce version is available
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 22:02:38 +03:00
seth e2b346fc53 Merge pull request #2888 from PrismLauncher/renovate/actions-cache-4.x
chore(deps): update actions/cache action to v4.1.0
2024-10-08 13:15:05 -04:00
seth 7c45f88769 Merge pull request #2883 from PrismLauncher/renovate/cachix-install-nix-action-30.x
chore(deps): update cachix/install-nix-action action to v30
2024-10-08 13:14:47 -04:00
seth acd4dceafa Merge pull request #2890 from arnfaldur/patch-1
Keep libGLU in Flatpak
2024-10-08 13:14:18 -04:00
Trial97 df9f54454a removed static functions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 19:19:03 +03:00
TheKodeToad 538815e033 Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 17:16:10 +01:00
TheKodeToad 3fae659b30 Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 17:15:42 +01:00
Trial97 5bd5627a96 extended the modrinth search and applied the suggested change
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 15:06:50 +03:00
TheKodeToad a200fca45c Merge pull request #2869 from Edgars-Cirulis/patch-1
chore: update Qt to 6.7.3
2024-10-08 12:36:11 +01:00
Alexandru Ionut Tripon dc1f56e108 Merge pull request #2865 from Ryex/nsis_vc_redist
add vc_redist as a NSIS install section
2024-10-08 14:09:22 +03:00
Trial97 6e5f616ced move checkMcVersions to Filter struct
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-07 00:21:28 +03:00
Alexandru Ionut Tripon 1eee5c924b Merge pull request #2891 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-10-06 23:21:16 +03:00
Alexandru Ionut Tripon 999dec18dd Merge pull request #2893 from PrismLauncher/ftb-private-no-retry
Disable retry for private pack fetch
2024-10-06 23:20:14 +03:00
TheKodeToad d5990cca43 Disable retry for private pack fetch
This is already handled with a dialog asking whether you want it to be removed.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-06 13:51:36 +01:00
github-actions[bot] 03294f0000 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784?narHash=sha256-J%2BPeFKSDV%2BpHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI%3D' (2024-09-26)
  → 'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb?narHash=sha256-NOiTvBbRLIOe5F6RbHaAh6%2B%2BBNjsb149fGZd1T4%2BKBg%3D' (2024-10-04)
2024-10-06 00:24:57 +00:00
arnfaldur f7bd76c7d4 flatpak: don't cleanup libGLU
The mod AAA Particles (found in the modpack Prominence II RPG) fails to start due to a missing `libGLU.so.1` file.
Removing this cleanup command fixes the issue and makes the modpack run without issue.

I reproduced the issue at the head of the develop branch, with and without the change. No other issue was detected by adding the library, and I could not find the initial justification for removing it.

Signed-off-by: arnfaldur <a.arnaldur+git@gmail.com>
2024-10-05 17:58:53 +00:00
renovate[bot] cc0c9d208d chore(deps): update actions/cache action to v4.1.0 2024-10-04 22:22:10 +00:00
Trial97 859fac604b add modrinth modpack filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-04 17:06:47 +03:00
Rachel Powers a61c93bede Update .github/workflows/build.yml
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-10-04 07:06:19 -07:00