Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,786 Commits 9 Branches 38 Tags
2bb094a90b23576324d6d9acf0c883d327672bc6
Commit Graph

8786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
98fe035442 replace unzipping with unpacking 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9eb1ce3ad7)
 2024-10-28 13:23:42 +00:00
Trial97
8e4994590b fix unzipping typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 685d3c79ac)
 2024-10-28 13:23:42 +00:00
Tayou
0722dba820 Merge pull request #3016 from PrismLauncher/backport-3009-to-release-9.x 2024-10-28 14:04:52 +01:00
Trial97
9560447c92 swap search with filter button for modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 61448a61ea)
 2024-10-28 13:04:39 +00:00
Alexandru Ionut Tripon
4d89512ca1 Merge pull request #3013 from PrismLauncher/backport-3008-to-release-9.x 
[Backport release-9.x] change contributors name
 2024-10-27 22:30:02 +02:00
Trial97
42a6bd1151 change ZekeZ name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c4cd7cf6c1)
 2024-10-27 19:31:56 +00:00
Trial97
f06505b138 change contributors name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f373a5cea0)
 2024-10-27 19:31:56 +00:00
seth
d854087089 Merge pull request #2997 from PrismLauncher/backport-2992-to-release-9.x 
[Backport release-9.x] Sync Flake with Nixpkgs
 2024-10-25 21:20:31 -04:00
seth
31031ec923 chore(nix): use self for version 
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit 63b10738b2)
 2024-10-26 00:57:00 +00:00
seth
5f06517b62 chore(nix): sync with nixpkgs 
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit a5c554cf6e)
 2024-10-26 00:57:00 +00:00
Tayou
dde5fc47d3 Merge pull request #2987 from Trial97/bump_9.2 2024-10-25 09:53:49 +02:00
Alexandru Ionut Tripon
76d5f632dc Merge pull request #2993 from PrismLauncher/backport-2982-to-release-9.x 
[Backport release-9.x] Use Launcher log level in AutoInstallJava
 2024-10-25 09:46:30 +03:00
TheKodeToad
27c6596bcb Use Launcher log level in AutoInstallJava 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit d8702e1357)
 2024-10-25 06:42:32 +00:00
Alexandru Ionut Tripon
e2f5fb27a6 Merge pull request #2991 from PrismLauncher/backport-2963-to-release-9.x 
[Backport release-9.x] chore(deps): update actions/cache action to v4.1.2
 2024-10-25 09:33:52 +03:00
renovate[bot]
98819a0d02 chore(deps): update actions/cache action to v4.1.2 
(cherry picked from commit 210d0d8aa2)
 2024-10-25 06:30:00 +00:00
seth
2dde2c4bec Merge pull request #2990 from PrismLauncher/backport-2980-to-release-9.x 
[Backport release-9.x] Sync with Flathub manifest
 2024-10-25 02:20:10 -04:00
Arcitec
008d69e5e5 fix: bring back Flathub manifest improvements to the repo 
- Brings back all manifest improvements, such as the incredibly important Mojang Java Downloader (without it, the Flatpak doesn't work), and important fixes for Wayland.

Signed-off-by: Arcitec <38923130+Arcitec@users.noreply.github.com>
(cherry picked from commit 4ce025c0a2)
 2024-10-25 06:19:25 +00:00
Trial97
a839258c07 bump develop to 9.2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-25 00:19:06 +03:00
Alexandru Ionut Tripon
89041531e1 Merge pull request #2981 from PrismLauncher/backport-2975-to-release-9.x 
[Backport release-9.x] fix: don't hang the ui for a full version load
 2024-10-24 15:09:19 +03:00
Rachel Powers
729cec5f45 fix don't hang the ui for a full version load 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit 7bd04ae928)
 2024-10-24 10:24:53 +00:00
TheKodeToad
80d675d2e6 Merge pull request #2974 from PrismLauncher/backport-2972-to-release-9.x 
[Backport release-9.x] Fix launching Minecraft in portable Linux
 2024-10-23 22:39:58 +01:00
TheKodeToad
fb7d19941f Fix CleanEnviroment()'s usage of stripVariableEntries 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit e7cd8fe078)
 2024-10-23 21:30:57 +00:00
Alexandru Ionut Tripon
877ab62c2f Merge pull request #2964 from PrismLauncher/backport-2958-to-release-9.x 
[Backport release-9.x] skip parsing open QSaveFile temprary files as resources
 2024-10-22 17:41:45 +03:00
Trial97
b983ae0fb0 fix small leak 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 836aebc0d9)
 2024-10-22 14:41:34 +00:00
