9128 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
TheKodeToad	13e13ea8fc	Use non-mod metadata in ModrinthPackExportTask ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-10-25 19:13:41 +01:00
seth	63b10738b2	chore(nix): use self for version ... Signed-off-by: seth <getchoo@tuta.io>	2024-10-25 02:35:53 -04:00
seth	a5c554cf6e	chore(nix): sync with nixpkgs ... Signed-off-by: seth <getchoo@tuta.io>	2024-10-25 02:35:53 -04:00
seth	6a2ed4a631	Merge pull request #2982 from TheKodeToad/launcher-level-autoinstalljava ... Use Launcher log level in AutoInstallJava	2024-10-25 02:23:02 -04:00
seth	b7152e7010	Merge pull request #2963 from PrismLauncher/renovate/actions-cache-4.x ... chore(deps): update actions/cache action to v4.1.2	2024-10-25 02:22:12 -04:00
seth	d766de5fbf	Merge pull request #2980 from Arcitec/flatpak-enhancements ... fix: bring back Flathub manifest improvements to the repo	2024-10-25 02:19:09 -04:00
Trial97	8daa1219a5	add extra protection against empty download link ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-10-25 01:13:05 +03:00
Trial97	3bc40120cd	bump develop to 10 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-10-25 00:17:34 +03:00
Arcitec	4ce025c0a2	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>	2024-10-24 17:36:45 +02:00
TheKodeToad	d8702e1357	Use Launcher log level in AutoInstallJava ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-10-24 12:46:01 +01:00
TheKodeToad	9fe81ff564	Merge pull request #2975 from Ryex/fix/version-page-load-speed ... fix: don't hang the ui for a full version load	2024-10-24 11:24:35 +01:00
TheKodeToad	5eff9b0934	Fix column crashes ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-10-24 01:23:11 +01:00
TheKodeToad	8e586c883c	Fix Modrinth update crashing ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-10-24 01:16:06 +01:00
Rachel Powers	7bd04ae928	fix don't hang the ui for a full version load ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2024-10-23 16:23:10 -07:00
TheKodeToad	4a7d624e9b	Merge pull request #2972 from TheKodeToad/fix-clean-env ... Fix launching Minecraft in portable Linux	2024-10-23 22:30:42 +01:00
TheKodeToad	92a906e0d4	Move everything in CheckUpdateTask::Update ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-10-23 14:58:52 +01:00
TheKodeToad	24cecf7b63	Fix compile ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-10-23 14:42:54 +01:00
TheKodeToad	89a327d363	Merge remote-tracking branch 'upstream/develop' into resource-meta ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-10-23 14:19:07 +01:00
TheKodeToad	e7cd8fe078	Fix CleanEnviroment()'s usage of stripVariableEntries ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-10-23 13:44:39 +01:00
Kaiyang Wu	3d82bc37af	javautils: add a filter for detecting Java paths on AOSC OS ... Signed-off-by: Kaiyang Wu <origincode@aosc.io>	2024-10-22 11:58:00 -07:00
TheKodeToad	f13e875f0d	Try to fix ModrinthCheckUpdate (not working) ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-10-22 18:46:10 +01:00
Alexandru Ionut Tripon	79439a0217	Merge pull request #2958 from Trial97/crash_QsaveFile ... skip parsing open QSaveFile temprary files as resources	2024-10-22 17:38:32 +03:00
renovate[bot]	210d0d8aa2	chore(deps): update actions/cache action to v4.1.2	2024-10-22 13:48:29 +00:00
Trial97	836aebc0d9	fix small leak ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-10-22 13:43:16 +03:00
Trial97	73d33f93b3	Replaced QSet with QHash ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-10-22 09:41:00 +03:00
Trial97	562c301326	skip QSaveFile temprary files ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-10-22 01:22:31 +03:00
Alexandru Ionut Tripon	a43ebefc97	Merge pull request #2954 from Trial97/skin_warn ... do not try to import skin if path is empty	2024-10-22 00:14:16 +03:00
Alexandru Ionut Tripon	69028969f1	Update launcher/ui/dialogs/skins/SkinManageDialog.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-10-21 22:59:51 +03:00
Alexandru Ionut Tripon	671d5270eb	Merge pull request #2953 from TheKodeToad/portable-fix ... Fix removing portable.txt on Linux portable build	2024-10-21 22:44:44 +03:00
Trial97	9a5b773e69	do not try to import skin if path is empty ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-10-21 19:28:34 +03:00
TheKodeToad	f3f4c44620	Fix removing portable.txt on Linux portable build ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-10-21 16:30:08 +01:00
TheKodeToad	b049e92697	Merge pull request #2947 from Trial97/fix_initial_setup ... do not require java if auto-download is enabled	2024-10-21 15:57:47 +01:00
Tayou	ea703ba26e	Merge pull request #2948 from TheKodeToad/vc-redist-norestart	2024-10-21 16:54:18 +02:00
TheKodeToad	78e24962f9	Fix /norestart ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-10-21 14:41:48 +01:00
Trial97	fcadbbb739	do not require java if auto-download is enabled ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-10-21 16:17:48 +03:00
Alexandru Ionut Tripon	a8c3a49cb9	Merge pull request #2938 from Trial97/fix_sparkle ... fix sparkle signature	2024-10-21 00:05:57 +03:00
Trial97	0586d38e03	fix sparkle signature ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-10-20 23:53:23 +03: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