8912 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
TheKodeToad	06b50dfd33	Fix more header mistakes ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-02-05 11:11:45 +00:00
TheKodeToad	5a76d9b7e1	Make requested changes ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-02-05 10:58:06 +00:00
TheKodeToad	68bf409a98	Fix formatting issues ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-27 19:14:57 +00:00
TheKodeToad	5d179671bf	Fix non-Linux build ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-27 18:55:24 +00:00
TheKodeToad	dc6f536843	Fix Qt 5 compilation ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-27 18:04:41 +00:00
TheKodeToad	cc504f4a6c	Merge remote-tracking branch 'upstream/develop' into unify-mc-settings ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-27 17:02:50 +00:00
TheKodeToad	a92c68adbd	Remove duplicate console section ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-27 16:54:45 +00:00
TheKodeToad	7aaa9fa93c	Finish off MinecraftSettingsWidget implementation ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-27 16:46:26 +00:00
TheKodeToad	81769b9047	Use MinecraftInstancePtr instance of InstancePtr ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-27 14:34:07 +00:00
TheKodeToad	147b315c14	Update thresholds when min. memory value is changed too ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-27 14:15:07 +00:00
TheKodeToad	9d0918a064	Remove outdated JavaWizardWidget comment ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-27 13:19:10 +00:00
TheKodeToad	98ab686348	Merge remote-tracking branch 'upstream/develop' into unify-mc-settings ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-27 13:18:19 +00:00
TheKodeToad	39ae2fbd4a	Fix tab inconsistencies ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-26 22:44:43 +00:00
TheKodeToad	36a35d7925	Fix tab order ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-26 22:36:48 +00:00
TheKodeToad	1b4b36df33	Unify Java page ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2025-01-26 22:25:26 +00:00
Alexandru Ionut Tripon	fdb4159f2a	Merge pull request #3332 from eff3ry/modrinth-filter-tweak ... Update Modrinth Client/Server Filters to match Modrinth website & launcher.	2025-01-21 23:42:37 +02:00
Alexandru Ionut Tripon	98be91c9d5	Merge pull request #3294 from Trial97/fix_flame_update ... Fix updating Curseforge mods with missing mod loader	2025-01-21 23:40:21 +02:00
TheKodeToad	8d3684c484	Merge pull request #1413 from Trial97/fix_curse_import ... feat: updated flame mod resolution	2025-01-21 13:53:00 +00:00
Alexandru Ionut Tripon	0d4eeb9965	Merge pull request #3330 from getchoo-contrib/mingw-cfg ... Use better compile flags for MINGW	2025-01-21 15:18:43 +02:00
Jeffery Tolmie	caccaefb39	Change "none" to "" ... Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com> Signed-off-by: Jeffery Tolmie <jeffery.tolmie@gmail.com>	2025-01-22 02:06:49 +13:00
eff3ry	532fec7748	DCO Remediation Commit ... DCO Remediation Commit for eff3ry <jeffery.tolmie@gmail.com> I, eff3ry <jeffery.tolmie@gmail.com>, hereby add my Signed-off-by to this commit: 2a403b3bfe9f4c79c38c33e80515a232576f6018 I, eff3ry <jeffery.tolmie@gmail.com>, hereby add my Signed-off-by to this commit: 4ba3fd559d2664099524848825adb6f5a60650ab Signed-off-by: eff3ry <jeffery.tolmie@gmail.com>	2025-01-22 01:48:04 +13:00
eff3ry	4ba3fd559d	Update Filter Checks ... Updates the filter checks so that options both and none can be differentiated. Signed-off-by: Jeffery Tolmie Jeffery.tolmie@gmail.com	2025-01-22 01:40:59 +13:00
eff3ry	2a403b3bfe	Edit Modrinth search faucets ... Edit Modrinth search faucets to alter the client and server filters to be more in-line with the Modrinth website and Launcher, making it easier to find client-side only mods etc. Signed-off-by: Jeffery Tolmie Jeffery.tolmie@gmail.com	2025-01-22 01:39:28 +13:00
Seth Flynn	f8a504e254	Merge pull request #3299 from Trial97/appimage2 ... Use Ubuntu 22.04 for Linux builds	2025-01-20 23:43:45 -05:00
Seth Flynn	e66f447ce5	feat: use better compile flags for mingw ... Signed-off-by: Seth Flynn <getchoo@tuta.io>	2025-01-20 20:36:48 -05:00
Seth Flynn	67b218b1f3	Merge pull request #2895 from Edgars-Cirulis/qt-6.8 ... chore: update to qt 6.8.x	2025-01-20 18:53:05 -05:00
Alexandru Ionut Tripon	db766574a4	Update .github/workflows/build.yml ... Co-authored-by: Seth Flynn <getchoo@tuta.io> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2025-01-21 01:38:13 +02:00
timoreo	18da01c9a6	Merge pull request #3320 from PrismLauncher/update_flake_lock_action ... chore(nix): update lockfile	2025-01-20 09:48:11 +01:00
Alexandru Ionut Tripon	c79ad73311	Merge pull request #3319 from getchoo-contrib/flatpak-arm ... Build Flatpaks for ARM	2025-01-19 10:16:41 +02:00
Sefa Eyeoglu	fb3926a85d	Merge pull request #3318 from getchoo-contrib/nix-arm ... Build Nix packages for aarch64-linux	2025-01-19 09:08:17 +01:00
github-actions[bot]	8d4f279539	chore(nix): update lockfile ... Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912?narHash=sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc%2Bc2c%3D' (2025-01-08) → 'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16)	2025-01-19 00:24:56 +00:00
Alexandru Ionut Tripon	1b5d3c2bf9	Update .github/workflows/build.yml ... Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2025-01-19 02:03:21 +02:00
Trial97	be3eca8c97	remove specific step for qt6 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2025-01-19 01:05:06 +02:00
seth	66f0397087	ci: build flatpaks for arm ... Signed-off-by: seth <getchoo@tuta.io>	2025-01-18 17:16:02 -05:00
seth	8e8538b506	ci: build nix packages for aarch64-linux ... Signed-off-by: seth <getchoo@tuta.io>	2025-01-18 16:55:38 -05:00
Trial97	7d3238d234	rename variables ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2025-01-17 21:09:44 +02:00
Alexandru Ionut Tripon	f17599c8b8	Merge pull request #1689 from Trial97/progrss_bar_interaction ... Added mouse interactions for labels in ProgressDialog	2025-01-17 20:59:52 +02:00
Alexandru Ionut Tripon	c2f4389e5f	Merge pull request #3254 from Trial97/remove_multimc ... remove EditAccountDialog	2025-01-17 08:51:44 +02:00
Alexandru Ionut Tripon	b7d117cc77	Merge pull request #2737 from maskersss/log-upload ... Truncate logs for mclo.gs to fit 25k line limit	2025-01-17 08:49:49 +02:00
seth	1cce582d56	Merge pull request #3292 from Trial97/fix_modrinth_link ... fix modrinth link	2025-01-16 20:42:00 -05:00
seth	867aaf881e	Merge pull request #3286 from PrismLauncher/update_flake_lock_action ... chore(nix): update lockfile	2025-01-16 20:40:44 -05:00
seth	14b348ffe7	Merge pull request #3285 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x ... chore(deps): update hendrikmuhs/ccache-action action to v1.2.16	2025-01-16 20:40:17 -05:00
Edgars Cīrulis	181610a8c1	Merge branch 'PrismLauncher:develop' into qt-6.8	2025-01-17 03:04:43 +02:00
seth	b7f2175718	Merge pull request #3179 from sshcrack/fix-inst-java ... Fix $INST_JAVA not being set for auto download java	2025-01-16 20:03:26 -05:00
seth	7a1dc0e9c9	Merge pull request #1555 from Trial97/env_vars ... correctly expand env vars for pre/post launch commands	2025-01-16 19:45:31 -05:00
Trial97	9317a675ed	removed unused type ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2025-01-16 17:07:44 +02:00
Trial97	7cb8deeb90	feat: updated flame mod resolution ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2025-01-16 17:05:36 +02:00
Trial97	bca517b8d3	fix appimage ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2025-01-16 12:10:19 +02:00
Trial97	e4ad4051c8	fix curseforge with empty loader as newest version ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2025-01-13 13:56:55 +02:00
Trial97	3ee73916ca	fix modrinth link ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2025-01-13 08:16:12 +02:00