Trial97
85422427b9 Replaced QSet with QHash 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 73d33f93b3)
 2024-10-22 14:41:34 +00:00
Trial97
51a71d0471 skip QSaveFile temprary files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 562c301326)
 2024-10-22 14:41:34 +00:00
Alexandru Ionut Tripon
25eaa4eba6 Merge pull request #2959 from PrismLauncher/backport-2954-to-release-9.x 
[Backport release-9.x] do not try to import skin if path is empty
 2024-10-22 00:15:10 +03:00
Alexandru Ionut Tripon
6da14d66bb Update launcher/ui/dialogs/skins/SkinManageDialog.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 69028969f1)
 2024-10-21 21:14:30 +00:00
Trial97
199c5497d3 do not try to import skin if path is empty 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9a5b773e69)
 2024-10-21 21:14:30 +00:00
Alexandru Ionut Tripon
740db2db02 Merge pull request #2956 from PrismLauncher/backport-2953-to-release-9.x 
[Backport release-9.x] Fix removing portable.txt on Linux portable build
 2024-10-21 22:46:49 +03:00
TheKodeToad
577f8074e1 Fix removing portable.txt on Linux portable build 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit f3f4c44620)
 2024-10-21 19:45:10 +00:00
Alexandru Ionut Tripon
c5e7bb90c5 Merge pull request #2952 from PrismLauncher/backport-2947-to-release-9.x 
[Backport release-9.x] do not require java if auto-download is enabled
 2024-10-21 18:04:53 +03:00
Trial97
1cf91fa5d9 do not require java if auto-download is enabled 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit fcadbbb739)
 2024-10-21 15:02:54 +00:00
Tayou
3bf4fbf8f4 Merge pull request #2951 from PrismLauncher/backport-2948-to-release-9.x 2024-10-21 16:55:28 +02:00
TheKodeToad
ff97affa72 Fix /norestart 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 78e24962f9)
 2024-10-21 14:54:35 +00:00
Alexandru Ionut Tripon
e8c9722a53 Merge pull request #2939 from PrismLauncher/backport-2938-to-release-9.x 
[Backport release-9.x] fix sparkle signature
9.0 		2024-10-21 00:08:40 +03:00
Trial97
9a810dfa6e fix sparkle signature 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 0586d38e03)
 2024-10-20 21:07:55 +00:00
ZekeZ
3ac080806d Merge pull request #2831 from Trial97/fix_login 
split the auth loading screen
 2024-10-21 00:14:36 +10:00
seth
38e0e0cb73 Merge pull request #2935 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-10-20 02:11:26 -04:00
github-actions[bot]
0501c1e17a chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09)
  → 'github:NixOS/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0?narHash=sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c%2BcHUJwA%3D' (2024-10-18)
 2024-10-20 00:25:22 +00:00
Alexandru Ionut Tripon
417bb3564d Merge pull request #2933 from getchoo-contrib/flatpak/jdks 
Don't bundle JREs in Flatpak
 2024-10-19 22:33:05 +03:00
Alexandru Ionut Tripon
e43836a271 Merge pull request #2932 from getchoo-contrib/nix/enable-tests 
Enable checks in Nix package
 2024-10-19 22:32:59 +03:00
Alexandru Ionut Tripon
9a161a0335 Merge pull request #2930 from Trial97/fixes 
Fix tests segfault
 2024-10-19 22:32:51 +03:00
Trial97
2d234b127b make sure that tests are only disabled fro cmark 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 22:07:31 +03:00
Rachel Powers
464c7c1d4d Merge pull request #2929 from Trial97/https 
Replace http with https on skins
 2024-10-19 12:00:52 -07:00
Trial97
2030041fcc Fix tests segfault 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 21:42:14 +03:00
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