8223 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Trial97	b6d87fc090	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress	2024-05-18 11:57:41 +03:00
Trial97	6aaf3a3ed4	Merge branch 'skin_selector' of github.com:Trial97/PrismLauncher into skin_selector	2024-05-18 11:57:06 +03:00
Trial97	2ac6efaa4a	Fix reggresion ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-18 11:56:43 +03:00
Trial97	23134d4b72	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector	2024-05-18 11:38:18 +03:00
Trial97	318819afc6	Made recommended button default ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-18 11:36:46 +03:00
Alexandru Ionut Tripon	eb0d0450e3	Merge pull request #2382 from Trial97/neoforge_technic ... Add neoforge support for technic packs and atlauncher packs	2024-05-18 10:40:45 +03:00
Alexandru Ionut Tripon	0f2736306e	Update launcher/ui/dialogs/skins/SkinManageDialog.ui ... Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-05-18 10:36:15 +03:00
Trial97	639c6e7f80	Add cancel to Add account dialog ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-17 00:49:00 +03:00
Trial97	78804b26ee	Maybe fix nix ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-17 00:34:39 +03:00
Trial97	75a457ebfa	Add custom page to land after microsoft login ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-17 00:31:04 +03:00
Trial97	ce09f06bda	Fix CI3 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-16 22:16:42 +03:00
Trial97	09c0c11033	Add back device code flow ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-16 21:58:25 +03:00
Alexandru Ionut Tripon	ab5f628453	Update launcher/updater/prismupdater/PrismUpdater.cpp ... Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-05-16 19:45:43 +03:00
Alexandru Ionut Tripon	051e788683	Update launcher/updater/prismupdater/PrismUpdater.cpp ... Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-05-16 19:45:00 +03:00
Trial97	2a58fb0ac5	Remove cobrandid ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-16 17:31:25 +03:00
Trial97	c15f6fcd2a	Fix portable if manifest is missing ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-16 17:21:30 +03:00
Alexandru Ionut Tripon	898ee67a07	Update launcher/ui/dialogs/MSALoginDialog.cpp ... Co-authored-by: Tayou <git@tayou.org> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-05-16 00:41:07 +03:00
renovate[bot]	1d384544d3	chore(deps): update cachix/install-nix-action action to v27	2024-05-15 19:40:15 +00:00
Trial97	8b051b97fd	Fix CI2 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-15 17:54:35 +03:00
Trial97	abedc6a23c	Improve login UI ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-15 17:25:15 +03:00
Trial97	849c3faeb4	Fix CI ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-15 14:07:03 +03:00
Trial97	80d8e3ee06	Remove katabasis ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-15 12:53:06 +03:00
Trial97	c2ed50627d	Added back qt version check ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-14 00:36:35 +03:00
Trial97	e285a85fe8	Removed AccountTask ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-14 00:21:51 +03:00
Trial97	3336f8107c	Removed AuthRequest and NetAction ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-14 00:21:45 +03:00
Sefa Eyeoglu	93da066aa2	Merge pull request #2398 from PrismLauncher/update_flake_lock_action ... chore(nix): update lockfile	2024-05-12 09:24:48 +02:00
github-actions[bot]	d74926e60d	chore(nix): update lockfile ... Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/5fd8536a9a5932d4ae8de52b7dc08d92041237fc' (2024-05-03) → 'github:nixos/nixpkgs/e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d' (2024-05-11)	2024-05-12 00:20:20 +00:00
Trial97	d795ba25e7	Delete instaces tmp diectory on startup ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-10 20:55:26 +03:00
Alexandru Ionut Tripon	f15981d786	Merge pull request #2358 from DioEgizio/nosystem-portablewithqt ... Remove prebuilt system tarballs on Linux, bundle Qt with Linux portable	2024-05-09 08:22:43 +03:00
Alexandru Ionut Tripon	c703babda9	Merge pull request #2379 from kthchew/fix/blocked-desc ... Improve blocked mods dialog (permissions prompt, misc. fixes) on macOS	2024-05-09 08:17:03 +03:00
Alexandru Ionut Tripon	72e9d7b148	Merge pull request #2366 from Trial97/modrint_import2 ... Fix download packs with invalid characters	2024-05-09 08:16:16 +03:00
Alexandru Ionut Tripon	7bcb1777a1	Merge pull request #2341 from Trial97/image_size ... Fix image width in project description	2024-05-09 08:15:35 +03:00
Alexandru Ionut Tripon	a4142573ac	Merge pull request #2311 from SolidStateDj/gen->ui ... Rename object name "userInterfaceTab" from "generalTab"	2024-05-09 08:15:15 +03:00
Trial97	a95c1768a7	Add neoforge support for technic packs and atlauncher packs ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-08 14:16:12 +03:00
Kenneth Chew	e7c95c9ccb	Fix bug where watched directories are not clickable on macOS ... Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>	2024-05-07 18:57:04 -04:00
Kenneth Chew	4787141698	Improved blocked mods dialog permissions prompt ... Targeted to macOS (where `~/Downloads` is considered a sensitive location that the system protects behind a prompt even from non-sandboxed apps) Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>	2024-05-07 18:30:06 -04:00
Samuel Stidham	adf0cfdebf	Fixed the code. ... Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>	2024-05-05 20:01:29 -04:00
Samuel Stidham	8e0af16de9	Add extra java locations for MacOs. ... Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>	2024-05-05 19:53:18 -04:00
Sefa Eyeoglu	5ce8cd6b84	Merge pull request #2375 from PrismLauncher/update_flake_lock_action ... chore(nix): update lockfile	2024-05-05 08:09:00 +02:00
github-actions[bot]	5d36ed9cf9	chore(nix): update lockfile ... Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01) → 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/d6f6eb2a984f2ba9a366c31e4d36d65465683450' (2024-04-27) → 'github:nixos/nixpkgs/5fd8536a9a5932d4ae8de52b7dc08d92041237fc' (2024-05-03) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/6fb82e44254d6a0ece014ec423cb62d92435336f' (2024-04-24) → 'github:cachix/pre-commit-hooks.nix/2849da033884f54822af194400f8dff435ada242' (2024-04-30)	2024-05-05 00:19:38 +00:00
SabrePenguin	0c76e7ab20	Made Regex static and const, removed dist ... Signed-off-by: SabrePenguin <lknofczynski@gmail.com>	2024-05-01 13:00:55 -04:00
SabrePenguin	ce873e4a0d	Regex correction ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>	2024-05-01 12:49:34 -04:00
SabrePenguin	814f84efab	Fixed more clang formatting ... Signed-off-by: SabrePenguin <lknofczynski@gmail.com>	2024-05-01 00:21:32 -04:00
SabrePenguin	51f4ede797	Fixing CI format issues ... Signed-off-by: SabrePenguin <lknofczynski@gmail.com>	2024-05-01 00:11:53 -04:00
SabrePenguin	b9c010ffb2	Added patch to all setHtml calls ... Signed-off-by: SabrePenguin <lknofczynski@gmail.com>	2024-04-30 23:43:36 -04:00
SabrePenguin	e3d64608b9	Switched </ul> to a Regex expression ... Signed-off-by: SabrePenguin <lknofczynski@gmail.com>	2024-04-30 23:28:50 -04:00
SabrePenguin	cec27fd014	Moved html patch to StringUtils ... Signed-off-by: SabrePenguin <lknofczynski@gmail.com>	2024-04-30 23:14:26 -04:00
Trial97	30ce8ecb5f	Fixed imports ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-04-30 23:20:24 +03:00
Trial97	5400c24c73	Ensure valid file names for resource names ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-04-30 23:04:50 +03:00
Trial97	e068120375	Fix invalid characters filename download on windows ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-04-30 22:56:40 +03:00