4391 Commits

Author	SHA1	Message	Date
Trial97	be67067fa2	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo	2023-11-23 16:23:56 +02:00
Trial97	9c13504b06	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_ok	2023-11-23 16:13:09 +02:00
Trial97	afcdb7595c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2	2023-11-23 16:01:54 +02:00
Trial97	f71e622f71	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into copy_time	2023-11-23 15:51:54 +02:00
Trial97	4f49a56e4d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files	2023-11-23 15:40:31 +02:00
Trial97	85e875fe08	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day	2023-11-23 15:32:48 +02:00
Trial97	944ed48a61	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into time4	2023-11-23 14:58:05 +02:00
Trial97	e503d44c54	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time	2023-11-23 14:47:47 +02:00
Trial97	908072710a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-23 14:34:56 +02:00
bit6tream	d414599974	(#1693) Use a better approach to detect a noexec mount option ... Signed-off-by: bit6tream <megapixel483@gmail.com>	2023-11-23 15:23:03 +03:00
Trial97	e43a557a0b	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress	2023-11-23 14:08:49 +02:00
Trial97	7d4778ffd6	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into portabledatadir	2023-11-23 13:54:36 +02:00
Trial97	80383d237a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods	2023-11-23 13:38:11 +02:00
Trial97	1095d0698a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into waitprofiler	2023-11-23 13:25:12 +02:00
Trial97	c2fc2d330b	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip	2023-11-23 12:57:31 +02:00
Trial97	f16f0ed93e	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry	2023-11-23 12:47:52 +02:00
Trial97	9345416361	Fixed localization stuff ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-23 12:36:40 +02:00
Trial97	2268e46b91	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into account	2023-11-23 12:22:41 +02:00
Trial97	ceb88a170e	Extracted reauthenticateCurrentAccount as a separate function ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-23 12:22:31 +02:00
Sefa Eyeoglu	a2aa303770	Merge pull request #1843 from Trial97/fix_not_found_dep	2023-11-23 11:02:16 +01:00
Sefa Eyeoglu	a966289944	Merge pull request #1852 from Trial97/war_ning	2023-11-23 11:01:53 +01:00
Sefa Eyeoglu	7c9c3d2c5f	Merge pull request #1815 from Trial97/fix_mangohub	2023-11-23 11:00:57 +01:00
Trial97	d8c5ed55c2	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2	2023-11-23 12:00:18 +02:00
Trial97	6169af70db	Added back the FIXME comment ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-23 11:59:35 +02:00
Sefa Eyeoglu	2b17a61d38	Merge pull request #1589 from Trial97/instance_reload ... Fully reload the instance list once the folder is changed	2023-11-23 10:48:01 +01:00
Sefa Eyeoglu	d60d089cbc	Merge pull request #1751 from LocalSpook/account_type	2023-11-23 10:27:06 +01:00
Alexandru Ionut Tripon	5d6334ef95	Merge pull request #1762 from LocalSpook/const-in-declarations ... Remove top-level `const` qualifiers in function declarations	2023-11-23 08:53:01 +00:00
Trial97	6b3b54f061	format ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-23 10:48:11 +02:00
Trial97	e11b7e3770	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2023-11-23 10:46:27 +02:00
Trial97	670a0c1442	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size	2023-11-23 10:46:03 +02:00
Trial97	d5d8b7be8d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2	2023-11-23 10:45:35 +02:00
Trial97	673f82e884	Merge branch 'war_ning' of github.com:Trial97/PrismLauncher into war_ning	2023-11-23 10:45:06 +02:00
Trial97	f18f7147b5	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into war_ning	2023-11-23 10:44:49 +02:00
Trial97	721a08462c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into copy_time	2023-11-23 10:44:26 +02:00
Trial97	f0cff15d56	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files	2023-11-23 10:43:43 +02:00
Trial97	a1ac3ef7ae	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day	2023-11-23 10:43:15 +02:00
Trial97	a7be21733f	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector	2023-11-23 10:41:55 +02:00
Trial97	66decbb180	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time	2023-11-23 10:41:06 +02:00
Trial97	4ef626dab3	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into time4	2023-11-23 10:40:30 +02:00
Sefa Eyeoglu	48e9753fb5	Merge pull request #1880 from Trial97/link	2023-11-23 09:07:34 +01:00
Sefa Eyeoglu	b42434bcb6	Merge remote-tracking branch 'upstream/develop' into const-in-declarations	2023-11-23 09:06:23 +01:00
Sefa Eyeoglu	364fb9808e	Merge pull request #1347 from HyperSoop/reduce-min-memory	2023-11-23 08:58:58 +01:00
Trial97	e3af4f9a78	Fixed playtime recording ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-22 20:34:12 +02:00
Trial97	85b4e1f24f	Made column hidden by default ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-22 19:23:24 +02:00
Trial97	140a55810d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2023-11-22 14:20:30 +02:00
bit6tream	681e76c551	(#1693) Notify user if /tmp directory has noexec mount option ... Minecraft versions starting from 1.19 would not start at all if /tmp is mounted as `noexec`. Signed-off-by: bit6tream <megapixel483@gmail.com>	2023-11-22 01:48:31 +03:00
Trial97	196d24330a	Fixed open link on settings page ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-21 17:47:59 +02:00
Trial97	54c308e5b5	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-19 21:15:12 +02:00
Tayou	24f2102596	Merge pull request #1869 from Trial97/icons_folder ... Added more open folder actions	2023-11-19 15:06:30 +01:00
Trial97	26931475ae	made folder size reflect the number of elements ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-19 15:58:30 +02:00
Trial97	80c85aef99	fixed const stuff ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-19 15:37:18 +02:00
Alexandru Ionut Tripon	76216335b1	Update launcher/ui/pages/modplatform/ImportPage.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-19 15:26:47 +02:00
Trial97	a8aa214c0e	changed prism aniversary ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-19 09:01:59 +02:00
Trial97	e99926ea94	Added more open folder actions ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-19 02:40:25 +02:00
Trial97	f7e478c755	Added all supported files filter ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-19 02:02:02 +02:00
fn2006	439b618f46	Merge pull request #118 from unmojang/unmojang ... Fix authlib-injector not working w/other Java agents	2023-11-18 10:44:31 +00:00
Trial97	1a06a1424b	Added custom env vars to pre/post launch commands ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-18 10:53:38 +02:00
Trial97	9f39e45b28	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time	2023-11-18 10:45:24 +02:00
Evan Goode	bc709f8adc	Fix authlib-injector not working w/other Java agents ... Signed-off-by: Evan Goode <mail@evangoo.de>	2023-11-18 00:46:15 -05:00
fn2006	02a1d436ae	Fix Polly background not showing up on halloween	2023-11-17 23:12:33 +00:00
fn2006	7c139a5608	Add Evan Goode to credits	2023-11-17 23:12:33 +00:00
Trial97	4e3132e8b2	reseted the setting ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-17 22:40:36 +02:00
Trial97	6b777653a5	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-17 22:38:17 +02:00
Trial97	2bfb5fc138	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-17 22:26:17 +02:00
Trial97	53c6493b9a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2	2023-11-17 21:56:23 +02:00
TheKodeToad	7ef2bda269	Improve description ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-11-17 19:49:48 +00:00
Alexandru Ionut Tripon	1150249cec	Merge pull request #1746 from Trial97/toggle_deps ... separated dependecy check from mod update	2023-11-17 19:42:22 +00:00
fn2006	ae6f14a9a0	Fix inaccurate warnings about needing a MS Account	2023-11-17 08:40:13 +00:00
Evan Goode	8f540a5af1	Correctly save Mojang account type ... Signed-off-by: Evan Goode <mail@evangoo.de>	2023-11-16 12:33:03 -05:00
Trial97	a531f32b69	fixed settings saving ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-16 13:26:29 +02:00
Evan Goode	dcc2d77ebb	Fix offline accounts ... Original authlib-injector work had a bug making offline accounts not save correctly.	2023-11-16 01:15:17 -05:00
Evan Goode	518962c472	Replace 'Prism Launcher' with 'PollyMC' in updater	2023-11-15 23:01:22 -05:00
Evan Goode	cdb2f09bd4	Merge branch 'unmojang' into unmojang-8.0	2023-11-15 21:23:01 -05:00
Evan Goode	be8c8ad9ad	Auto migrate Ely.by accounts to authlib-injector ... Signed-off-by: Evan Goode <mail@evangoo.de>	2023-11-15 15:23:24 -05:00
Evan Goode	9430026192	Merge tag '8.0' into unmojang-8.0 ... Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0 (Imcomplete) list of changes in 8.0 relevant to PollyMC: - Prism has dropped support for Mojang accounts - https://github.com/PrismLauncher/PrismLauncher/pull/1656 - Added it back to PollyMC primarily since the Mojang authentication code is also used for authlib-injector accounts. Some users may also still want to be able to log in to Mojang accounts for some reason: https://github.com/fn2006/PollyMC/issues/115#issuecomment-1805384658, even if they do not provide authentication to multiplayer servers. - To my surprise, I could still log in to a Mojang account, get its skin, and launch the game. Authentication to servers, of course, did not work. - Tested: logging into authlib-injector, Mojang, and MSA accounts and launching the game. - Prism has added a built-in updater for Windows and Linux that I assume provides similar functionality to Sparkle on macOS: https://github.com/PrismLauncher/PrismLauncher/pull/1268. There is a Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies the repo checked by the updater. I have changed this to the PollyMC repository, and since PollyMC follows almost the same CI/release patterns as Prism Launcher, it might work with PollyMC, too, but I have not tested it yet. - Add macOS support to Nix - https://github.com/PrismLauncher/PrismLauncher/pull/1485 - Untested - The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts. - Removed Windows MSVC Legacy builds - Removed Quilt Beacon toggle, the beacon is now always disabled: https://github.com/PrismLauncher/PrismLauncher/pull/1547, https://github.com/PrismLauncher/meta/pull/23 - Prism removed FTB support in 7.0, but I tested creating an FTB instance to make sure it still works in 8.0 Signed-off-by: Evan Goode <mail@evangoo.de>	2023-11-15 14:37:14 -05:00
Evan Goode	b1738deffb	authlib-injector: Mark correct account as in use ... Fixes a bug where the wrong account could be marked as "in use" when the game is launched if there are multiple accounts that share the same profile ID. This can lead to the launcher trying to refresh an account that's currently in use by the game, leading to "Invalid session" errors in-game. Signed-off-by: Evan Goode <mail@evangoo.de>	2023-11-15 12:11:12 -05:00
Evan Goode	79f00f6c50	authlib-injector: link to wiki page with API servers ... Signed-off-by: Evan Goode <mail@evangoo.de>	2023-11-15 12:11:09 -05:00
Trial97	215465e833	added subdirectories to iteration ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-15 14:11:34 +02:00
Trial97	4d93f4adb1	Fixed folder size ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-15 12:10:47 +02:00
Trial97	890965746f	Added warning on mods update while running ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-15 11:07:46 +02:00
Trial97	361329d5d1	Made resource columns resizable ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-14 23:21:53 +02:00
Trial97	bedb4da869	Added filename to the modlist export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-14 19:37:23 +02:00
Trial97	6804e2ba59	moved export to list to the mods page ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-14 18:40:45 +02:00
Trial97	99fbcbee4c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2	2023-11-14 18:12:48 +02:00
Trial97	c05c001ab2	Remove the dep if it fails for any reason ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-13 23:49:49 +02:00
Alexandru Ionut Tripon	a3445cbbdd	Merge pull request #1704 from Leafeling/develop ... Add game category to generated Linux shortcuts	2023-11-13 07:32:33 +00:00
Trial97	0e57eeca69	Added missing variable from lambda capture ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-13 09:28:59 +02:00
Alexandru Ionut Tripon	32a8d9b9c6	Update launcher/ui/pages/instance/ModFolderPage.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-13 09:23:56 +02:00
Trial97	17916dbd24	Fixed inconsistent Ok in instance import ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-12 20:27:55 +02:00
Tayou	a991d48c76	Merge pull request #1798 from Trial97/java ... [Windows] Autodetect Java from the Microsoft Store version of the official launcher	2023-11-12 15:39:17 +01:00
Trial97	50a4d61ded	Fixed demo mode ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-10 23:26:41 +02:00
Trial97	926942a973	Fixed modrinth sort swap ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-10 20:00:35 +02:00
Trial97	463608b289	fixed shader packs detection ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-10 19:37:11 +02:00
Trial97	5e2eb7bbbb	Added button to select the FTBApp instances directory ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-09 23:30:30 +02:00
Trial97	b4bfc03e8b	Added button to refresh themes and catpacks ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-09 21:48:46 +02:00
Trial97	7532a41043	Improvements to catpack ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-09 21:38:38 +02:00
TheKodeToad	0f68a2dd61	Only open/close groups on left button ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-11-09 16:40:23 +00:00
Desoroxxx	6093399f5c	Update LauncherPage.ui ... Signed-off-by: Desoroxxx <desoroxxx@gmail.com>	2023-11-08 17:32:30 +01:00
Trial97	ae62e48c7c	Moved some buttons around ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-08 12:25:56 +02:00
Trial97	a7bfe385ea	Renamed Remove Metadata button ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-08 12:10:39 +02:00
Trial97	e4fecd1f97	Made sure mangoHub libs are present ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-08 11:55:38 +02:00
Alexandru Ionut Tripon	7313630615	Update launcher/java/JavaUtils.cpp ... Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-08 09:01:31 +02:00
Alexandru Ionut Tripon	9d653f172a	Update launcher/ui/dialogs/MSALoginDialog.cpp ... Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-08 08:56:48 +02:00
Trial97	4dc9e65875	Formated the suggestion ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-07 20:41:45 +02:00
Alexandru Ionut Tripon	54187a505f	Update launcher/ui/dialogs/MSALoginDialog.cpp ... Co-authored-by: Tayou <git@tayou.org> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-07 20:39:12 +02:00
Hazel Hofmann	1dea83580e	DCO Remediation Commit for Hazel Hofmann <hazel@theopensource.company> ... I, Hazel Hofmann <hazel@theopensource.company>, hereby add my Signed-off-by to this commit: 9ada8d906d Signed-off-by: Hazel Hofmann <hazel@theopensource.company>	2023-11-07 15:05:56 +01:00
Hazel Hofmann	9ada8d906d	Use same categories as main desktop entry	2023-11-07 14:54:04 +01:00
Trial97	8897f16d1d	simplify microsoft login ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-07 10:52:52 +02:00
Trial97	c78d35d699	added additional minecraft java path for windows ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-07 10:20:53 +02:00
Trial97	5d5adbd7da	add update menu conditionaly ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-07 09:48:07 +02:00
Trial97	6506e93e4a	Removed some buttons ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-07 09:44:27 +02:00
Trial97	011e87b421	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-06 23:38:14 +02:00
Trial97	7a0b2a316a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-06 23:19:58 +02:00
TheKodeToad	baa988ec81	Merge pull request #1739 from Trial97/mod_icons ... fixed squished mod icons	2023-11-06 20:49:05 +00:00
Alexandru Ionut Tripon	8eac0d34bd	Merge pull request #1796 from Trial97/dep_global_toggle ... Added Global Dependenicies toggle	2023-11-06 20:48:51 +00:00
Alexandru Ionut Tripon	0b1dcb3ea7	Merge pull request #1760 from LocalSpook/sorting ... Localize sorting options for resource and shader packs	2023-11-06 20:45:52 +00:00
Alexandru Ionut Tripon	3d529b0c3e	Merge pull request #1772 from Trial97/pixmap_crash ... Fix crash with mod icon caching	2023-11-06 20:44:27 +00:00
Trial97	ca226d2ab5	Fixed comparation warning ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-06 11:24:19 +02:00
Trial97	670e91cb60	Increased the step to around 10MB ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-06 11:08:18 +02:00
Trial97	cc291219f9	apply suggested changes ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-06 10:51:34 +02:00
Sefa Eyeoglu	0eda2447dc	Merge pull request #1797 from Trial97/fix_mangohub ... [Linux] Fix loading MangoHud	2023-11-06 08:14:55 +01:00
Trial97	867e6223ce	Fixed mangoHub loading ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-05 23:48:26 +02:00
Alexandru Ionut Tripon	3e7f9083ca	Update launcher/ui/pages/instance/ModFolderPage.cpp ... Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-05 23:41:54 +02:00
TheKodeToad	bd9d5e0990	Reword ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-11-05 20:31:48 +00:00
Trial97	9a8667e99c	Added Global Dependenicies toggle ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-05 22:22:49 +02:00
Trial97	710a48fcaf	changed type form double long to long long ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-05 21:41:10 +02:00
Edgars Cīrulis	d2a85cb580	visual: Fix spacing. ... Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>	2023-11-05 17:43:12 +00:00
Trial97	1d67fc6646	added special case for windows ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-05 17:35:49 +02:00
Alex	cf4144cb50	Fixed link to Fulmine's website ... Signed-off-by: Alex <akim8@emich.edu>	2023-11-05 00:46:05 -04:00
Evan Goode	89ac7edee3	Merge remote-tracking branch 'upstream/develop' into unmojang	2023-11-04 21:35:21 -04:00
Trial97	5afe6600ee	use fs::move instead of qt rename ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-04 16:49:35 +02:00
Trial97	f828ea8929	updated the texture pack tooltips ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-04 11:49:05 +02:00
Trial97	79e299123c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip	2023-11-04 00:15:09 +02:00
Trial97	a4978946d5	disabled lax deps ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-04 00:07:51 +02:00
Trial97	2b6d8b8a2d	updated tooltip messages ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-03 23:02:17 +02:00
Trial97	cbb453a0ed	minimize the permisions for extracted files ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-03 22:55:10 +02:00
TheKodeToad	b446bdf4a9	Merge pull request #1783 from Trial97/visual_bug ... Fixed visual bug with Modlist export	2023-11-03 15:20:57 +00:00
Trial97	1b2654bfa6	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip	2023-11-03 12:53:23 +02:00
Alexandru Ionut Tripon	1bd69ecbb2	Update launcher/ui/pages/global/AccountListPage.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-03 11:42:40 +02:00
Trial97	b18082376d	Fixed visual bug with Modlist export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-03 11:04:13 +02:00
Trial97	127a31ba3a	Added warning for remove account ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-03 10:31:40 +02:00
Trial97	4081c51573	made dependency check more lax ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-02 23:52:12 +02:00
Trial97	220a1de99a	made sure that we do not relay for undefined behavior ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-02 22:41:56 +02:00
Trial97	3cbc63bb9f	added size column ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-02 12:18:24 +02:00
Trial97	2349f29be0	jsut a overflow protection ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-02 01:26:04 +02:00
Alexandru Ionut Tripon	f8bb1a872a	Merge pull request #1766 from TheKodeToad/groups-fix ... Fix group issues	2023-11-01 15:26:41 +00:00
Tayou	86e2f6c58c	Merge pull request #1685 from Trial97/java ... Autodetect Java bundled with official launcher	2023-10-31 18:03:41 +01:00
Trial97	2863a691ef	moved refresh out of the loop ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-31 08:45:08 +02:00
Alexandru Ionut Tripon	60fd7f0ae6	Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp ... Co-authored-by: Tayou <git@tayou.org> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-10-31 08:43:26 +02:00
Trial97	7166d68736	fixed account refresh after sleep ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-31 00:45:18 +02:00
Trial97	e42a2404a9	added more microsoft error codes ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-30 22:55:23 +02:00
Trial97	1490193402	added button to disable dependencies on the mod review ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-30 22:14:26 +02:00
TheKodeToad	2526275c5e	Better check ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-30 09:51:37 +00:00
TheKodeToad	5a54d80c6e	Fix group issues ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-30 09:26:38 +00:00
LocalSpook	0de4d8902e	Remove top-level const qualifiers in function declarations ... Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>	2023-10-28 22:12:09 -07:00
LocalSpook	54305397e4	Localize sorting options for resource and shader packs ... Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>	2023-10-28 12:50:40 -07:00
Tayou	69c2720872	Merge pull request #1691 from Trial97/no_color ... Add no_color env variable	2023-10-28 18:02:53 +02:00
Tayou	df2a92d5f4	Merge pull request #1742 from TayouVR/fix-resourcepack-crash ... fix switch/case fallthrough in resource parse tasks	2023-10-28 12:44:40 +02:00
Trial97	33cf7066b4	formated the code ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-27 21:51:35 +03:00
Trial97	2256850cb6	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-27 00:12:50 +03:00
LocalSpook	9d972ccc63	Localize account type in account list ... Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>	2023-10-26 13:32:33 -07:00
Sefa Eyeoglu	3719ea21b0	Merge pull request #1355 from TheKodeToad/env-vars ... Custom environment variables	2023-10-26 22:10:26 +02:00
TheKodeToad	bd11b93a0c	Use hidden tab bar like other pages ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-26 21:01:24 +01:00
Trial97	12d567a9b8	made env vars behave like the rest of the settings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 22:51:38 +03:00
Trial97	60a7628dbb	delete duplicate mods ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 20:43:26 +03:00
Trial97	3d84635b24	Remove file on mod duplication ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 20:09:12 +03:00
Trial97	321bbf1fa8	fixed asan stuff ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 19:06:38 +03:00
Trial97	dba54332fb	fixed some asan stuf ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 18:31:52 +03:00
Trial97	04acd27dab	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent	2023-10-26 13:45:47 +03:00
Trial97	8b8ea2d270	ensured that the variant is allways uppercase ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 13:37:25 +03:00
Trial97	44cdf3f697	Fixed skin variant ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 13:33:00 +03:00
Trial97	263dc5af67	Fixed remane and delete of selected skin ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-25 19:56:26 +03:00
Trial97	a5938a7de9	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-25 19:26:05 +03:00
txtsd	38d77b58cd	Merge pull request #1748 from LocalSpook/using	2023-10-25 16:08:42 +00:00
Trial97	d4d345ee7d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps	2023-10-24 23:40:36 +03:00
Tayou	a161f5cfe2	Merge pull request #1747 from Trial97/fix_initial_java ... fix: java memory not set on initial setup	2023-10-24 19:04:56 +02:00
LocalSpook	5be80df1ee	Replace typedef with using ... Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>	2023-10-24 01:36:27 -07:00
Trial97	6a19f2dae8	fixed icon import ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-24 11:19:19 +03:00
Trial97	694840937b	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip	2023-10-24 10:32:09 +03:00
Trial97	87f2f88d4c	fix: java memory not set on initial setup ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-23 23:38:03 +03:00
Trial97	f7c9972db0	separated dependecy check from mod update ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-23 19:46:30 +03:00
Sefa Eyeoglu	b376888f43	Merge pull request #1515 from TheKodeToad/sysprops	2023-10-22 21:57:11 +02:00
Tayou	0fe3241df6	remove now unneeded Q_ASSERTs ... Signed-off-by: Tayou <git@tayou.org>	2023-10-22 21:25:06 +02:00
Tayou	7d5206818b	fix switch/case fallthrough ... Signed-off-by: Tayou <git@tayou.org>	2023-10-22 21:25:00 +02:00
Sefa Eyeoglu	db19362a97	feat: add launcher brand and version props ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-10-22 21:19:44 +02:00
Trial97	2aeb829176	removed the concurent task destructor behaivior ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-22 19:58:10 +03:00
Trial97	0ca3873f1c	small fix ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-22 17:48:19 +03:00
Trial97	a748f49362	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent	2023-10-22 11:34:55 +03:00
Trial97	932cd9e262	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-22 11:32:05 +03:00
Trial97	10ae808da9	fixed codeql ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-22 00:06:08 +03:00
Trial97	d151e97e3a	Fixed some headers ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-21 22:40:37 +03:00
Trial97	41c9ca4f8a	Added categories filter ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-21 22:15:07 +03:00
Trial97	35d62cc5f2	Updated dependencies ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-21 19:05:31 +03:00
Trial97	9aac8e389f	made release type visible ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-21 18:48:55 +03:00
Trial97	9e85297f7a	Connected filters ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-21 18:28:33 +03:00
Alexandru Ionut Tripon	2c4af7e793	Merge pull request #1290 from Trial97/refactor/NetActions ... Refactor ImgurUpload	2023-10-21 12:32:16 +01:00
Trial97	4850434c67	added releaseType? ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-21 12:16:02 +03:00
Alexandru Ionut Tripon	f0fd1bd5e5	Merge pull request #1737 from Trial97/fix_ftb_app_import_icon ... Fixed FTBApp import icon	2023-10-21 07:48:21 +01:00
Trial97	5d926582c7	added Image column size hint ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-20 19:08:56 +03:00
Trial97	7b62d14683	fixed squished mod icons ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-20 17:15:12 +03:00
Trial97	a9d7af9096	removed some unused stuff ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-20 16:44:37 +03:00
Trial97	80723eeca1	Fixed FTBApp import icon ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-20 16:41:32 +03:00
TheKodeToad	e9fd02baca	Fix code style ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-20 13:12:16 +01:00
Trial97	35a8ab2393	Removed processEvents ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-20 10:32:45 +03:00
Trial97	6883c19579	Fixed the version combobox ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-20 00:44:36 +03:00
Trial97	55946c8923	first attempt at a combobox ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-19 23:53:26 +03:00
Alexandru Ionut Tripon	7ad48d8677	Merge pull request #1692 from Trial97/msa_account ... Fix wrong account selection	2023-10-19 20:09:28 +01:00
Trial97	1ac9757a86	Added back the processEvents ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-19 21:51:51 +03:00
Tayou	b9c1dc7325	Merge pull request #1374 from Trial97/welcome_background ... Added welcome screen	2023-10-19 20:42:47 +02:00
Trial97	03a27d5b5a	Updated Managed Packs ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-19 19:47:48 +03:00
TheKodeToad	cf33927f21	Merge remote-tracking branch 'upstream/develop' into sysprops ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-19 11:28:07 +01:00
Trial97	8d4f508cc6	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent	2023-10-18 18:08:48 +03:00
Trial97	30f73a0696	Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into concurrent ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-18 18:08:31 +03:00
TheKodeToad	c638a63a03	Merge pull request #1726 from Trial97/contrib ... Added Trial97 as maintainer in about dialog	2023-10-18 09:34:12 +01:00
Sefa Eyeoglu	2081fcd3f5	Merge pull request #1722 from Scrumplex/fix/readonly-themes	2023-10-18 09:25:48 +02:00
Trial97	165d218300	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into contrib	2023-10-18 09:07:36 +03:00
Trial97	fea4c4eba8	Updated filters ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-18 09:00:45 +03:00
seth	069bc887f1	fix: don't always build updater on platforms besides mac ... Signed-off-by: seth <getchoo@tuta.io>	2023-10-17 19:12:00 -04:00
Trial97	b54376062e	Added mcVersion column ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-17 19:25:01 +03:00
Trial97	9001d9eb75	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2023-10-17 18:32:18 +03:00
Sefa Eyeoglu	d348f20dd9	fix: allow loading themes with missing resources folder ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-10-17 10:00:17 +02:00
Trial97	cc66350286	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-16 23:42:19 +03:00
Trial97	9400879242	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-16 23:32:24 +03:00
Trial97	b6f48f6fe0	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-16 23:13:53 +03:00
Trial97	869f654a10	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-16 22:46:11 +03:00
Tayou	436db23ffc	Merge pull request #1268 from Ryex/feat/launcher-updater ... Feat: Windows (And portable linux / appimage) Auto Updater	2023-10-16 19:53:50 +02:00
Alexandru Ionut Tripon	0927035a26	Merge pull request #1549 from Trial97/atlauncher_browser ... added suport for atlauncher browser download	2023-10-16 06:39:12 +01:00
Tayou	5985d8b118	Merge pull request #1383 from TheKodeToad/rename-groups ... Rename groups	2023-10-15 23:38:27 +02:00
TheKodeToad	cc990c4f94	Merge branch 'develop' into env-vars ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-15 21:57:20 +01:00
TheKodeToad	c4882e7162	Merge pull request #443 from TheKodeToad/skinfix ... Add legacy skin fix	2023-10-15 21:46:29 +01:00
Trial97	0ff98c5876	allways enable dependencies ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-15 21:22:59 +03:00
Trial97	fe14e48d72	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods	2023-10-15 21:06:40 +03:00
Trial97	9d15255e0a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into atlauncher_browser	2023-10-15 20:52:38 +03:00
Trial97	ca9b593483	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions	2023-10-15 20:44:45 +03:00
Trial97	6bbff310bc	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater	2023-10-15 17:42:39 +03:00
Trial97	52c94eb568	reset the setting if is under 0 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-15 16:47:23 +03:00
TheKodeToad	6fb7a98901	Fix small mistake 😭 ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-15 14:45:05 +01:00
Tayou	9705e6325a	Merge pull request #1673 from Trial97/win_attr ... fix folder attributes on windows copy	2023-10-15 15:15:36 +02:00
TheKodeToad	7112d04df5	Mark setting as optional ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-15 14:11:08 +01:00
Trial97	b075711be0	ensured totalTimePlayed is allways greater than 0 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-15 16:03:14 +03:00
Alexandru Ionut Tripon	2ab48a43dd	Merge pull request #1706 from Trial97/develop ... removed the better release for modrinth modpacks	2023-10-15 12:24:20 +01:00
Trial97	749975e8ef	made side and loaders visible to user ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-15 12:46:23 +03:00
Trial97	ab725eeb18	corected side and added loaders ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-15 11:52:28 +03:00
Trial97	023b3e3c39	Fixed arch build ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-14 09:41:04 +03:00
Tayou	7015b8f7b2	Merge pull request #1563 from Trial97/modrinth_pack ... Pack import fixes and improvements	2023-10-13 16:38:37 +02:00
Trial97	32eaaa25d9	removed the better release for modrinth modpacks ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-13 00:04:36 +03:00
Hazel	e66c3b9419	Add game category to generated Linux shortcuts ... Signed-off-by: Hazel <hazel@theopensource.company>	2023-10-11 23:19:14 +02:00
Trial97	5d56ac7cf2	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip	2023-10-10 21:15:31 +03:00
Trial97	5f7513d61c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-10 19:49:40 +03:00
Trial97	0b6373e4df	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-10 19:46:27 +03:00
Alexandru Ionut Tripon	ca4b58d5d7	Merge pull request #1405 from Trial97/update_file ... Allow updating managed packs from local file	2023-10-10 16:17:08 +01:00
Alexandru Ionut Tripon	4eb8db16f1	Merge pull request #1543 from Trial97/packwiz ... refactor packwiz file write	2023-10-10 16:16:57 +01:00
Alexandru Ionut Tripon	a7842ecc33	Merge pull request #1591 from Trial97/ftb_import_fix ... fix: make cached instead of file for ftb pack import	2023-10-10 16:16:40 +01:00
Alexandru Ionut Tripon	6150908025	Merge pull request #1658 from Trial97/neoforge_version ... Added version check for neoforge filter	2023-10-10 16:16:21 +01:00
Trial97	5cb6d93136	fixed updater build ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-09 22:25:45 +03:00
Trial97	7e6a08548d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater	2023-10-09 19:58:43 +03:00
Trial97	8dd640819d	removed processEvents from ConcurrentTask ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-09 01:50:14 +03:00
Trial97	47dbb09115	Improvements to concurrent task ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-07 00:21:40 +03:00
Trial97	dc74ea7382	fixed wrong account selection ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-06 19:27:26 +03:00
Trial97	8d0a53273f	Add no_color env variable ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-06 18:42:54 +03:00
Alexandru Ionut Tripon	bca5e8f395	Update launcher/minecraft/PackProfile.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-10-06 16:16:03 +03:00
TheKodeToad	d49f81d132	Drop leftover mod loader settings ... I messed up the merge. Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-06 11:27:04 +01:00
Trial97	82461b1113	rename for windows ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-06 08:51:45 +03:00
Trial97	4f1ee85424	check for minecraft java runtime ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-06 00:21:37 +03:00
nea	c6c17036e3	Add more Java installation dirs ... Signed-off-by: nea <nea@nea.moe>	2023-10-04 21:20:59 +02:00
Trial97	e913f61305	added a more strict condition for neoforge forge support ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-04 19:29:37 +03:00
Tayou	024c474658	Merge pull request #1678 from Trial97/release_order ... fixed quilt dependencies	2023-10-04 10:28:45 +02:00
Sefa Eyeoglu	03ad430699	Merge pull request #1537 from Trial97/warnings	2023-10-04 09:40:38 +02:00
Trial97	ac38585a2a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into release_order	2023-10-04 09:41:49 +03:00
Trial97	3cba5adb5a	updated dependency cycle ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-04 09:41:40 +03:00
Sefa Eyeoglu	d186c34385	Merge pull request #1676 from Trial97/release_order ... revert back the release order	2023-10-04 07:43:21 +02:00
Trial97	77979b4c95	revert back the release order ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-03 17:23:26 +03:00
Trial97	8069de29b2	fix folder attributes on windows copy ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-02 21:53:08 +03:00
Tayou	540fc7d2a8	Merge pull request #1670 from Trial97/seg_fault ... Don't update mods if no mod loader is installed	2023-10-02 17:05:07 +02:00
Sefa Eyeoglu	d612ab94a7	Merge pull request #1672 from Trial97/skin_refresh ... refresh default account when list changes	2023-10-02 16:06:12 +02:00
Sefa Eyeoglu	bfa9613373	Merge pull request #1657 from Trial97/shader_txt	2023-10-02 11:56:50 +02:00
Trial97	93be8b0735	refresh default account when list changes ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-02 09:13:02 +03:00
Trial97	2cea7454ef	fix: do not update mods if no mod loader is selected ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-01 23:04:19 +03:00
cullvox	87f34f07d7	Merge branch 'develop' into components-resource-pack-fix ... Signed-off-by: cullvox <68567525+cadenmiller@users.noreply.github.com>	2023-10-01 11:58:44 -04:00
Sefa Eyeoglu	eab1180f68	Merge pull request #1090 from Ryex/feat/acknowledge_release_type	2023-10-01 14:32:58 +02:00
Sefa Eyeoglu	e3a147f56d	Merge pull request #1656 from Trial97/remove_mojang2	2023-10-01 14:32:42 +02:00
Alexandru Ionut Tripon	317c7b5544	Update launcher/minecraft/auth/AccountList.cpp ... Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-10-01 00:32:17 +03:00
Alexandru Ionut Tripon	00bbbdc6e9	Update launcher/LaunchController.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-10-01 00:31:51 +03:00
Trial97	2e4fcd6aa3	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 23:26:15 +03:00
Trial97	09a10a916b	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 23:23:42 +03:00
Trial97	34294383eb	added version type to dep update ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 23:18:23 +03:00
Trial97	4802f6950e	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 23:06:18 +03:00
Sefa Eyeoglu	531b58093e	Merge pull request #1263 from Trial97/develop	2023-09-28 22:03:14 +02:00
Sefa Eyeoglu	2ff9ef0620	Merge pull request #1363 from Trial97/download_threads	2023-09-28 22:02:57 +02:00
Trial97	5b7c5607a9	removed flame consturctor ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 22:53:40 +03:00
Trial97	9acbf98f94	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 22:50:12 +03:00
Trial97	bef701eba8	chaged folder again ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 21:27:11 +03:00
Trial97	742384909f	updated portable update ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 21:24:31 +03:00
Trial97	606c12ffeb	more fixing ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 18:47:21 +03:00
Trial97	498c9db1ce	fixed appImageUpdate ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 15:14:59 +03:00
Sefa Eyeoglu	59e565ef96	Merge pull request #1643 from bolli24/develop	2023-09-27 17:34:32 +02:00
seth	f370f0d749	chore: cleanup a few more mentions of mojang accounts ... Signed-off-by: seth <getchoo@tuta.io>	2023-09-27 05:34:48 -04:00
Trial97	b8d9c3d779	format ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-26 20:19:35 +03:00
Trial97	ebde563648	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater	2023-09-26 20:16:46 +03:00
Trial97	4ee6a6711d	Added version check for neoforge filter ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-25 23:04:21 +03:00
Trial97	86b47b3421	Do not display invalid shaders ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-25 22:33:36 +03:00
Trial97	7c636d4608	Removed mojang ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-25 17:44:04 +03:00
alexia	1684cff7ac	Update links to Minecraft Wiki ... Minecraft Wiki has officially moved from Fandom to their own wiki. I updated some links I found in comments. Signed-off-by: alexia <me@alexia.lol>	2023-09-25 15:49:12 +02:00
bolli24	14af7044be	Update launcher/ui/dialogs/ModUpdateDialog.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: bolli24 <9805065+bolli24@users.noreply.github.com>	2023-09-24 03:01:47 +02:00
Evan Goode	aa589701ed	Automatically install authlib-injector when missing ... Add MissingAuthlibInjectorBehavior setting to control this behavior Signed-off-by: Evan Goode <mail@evangoo.de>	2023-09-23 18:53:14 -04:00
bolli24	f3c089792a	Skip folders when updating mods. ... Previously the mod updater would fail, reporting "The mod updater was aborted!", when trying to update a folder. Signed-off-by: bolli24 <4827765-bolli24@users.noreply.gitlab.com>	2023-09-22 21:36:19 +02:00
Alexandru Ionut Tripon	81a3ba18bc	Update launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-09-20 18:45:23 +03:00
Trial97	a49851cb40	updated blocked mods with empty hash ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-19 15:48:12 +03:00
Sefa Eyeoglu	00af385619	Merge pull request #1572 from Trial97/catpacks2	2023-09-16 18:22:13 +02:00
Sefa Eyeoglu	bf6dc10f35	Merge pull request #1605 from TheKodeToad/flame-shaders	2023-09-16 18:20:45 +02:00
Trial97	0e41ceffc4	removed missed header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-16 19:18:58 +03:00
Trial97	01e98a6ce8	simplify the raw json parsing ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com> Fixed Tests Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-16 19:12:09 +03:00
cullvox	4053229544	DCO Remediation Commit for cullvox <cullvox@outlook.com> ... I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: c81689d393 Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-15 20:55:34 -04:00
cullvox	07645984b5	Merge branch 'components-resource-pack-fix' of https://github.com/cadenmiller/PrismLauncher into components-resource-pack-fix	2023-09-15 20:41:27 -04:00
cullvox	c81689d393	fixes html elide issue with InfoFrame	2023-09-15 20:41:21 -04:00
cullvox	e96d0b6caf	DCO Remediation Commit for cullvox <cullvox@outlook.com> ... I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: ee7016fa54 Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-13 14:31:04 -04:00
cullvox	e1dda6c005	DCO Remediation Commit for cullvox <cullvox@outlook.com> ... I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: ddf0c28b1b Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-12 21:50:33 -04:00
cullvox	ddf0c28b1b	clang-format fixes	2023-09-12 21:45:29 -04:00
cullvox	a4e6530513	added tests, fixed issues with overriding/format ... In the documentation it states that child values can override the parent values. Originally this code did not support that but now it does. Also added in testing inspired by the previous tests. Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-12 21:34:42 -04:00
cullvox	df88ccd419	clean up and add review suggestions, links open ... Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-11 15:49:01 -04:00
cullvox	b16085f66c	attempt to fix clang-format and ubuntu build. ... Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-11 02:05:05 -04:00
cullvox	fbe4043651	fix formatting and add more proper errors. ... Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-11 01:34:53 -04:00
cullvox	58bd6d929f	added formatting with colors. ... This is somewhat dirty implementation and I will clean it up soon. Using the HTML rich text features of Qt, made it much easier to understand what was needed. Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-10 23:37:26 -04:00
Trial97	9445a555e4	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packwiz ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-10 16:24:59 +03:00
Trial97	47d1f23568	added side for modrinth mods ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-10 16:22:57 +03:00
cullvox	7a7c3015f4	fix not properly reading json text. ... The text now displays properly in the GUI of Prism. Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-09 20:25:49 -04:00
cullvox	1261908ef7	remove space for clang-format ... Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-09 19:55:55 -04:00
cullvox	ef1dc2afac	DCO Remediation Commit for cullvox <cullvox@outlook.com> ... I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: 05f4214cc5 Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-09 19:50:59 -04:00
cullvox	05f4214cc5	fix clang-format failing	2023-09-09 19:50:13 -04:00
cullvox	04aa0155bf	DCO Remediation Commit for cullvox <cullvox@outlook.com> ... I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: d2e662ddbb Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-09 19:45:30 -04:00
cullvox	093d09efe3	fix style, and use qWarning instead of throw. ... Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-09 19:03:33 -04:00
cullvox	d2e662ddbb	added support for components in resource pack descriptions. ... Signed-off-by: Caden Miller <me@cadenmiller.dev>	2023-09-09 12:35:34 -04:00
Trial97	6ec1cf6e49	made skin upload more generic ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-08 19:50:46 +03:00
emanueljg	a9e02ff4d6	fix Nix wrapper using wrong JAVA_PATHS env var	2023-09-06 21:11:56 +02:00
fn2006	ca5574130f	Only check migration eligibility for Mojang accounts	2023-09-05 21:47:37 +01:00
Trial97	8c8e4329d7	fix codeql ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-05 23:45:32 +03:00
fn2006	0c2c98f289	Remove DRM from authlib-injector accounts	2023-09-05 21:32:15 +01:00
Trial97	8bad255a91	added more import options ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-05 20:13:16 +03:00
Evan Goode	a980b4d537	Clean up authlib-injector merge, mostly clang-format ... Signed-off-by: Evan Goode <mail@evangoo.de>	2023-09-05 00:13:50 -04:00
Evan Goode	afe33b9de5	Make 'SuggestAuthlibInjector' setting actually have an effect; clang-format ... Signed-off-by: Evan Goode <mail@evangoo.de>	2023-09-04 23:57:33 -04:00
Trial97	ab648e58ce	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector	2023-09-05 00:18:45 +03:00
Trial97	c86b8b0f70	added skin manage dialog ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-05 00:18:36 +03:00
Evan Goode	9d442a0348	authlib-injector ... * 'Custom Yggdrasil' AccountType Signed-off-by: Evan Goode <mail@evangoo.de> * Allow multiple accounts with the same player UUID Signed-off-by: Evan Goode <mail@evangoo.de> * Use correct services server URL for SkinDelete Signed-off-by: Evan Goode <mail@evangoo.de> * Correctly use CustomYggdrasilRefresh, add warning message Signed-off-by: Evan Goode <mail@evangoo.de> * Custom Yggdrasil: Readability fixes Also made the MinecraftEntitlement for Custom Yggdrasil accounts work just like offline accounts---instead of checking the reply from the auth server, Custom Yggdrasil accounts are granted canPlayMinecraft and ownsMinecraft when they are created, in MinecraftAccount.cpp. Signed-off-by: Evan Goode <mail@evangoo.de> * Custom Yggdrasil: Add extra confirmation dialog Signed-off-by: Evan Goode <mail@evangoo.de> * Add install authlib-injector button Signed-off-by: Evan Goode <mail@evangoo.de> * authlib-injector accounts Signed-off-by: Evan Goode <mail@evangoo.de> * Suggest installing authlib-injector when needed Signed-off-by: Evan Goode <mail@evangoo.de> * Use Unmojang metadata Signed-off-by: Evan Goode <mail@evangoo.de> * Use std::string for MANAGED_AGENTS, not QString --------- Signed-off-by: Evan Goode <mail@evangoo.de> Resolve X-Authlib-Injector-API-Location Signed-off-by: Evan Goode <mail@evangoo.de> Prefetch authlib-injector metadata Resolves https://github.com/unmojang/PrismLauncher/issues/4 See https://github-com.translate.goog/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83?_x_tr_sl=auto&_x_tr_tl=en&_x_tr_hl=en-US#%E9%85%8D%E7%BD%AE%E9%A2%84%E8%8E%B7%E5%8F%96 Signed-off-by: Evan Goode <mail@evangoo.de> drag-and-drop authlib-injector URL, clang-format Resolves https://github.com/unmojang/PrismLauncher/issues/2 Signed-off-by: Evan Goode <mail@evangoo.de>	2023-09-04 19:00:18 +01:00
Sefa Eyeoglu	d483b613b1	Merge pull request #1578 from TheKodeToad/antialiasing	2023-09-04 17:05:29 +02:00
Sefa Eyeoglu	546d49e183	Merge pull request #1530 from Trial97/metadata_delete	2023-09-04 17:02:52 +02:00
TheKodeToad	94c1cd6bcf	CurseForge shader downloading ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-09-04 14:15:37 +01:00
fn2006	65821b54e6	Remove current Ely.by implementation	2023-09-04 01:35:37 +01:00
fn2006	be1d2a6070	Merge remote-tracking branch 'upstream/develop' into develop	2023-09-04 00:45:11 +01:00
fn2006	70e6f323fe	fix regressions	2023-09-04 00:43:23 +01:00
fn2006	b6904ba50a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-09-04 00:39:20 +01:00
TheKodeToad	347228a246	Legacy settings override default -> false ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-09-02 22:29:26 +01:00
TheKodeToad	1213a5ab46	Merge remote-tracking branch 'upstream/develop' into skinfix ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-09-02 22:27:57 +01:00
Trial97	9ad029e028	added skins directory ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 23:10:33 +03:00
Trial97	abbac5c26c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 22:28:59 +03:00
Trial97	17f696bffc	small tweaks to atl icons ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 22:25:15 +03:00
Trial97	e095780cc3	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into modrinth_pack ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 21:36:28 +03:00
Trial97	609eaa67ab	refactored skin apis ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 21:23:51 +03:00
Trial97	30ff417074	fix: make cached instead of file for ftb pack import ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 16:25:49 +03:00
Trial97	c2b03d0f71	Fully reload the instance list once the folder is changed ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-31 20:35:56 +03:00
TheKodeToad	25ce11d85d	Merge pull request #1539 from Trial97/refactor_modpack_ux ... Improvements to modpack UX	2023-08-31 14:58:54 +01:00
TheKodeToad	befa3baa6a	Merge branch 'develop' into feat/launcher-updater ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-30 11:47:33 +01:00
TheKodeToad	f23a8e4b4b	Enable antialiasing for mod and pack icons ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-29 23:34:19 +01:00
TheKodeToad	8c30cb3706	Fix CI ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-29 13:27:06 +01:00
TheKodeToad	c1855c6ce3	Merge branch 'develop' into rename-groups ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-29 12:41:40 +01:00
TheKodeToad	0e67686295	Hide index folder in pack export dialog ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-28 17:25:07 +01:00
TheKodeToad	e98bca4749	Fix cancelling pack save ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-28 17:09:40 +01:00
Trial97	211865a1e1	handle gracefully the upload abort ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-28 13:31:19 +03:00
Sefa Eyeoglu	fbf6833124	Merge pull request #1519 from TheKodeToad/better-export-pack	2023-08-28 10:29:32 +02:00
Trial97	5d70f4dbca	removed if ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-28 08:50:10 +03:00
Trial97	07d8598638	added catpacks tests ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-27 23:40:32 +03:00
Trial97	79652799bd	Made text smaller ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-27 21:30:46 +03:00
Trial97	630145a1d0	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background	2023-08-27 21:03:21 +03:00
Trial97	0680d2dceb	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-27 20:41:56 +03:00
TheKodeToad	9110fbf282	Merge pull request #1560 from Trial97/curse_multiple_loaders2 ... Add suport for flame multiple loaders	2023-08-27 18:21:14 +01:00
TheKodeToad	e3b04d10cf	Merge pull request #1536 from Trial97/time3 ... Allow showing playtime in hours	2023-08-27 18:14:04 +01:00
Trial97	8c607ae734	removed extra if ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-27 20:02:12 +03:00
Trial97	c5aac24a93	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse_multiple_loaders2 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-27 15:53:35 +03:00
Trial97	4036cecfc0	Added progress widget to some modpack providers ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-27 15:04:42 +03:00
Sefa Eyeoglu	df14f88307	Merge pull request #1532 from Trial97/curseforge-url-handle	2023-08-27 12:26:57 +02:00
TheKodeToad	479335dfe0	Rewrite optional mod dialog ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-27 00:50:33 +01:00
TheKodeToad	d1566f2610	Merge branch 'develop' into env-vars ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-26 23:12:02 +01:00
Trial97	a2d44744fe	do not update the metadata if mod is invalid ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-26 23:36:46 +03:00
Trial97	288d0d1fd4	Added back api loader filtering if just one is selected ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-26 22:26:01 +03:00
Trial97	abfd1a4205	minor dependency crash fix ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-25 18:35:25 +03:00
Trial97	c54fecf5d9	added condition for empty loader type ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-25 09:05:04 +03:00
Trial97	172680abf8	removed aditional header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-24 13:42:36 +03:00
Trial97	5f3e9672cd	made the loaders check more generic ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-24 13:31:57 +03:00
Trial97	f897b14e3e	changed technic icon name retrival ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-24 13:05:27 +03:00
Trial97	bb4b89470d	fixed icon importing ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-24 12:46:23 +03:00
Trial97	2990c5d0c9	Added optional mods dialog ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-24 12:44:11 +03:00
Trial97	ea384d59fb	use qt separtor for file path ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-24 12:41:37 +03:00
Trial97	6c0492c0d1	return 0 for any ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 21:09:32 +03:00
Trial97	1515607060	updated getMappedModLoader ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 20:16:51 +03:00
Sefa Eyeoglu	85c23b26de	chore: reformat ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-23 13:46:23 +02:00
Trial97	6178e5a975	reverted change for optional ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 13:55:38 +03:00
Trial97	aa065f2b51	Updated dependency resolution ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 13:28:23 +03:00
Sefa Eyeoglu	2283498ccb	Merge pull request #1552 from Trial97/memory_quick_setup	2023-08-23 11:56:53 +02:00
Trial97	e6ba2f4970	Added loaders check on versions load ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 12:52:51 +03:00
Trial97	f8f9ffa118	added loaders for flame version ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 11:33:45 +03:00
Trial97	4704c522e0	moved modloaderTypes to ModPlatform ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 10:26:57 +03:00
TheKodeToad	f7951f6082	Merge pull request #1548 from Trial97/version_label ... Reset status label when deleting instance	2023-08-22 15:14:02 +01:00
Alexandru Ionut Tripon	eed7e996da	Update launcher/ui/widgets/JavaSettingsWidget.cpp ... Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-08-22 16:17:05 +03:00
Alexandru Ionut Tripon	06dbd381f8	Update launcher/ui/pages/instance/InstanceSettingsPage.cpp ... Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-08-22 16:16:57 +03:00
Alexandru Ionut Tripon	3574d89e0f	Update launcher/ui/pages/global/JavaPage.cpp ... Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-08-22 16:16:50 +03:00
TheKodeToad	0e96111116	Merge pull request #1556 from Trial97/metacache ... Gracefully handle invalid cache metadata	2023-08-22 14:09:44 +01:00
Trial97	09aca7a0b5	Added warning to settings page ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-22 10:52:35 +03:00
Sefa Eyeoglu	b1783d8fb1	Merge pull request #1557 from Trial97/curse_crash	2023-08-21 23:04:45 +02:00
Trial97	c3d03f0c33	added check for valid query items in curse url install ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 22:20:33 +03:00
Trial97	7acfe36a62	fixed httpmetacache load ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 21:30:44 +03:00
Trial97	bf810053b7	updated instance copy ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 17:54:16 +03:00
Trial97	45dad27a6d	fixed check ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 17:46:50 +03:00
TheKodeToad	fff378b643	Merge pull request #1553 from TheKodeToad/list-fixes ... A few boring list-related fixes	2023-08-21 15:33:16 +01:00
TheKodeToad	d7dadabfbf	List fixes ... Double-click to toggle profile components. Restore double-click to toggle resources. Fix clicking on checkbox to select account. Double-click to select account. Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-21 14:44:46 +01:00
Trial97	1eb75b6852	fixed build ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 15:34:45 +03:00
Trial97	492bf373c6	updated memory allocation on quick setup ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 15:00:11 +03:00
Trial97	02264f67f3	Fixed codeql ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 14:15:51 +03:00
Danny Dorazio	3638fc0a7d	Update “Welcome” message on account list page	2023-08-20 23:00:50 -04:00
Danny Dorazio	8092c321a9	Replace instances of “Minecraft account”	2023-08-20 23:00:25 -04:00
Trial97	8e5be6f420	added suport for atlauncher browser download ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 00:09:46 +03:00
Trial97	19316e22b4	fixed status label after instance remove ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-20 22:46:44 +03:00
Trial97	254444470f	renamed enum type ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-20 16:40:58 +03:00
Sefa Eyeoglu	5b4dcae7d9	Revert "feat: add toggle for quilt beacon" ... This reverts commit 89aaedc06c. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-20 13:23:11 +02:00
Sefa Eyeoglu	963627fe98	Revert "chore: better explain quilt loader beacon" ... This reverts commit a2a09ffe01. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-20 13:23:08 +02:00
TheKodeToad	ebbc8838a8	Merge pull request #1541 from Trial97/neoforge_search ... feat:neoforge can download forge mods	2023-08-19 23:10:56 +01:00
Trial97	d25e89a4c1	refactor packwiz file write ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-20 00:48:46 +03:00
TheKodeToad	f99b04bd16	Merge pull request #1320 from TheKodeToad/better-launch ... Combine launch buttons in instance window, persist profiler	2023-08-19 11:08:02 +01:00
Sefa Eyeoglu	acf586ef82	chore: add fixme about UI code in Minecraftinstance ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-19 10:21:46 +02:00
Trial97	0138cd65cb	feat:neoforge can download forge mods ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-19 09:00:59 +03:00
Trial97	ab6301d5a1	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-08-19 00:38:40 +03:00
Sefa Eyeoglu	3098aecf97	Merge pull request #1498 from Scrumplex/neoforge	2023-08-18 22:56:55 +02:00
Trial97	05094b7382	more fixes ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 22:24:30 +03:00
Trial97	58efd3e9e2	fixed code scaning ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 21:43:57 +03:00
Trial97	4c52b18bdd	replaced removeFirst with mid ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 20:19:51 +03:00
Trial97	44ff247f5f	feat:refactored modpack ux ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 20:03:02 +03:00
Trial97	fecc1e087a	Add Trial97 to contribuitors list ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 13:35:50 +03:00
Trial97	d3acac16e6	added -Wno-gnu-zero-variadic-macro-arguments and fixed more warnings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 13:10:13 +03:00
Alexandru Ionut Tripon	28ffa8bf44	Update launcher/ui/pages/global/MinecraftPage.ui ... Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-08-18 12:57:08 +03:00
Trial97	6d1c67663d	feat:added option to show playtime in hours ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 12:24:28 +03:00
Sefa Eyeoglu	f4ebeedc21	fix: fix browse button size in skin upload dialog ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-18 09:01:57 +02:00
Trial97	907c2fd19c	added missing header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 09:16:17 +03:00
Sefa Eyeoglu	be2888d6fb	chore: reformat ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-17 22:23:50 +02:00
Trial97	7ab391904a	Flame support for neoforge ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-17 22:23:34 +02:00
Sefa Eyeoglu	aac734d174	fix: add theoretical support for NeoForge in FTB modpacks ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-17 22:21:12 +02:00
TheKodeToad	ffd8ed550f	Reformat ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-17 18:53:32 +01:00
Trial97	c5bac475e8	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-08-17 17:29:57 +03:00
Sefa Eyeoglu	e88418ab7f	Merge pull request #1392 from Scrumplex/feat-native-override	2023-08-17 16:09:16 +02:00
Trial97	42b06674bb	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-17 15:29:11 +03:00
Trial97	bc0934a19c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle	2023-08-17 15:25:32 +03:00
Trial97	044ce4df32	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file	2023-08-17 15:24:14 +03:00
Trial97	758999fa64	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background	2023-08-17 15:23:22 +03:00
Trial97	71fd02e50e	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry	2023-08-17 15:22:45 +03:00
Trial97	4a1d85f999	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-08-17 14:23:37 +03:00
TheKodeToad	6da2e7d3f6	I was forced ... /j Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-17 10:12:38 +01:00
Sefa Eyeoglu	85f36ebed7	Merge pull request #981 from Ryex/curseforge-url-handle	2023-08-17 09:24:35 +02:00
Trial97	f8ffb14619	Merge branch 'curseforge-url-handle' of github.com:Trial97/PrismLauncher into curseforge-url-handle	2023-08-17 00:25:38 +03:00
Trial97	5e2d1ffdfb	removed line ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-17 00:23:53 +03:00
TheKodeToad	3e2733d840	Merge branch 'develop' into better-launch ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-16 22:23:38 +01:00
Trial97	bad44ea264	feat:added flame install mod metadata ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-17 00:14:49 +03:00
Trial97	f0da16a758	removed line ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-17 00:13:12 +03:00
Trial97	b0e197de38	removed warning for one mod selected ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-16 21:26:43 +03:00
Alexandru Ionut Tripon	6c2c724bd9	Update launcher/ui/pages/instance/ExternalResourcesPage.ui ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-08-16 21:03:09 +03:00
Trial97	f919d363b7	made safe for vegetarians ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-16 20:02:32 +03:00
Trial97	589d8b6923	feat:Added remove metadata button ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-16 19:53:39 +03:00
Trial97	8fbc665acb	Added UserData as another posible path for portable builds ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-16 18:28:46 +03:00
TheKodeToad	f3baa420b2	Fix broken tab order ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-16 13:45:22 +01:00
TheKodeToad	8778313170	Merge remote-tracking branch 'upstream/develop' into feature/java-downloader ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-16 13:39:14 +01:00
Trial97	c41c39b5d8	cleanup the mod name checking ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 23:55:09 +03:00
Trial97	fa164aa081	rename to GenericProfiler ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 22:18:28 +03:00
Trial97	f7f7bc6865	Removed update disabled warning ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 20:52:17 +03:00
Trial97	c28d9161cf	added unused ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 18:54:22 +03:00
Trial97	748a644e2c	added wait profiler ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 18:50:32 +03:00
Trial97	c22eec8f27	fixed crash on atlauncher pack install ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 17:03:51 +03:00
Trial97	1faf741004	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 13:29:42 +03:00
TheKodeToad	8cff7c4de6	Merge branch 'develop' into rename-groups ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-15 11:03:19 +01:00
Trial97	38d92bbcf1	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 12:59:25 +03:00
Trial97	42a6c670c7	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 12:52:59 +03:00
Trial97	cf27d2f9ab	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 12:49:21 +03:00
Trial97	6c362afc21	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 12:41:46 +03:00
Trial97	c94ee67077	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 12:16:00 +03:00
Sefa Eyeoglu	62c14cea2a	fix: allow NeoForge in resource APIs ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 11:06:14 +02:00
Sefa Eyeoglu	01c3750835	feat: support NeoForge mrpack modpacks ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 11:06:14 +02:00
Sefa Eyeoglu	52e5ee7111	feat: add NeoForge to UIs ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 11:06:14 +02:00
Sefa Eyeoglu	3a0aa353cc	feat: add NeoForge to ModLoaderType ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 11:06:13 +02:00
Sefa Eyeoglu	8f5bb982cd	Merge pull request #1513 from lumiscosity/fix/skin_transparency_bug	2023-08-15 10:54:07 +02:00
Sefa Eyeoglu	a360ddbe0b	Merge pull request #1508 from comp500/fix/allow-empty-lines	2023-08-15 10:53:43 +02:00
Sefa Eyeoglu	06aba530d7	fix: add missing header ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 10:52:40 +02:00
Sefa Eyeoglu	c2d6a137ab	fix: only add native library overrides if files exist ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 10:52:08 +02:00
Sefa Eyeoglu	b927e58126	fix: improve debug message ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 10:52:08 +02:00
Sefa Eyeoglu	4c446ccd50	fix: remove meta OpenAL workaround ... LWJGL 2 doesn't have a separate zip for OpenAL. So there is no reason for this code. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 10:51:48 +02:00
Sefa Eyeoglu	83aa0062c7	feat: add custom native library path settings ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 10:51:21 +02:00
Sefa Eyeoglu	ff67fd10c3	feat: implement override for GLFW/OpenAL with split natives ... Fixes PrismLauncher/PrismLauncher#513 Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 10:50:38 +02:00
Sefa Eyeoglu	7ba1e7d356	Merge pull request #1407 from TheKodeToad/icon-indexing	2023-08-15 10:43:29 +02:00
Sefa Eyeoglu	f533173b95	Merge pull request #1516 from Trial97/abort_connect	2023-08-15 10:40:12 +02:00
Sefa Eyeoglu	6ce7e426d2	chore: reformat ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 10:38:04 +02:00
Sefa Eyeoglu	1939e3e6ed	chore: reformat ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 09:02:15 +02:00
Trial97	9546c77113	Some warnings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 00:52:34 +03:00
Trial97	0ba88ff138	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into staging ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 00:33:24 +03:00
Sefa Eyeoglu	215d7dbb74	chore: update license headers ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-14 18:17:05 +02:00
Sefa Eyeoglu	91ba4cf75e	chore: reformat ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-14 18:16:53 +02:00
Sefa Eyeoglu	779f70057b	Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging	2023-08-14 18:16:13 +02:00
TheKodeToad	6d070e8607	"Format" ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-12 21:50:02 +01:00
TheKodeToad	983c943eef	Merge branch 'develop' into quick-play ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-12 21:48:41 +01:00
TheKodeToad	5056a51c18	Improvements and refinements to pack export ... - Persist fields - Toggle optional files Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-12 21:20:51 +01:00
TheKodeToad	3c209ba502	theme -> catpacks ... Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com> Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-12 19:04:34 +01:00
Trial97	71890707c0	format and apply the sugestion ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-12 13:08:39 +03:00
Alexandru Ionut Tripon	b3b2e9df35	Merge branch 'develop' into feat/acknowledge_release_type ... Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-08-12 12:42:30 +03:00
Sefa Eyeoglu	35358f8180	Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings	2023-08-12 11:17:11 +02:00
Sefa Eyeoglu	019e5ca3e8	fix: use ApiDownload for CF URL handling ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-12 11:11:58 +02:00
Sefa Eyeoglu	6423edaa76	Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle	2023-08-12 10:58:27 +02:00
fn2006	abcbd4ab4e	fix build	2023-08-11 20:44:14 +01:00
Sefa Eyeoglu	73adac2501	fix: use QColorConstants in Qt 5.14+ ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-11 15:57:12 +02:00
Trial97	d801151d5c	connect the abort signal in concurent task ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-11 15:41:41 +03:00
Sefa Eyeoglu	ea43d0f687	fix: fix more warnings ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-11 10:57:57 +02:00
Sefa Eyeoglu	396f812496	Merge pull request #1230 from TheKodeToad/better-component-installation ... Revamp loader installation UI	2023-08-11 08:24:14 +02:00
TheKodeToad	f6d8c9659c	Rework ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-11 00:39:05 +01:00
TheKodeToad	e2d77f21ba	More system properties because yes!! 🎉 ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-11 00:02:48 +01:00
Sefa Eyeoglu	ef6f9487f4	Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings	2023-08-10 20:38:32 +02:00
Sefa Eyeoglu	8140374e26	chore: add licensing info to loader logos ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-10 20:18:28 +02:00
Sefa Eyeoglu	d67277a668	chore: replace LiteLoader logo with high quality version ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-10 20:18:16 +02:00
maple!	97ef8e8d0e	Fix transparency in skin icon ... QPainter has a bug where drawing transparency to a freshly initialized, empty QPixmap causes garbage data to be drawn. This broke the rendering of the skin icon. The fix is simply to fill the QPixmap with empty transparent pixels beforehand. Signed-off-by: maple! <averyrudelphe@gmail.com>	2023-08-10 15:32:47 +02:00
Sefa Eyeoglu	2090f958c8	Merge pull request #1324 from leia-uwu/ui-tweaks	2023-08-10 12:24:41 +02:00
Sefa Eyeoglu	8731f4ba27	chore: add comment about _kde_side_panel_view ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-10 12:24:33 +02:00
Trial97	b3da35be74	Fixed curseforge import ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-10 12:19:38 +03:00
fn2006	847430b113	Merge branch 'release-7.x' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-08-10 10:09:08 +01:00
comp500	1c3449e5a2	Remove unnecessary #if ... Signed-off-by: comp500 <comp500@users.noreply.github.com>	2023-08-09 23:04:44 +01:00
comp500	a351d1834a	Allow empty lines in log output ... Preserving empty lines in the game log ensures that crash reports and debugging information has necessary whitespace - the previous behaviour made crash reports hard to read. Signed-off-by: comp500 <comp500@users.noreply.github.com>	2023-08-09 20:48:02 +01:00
TheKodeToad	e079cbb055	Fix actions ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-07 13:51:26 +01:00
Tayou	9afa7cc91f	Merge branch 'develop' into icon-indexing ... Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>	2023-08-07 10:32:38 +02:00
Sefa Eyeoglu	74fe2fb2a6	Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle	2023-08-06 21:54:00 +02:00
Sefa Eyeoglu	a83e5be8f2	fix: makeShared for QByteArray ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-06 21:51:03 +02:00
seth	efaf4024ab	Merge pull request #1464 from Ryex/fix/windows-console-attach ... [Windows] Fix attaching logs to console	2023-08-06 15:37:44 -04:00
Sefa Eyeoglu	99fd1e622c	chore: replace fabricmc icons with SVG ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-06 17:46:33 +02:00
Trial97	f7e8ec1855	format files ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-05 21:17:38 +03:00
Trial97	72de2d5254	Added missing header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-05 21:08:16 +03:00
TheKodeToad	f25d0a4e0e	Merge branch 'develop' into env-vars ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-05 18:01:53 +01:00
Trial97	1d3f2674d1	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-05 19:21:37 +03:00
Trial97	f9ebcb5d2e	Merge branch 'refactor/net-split-headers-to-proxy-class' of https://github.com/Ryex/PrismLauncher into refactor/NetActions ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-05 19:16:57 +03:00
Trial97	57692d6ce6	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-05 19:13:08 +03:00
Trial97	b2fdd83594	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-05 19:09:10 +03:00
Trial97	24b47e4ec6	Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into fail_concurrent_task	2023-08-05 19:06:26 +03:00
Trial97	5981e7815a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task	2023-08-05 19:06:01 +03:00
Trial97	91eb30f037	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog	2023-08-05 19:04:53 +03:00
Trial97	d936b25868	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-05 19:04:15 +03:00
Trial97	e7c2274893	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file	2023-08-05 19:02:11 +03:00
Trial97	377fc0352a	Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons	2023-08-05 19:00:12 +03:00
Trial97	939a2d67ed	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-05 18:21:09 +03:00
Sefa Eyeoglu	304e294ea7	Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class	2023-08-04 20:31:43 +02:00
Sefa Eyeoglu	ae793f6cf1	Merge pull request #1459 from Scrumplex/format	2023-08-04 19:42:36 +02:00
Sefa Eyeoglu	1d638e018a	chore: update license headers ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-04 19:41:47 +02:00
TheKodeToad	c5bffed21e	Merge branch 'PrismLauncher:develop' into skinfix	2023-08-04 16:29:30 +01:00
TheKodeToad	d48dd7eb6a	Use override-based setting for online fixes ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-04 16:00:02 +01:00
TheKodeToad	1bafa36c17	icon -> iconName ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-02 20:33:01 +01:00
TheKodeToad	afaf6f894c	Merge branch 'PrismLauncher:develop' into better-component-installation	2023-08-02 20:27:37 +01:00
TheKodeToad	8b3c465a50	Use protected inheritance for BasePageProvider ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-02 20:24:15 +01:00
TheKodeToad	40c614b3a5	Pressed -> Clicked (doh) ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-02 20:23:30 +01:00
Sefa Eyeoglu	fa2b784f7e	Merge branch 'develop' into sparkle-disable ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-02 19:27:48 +02:00
Sefa Eyeoglu	01e17806f6	Merge pull request #1391 from Trial97/prism_export2	2023-08-02 19:27:14 +02:00
Sefa Eyeoglu	f561e7febf	Merge pull request #1476 from Scrumplex/fix-saving-metaurl	2023-08-02 19:24:24 +02:00
Sefa Eyeoglu	39d4f0df66	fix: don't reset meta url on launch ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-02 18:56:54 +02:00
Sefa Eyeoglu	1d468ac35a	chore: reformat ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-02 18:35:35 +02:00
Sefa Eyeoglu	ce2ca13815	fix: add missing headers ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-02 18:35:08 +02:00
Sefa Eyeoglu	9f66f6495a	fix: fix undisciplined multiple inheritance ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-02 18:35:07 +02:00
Sefa Eyeoglu	c07a857359	fix: remove irregular enum initialization ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-02 18:35:07 +02:00
Sefa Eyeoglu	76df836378	fix: simplify switch statement ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-02 18:35:07 +02:00
Sefa Eyeoglu	a545f67a21	fix: take JavaCheckResult by const reference ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-02 18:35:07 +02:00
Sefa Eyeoglu	ea56ff255d	Merge pull request #1339 from TheKodeToad/remove-direct-launch	2023-08-02 18:31:27 +02:00
Sefa Eyeoglu	01d3eea379	Merge pull request #1359 from Trial97/import	2023-08-02 18:25:51 +02:00
Alexandru Ionut Tripon	f13eccb03d	Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h ... Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-08-02 19:24:58 +03:00
Sefa Eyeoglu	39d7bc6c24	Merge pull request #1294 from ashuntu/develop	2023-08-02 18:24:54 +02:00
Rachel Powers	bae59a8c07	refactor(windows console): reduce code duplication ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-08-02 06:19:43 -07:00
TheKodeToad	bb039d4bc7	Merge pull request #1445 from Trial97/curse ... feat: removed flame quilt warning	2023-08-02 12:55:49 +01:00
Apix	16e6a01881	fix: fix copyright year ... Signed-off-by: Apix <apix0n@outlook.com>	2023-08-02 11:35:54 +02:00
Rachel Powers	e64e4d7ef7	Fix: always false comparison ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-08-01 18:57:35 -07:00
Rachel Powers	f19e8dd086	Apply suggestions from code review ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-08-01 18:53:51 -07:00
Rachel Powers	5a9f780cf8	fix(FlameInstanceCreationTask): include Net::Apidownload ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-31 22:36:13 -07:00
Rachel Powers	2d1197f59f	Merge branch 'develop' into refactor/net-split-headers-to-proxy-class ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-31 22:26:20 -07:00
TheKodeToad	b572f75dba	Merge branch 'PrismLauncher:develop' into icon-indexing	2023-07-31 14:40:27 +01:00
Rachel Powers	14e16db01e	refactor(filelink): drop moved funciton ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-30 16:02:37 -07:00
Rachel Powers	7091bc81c2	chore(rename): fix unfinshed renames from deshadow changes ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-30 15:56:38 -07:00
Rachel Powers	1e947ca893	fix(flame creation task): import ApiDownload ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-30 15:42:15 -07:00
Rachel Powers	b9fe37aec1	Merge branch 'develop' into chore/add-compiler-warnings ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-30 15:33:46 -07:00
Rachel Powers	5d68a4c992	fix: religate export zip to launcher app only ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> fix(MMCZip): include QUrl Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> fix(FileLink): drop FreeConsole Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> fix(filelink exe): add console sources Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-30 15:24:50 -07:00
Rachel Powers	760b80934f	fix(filelink exe): add console sources ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-30 15:22:18 -07:00
Rachel Powers	6d564628b7	fix(FileLink): drop FreeConsole ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-30 15:11:00 -07:00
Rachel Powers	f03924478b	Merge branch 'fix/windows-console-attach' into feat/launcher-updater ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> # Conflicts: # launcher/Application.cpp # launcher/CMakeLists.txt # launcher/filelink/FileLink.cpp	2023-07-30 14:30:16 -07:00
Rachel Powers	7c1a465ec9	Merge branch 'develop' into feat/launcher-updater ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-30 14:19:31 -07:00
Rachel Powers	a7ef663735	fix(windows console): use new logic in FileLink exe ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-30 14:03:20 -07:00
Rachel Powers	186211244d	refactor(windows console): move to external file ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-30 13:38:47 -07:00
Rachel Powers	5740ee0444	fix(windows console): properly bind windows console ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-30 13:38:47 -07:00
Sefa Eyeoglu	566425166b	Merge pull request #1449 from Trial97/tehnic ... Reintroduce parsing of INI files	2023-07-30 09:47:40 +02:00
Ash	d133b40b25	Merge branch 'PrismLauncher:develop' into develop	2023-07-28 21:22:35 +00:00
TheKodeToad	5538c1d0af	Fix compilation (actually this time!), incorporating new changes ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-28 15:11:24 +01:00
TheKodeToad	d4ea9c2717	Merge branch 'develop' into feature/java-downloader ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-28 14:50:59 +01:00
TheKodeToad	ce6a36c8b5	Deduplicate fix ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-28 14:31:58 +01:00
Trial97	c3eb17db74	removed unneded if condition ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-28 13:22:04 +03:00
Trial97	4789708cc2	added missing ) ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-28 13:16:57 +03:00
Alexandru Ionut Tripon	83fce74bb1	Update launcher/ui/dialogs/NewInstanceDialog.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-07-28 13:11:56 +03:00
Trial97	fcac98b367	removed comment ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-28 10:05:22 +03:00
Trial97	97ff7afbe7	keep the icon suffix ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-28 08:37:45 +03:00
Trial97	7e58b965b7	refactor icon list ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-28 01:20:05 +03:00
Trial97	1ca7e5efe9	added license header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-28 01:20:05 +03:00
Trial97	d460986de0	format ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-28 01:20:05 +03:00
LostLuma	f326db11f1	Ignore cache files entirely, also apply to modpack export ... Signed-off-by: LostLuma <lilly@lostluma.net> (cherry picked from commit 4a9ea832ff)	2023-07-27 07:40:51 +00:00
LostLuma	f8c6a33134	Address review comments ... Signed-off-by: LostLuma <lilly@lostluma.net> (cherry picked from commit a9fefb2eeb)	2023-07-27 07:40:51 +00:00
LostLuma	64228bdddf	Ignore cache files when exporting instances ... Signed-off-by: LostLuma <lilly@lostluma.net> (cherry picked from commit 361583edfc)	2023-07-27 07:40:51 +00:00
Sefa Eyeoglu	bdec11c501	Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2	2023-07-27 09:40:31 +02:00
Sefa Eyeoglu	b1aa9e5846	refactor: introduce internal Launcher_ENABLE_UPDATER variable ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-07-27 09:37:56 +02:00
seth	51bfda937d	chore: don't include sparkle when not enabled ... Signed-off-by: seth <getchoo@tuta.io>	2023-07-27 02:19:21 -04:00
LostLuma	4a9ea832ff	Ignore cache files entirely, also apply to modpack export ... Signed-off-by: LostLuma <lilly@lostluma.net>	2023-07-27 01:42:14 +02:00
seth	48e5040196	feat: disable sparkle when update url is empty ... Signed-off-by: seth <getchoo@tuta.io>	2023-07-26 19:01:39 -04:00
Trial97	6768501db1	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-27 00:09:18 +03:00
Trial97	62aa7a52c4	fiexed conflicts ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-27 00:07:38 +03:00
Trial97	3c472fd7e0	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2	2023-07-27 00:05:59 +03:00
Trial97	b15f689ccf	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions	2023-07-27 00:03:42 +03:00
Trial97	1e82cb6a7c	fix: add support for QByteArray inifile ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-26 23:56:01 +03:00
Alexandru Ionut Tripon	31b62203a7	Update launcher/ui/MainWindow.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-07-26 23:44:35 +03:00
seth	af59c41713	fix: typo in task.h ... Signed-off-by: seth <getchoo@tuta.io>	2023-07-26 16:20:30 -04:00
Trial97	e6b4fc9182	removed quilt warning ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-26 21:36:40 +03:00
TheKodeToad	719d87de3b	Update MainWindow.ui ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-26 17:21:12 +01:00
TheKodeToad	816acc9c76	Open catpak folder action ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-26 17:19:39 +01:00
LostLuma	a9fefb2eeb	Address review comments ... Signed-off-by: LostLuma <lilly@lostluma.net>	2023-07-26 15:22:22 +02:00
tjw123hh	d9df60368c	Delete some incorrect notr="true" tags ... Signed-off-by: tjw123hh <tjw123hh@outlook.com> (cherry picked from commit 280f041acb)	2023-07-26 14:45:59 +02:00
tjw123hh	29fde6a322	Delete some incorrect tags ... (cherry picked from commit 6a01c277e8)	2023-07-26 14:45:42 +02:00
TheKodeToad	ce2d2c9f32	Merge pull request #1427 from tjw123hh/develop ... Add some missing strings to translations	2023-07-26 13:41:54 +01:00
LostLuma	361583edfc	Ignore cache files when exporting instances ... Signed-off-by: LostLuma <lilly@lostluma.net>	2023-07-26 04:23:01 +02:00
TheKodeToad	071e86fe68	Revert "Revert "feat(Mods): hide 'Provider' column when no mods have providers"" ... This reverts commit 5eb71fc6a9. Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-25 12:27:50 +01:00
tjw123hh	280f041acb	Delete some incorrect notr="true" tags ... Signed-off-by: tjw123hh <tjw123hh@outlook.com>	2023-07-25 17:35:31 +08:00
TheKodeToad	648a69594f	Fix token "0" being replaced ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me> (cherry picked from commit f505d43fc0)	2023-07-24 18:41:43 +00:00
Sefa Eyeoglu	4f00012268	Merge pull request #1426 from TheKodeToad/token-censor-fix	2023-07-24 20:41:23 +02:00
TheKodeToad	f505d43fc0	Fix token "0" being replaced ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-24 13:43:26 +01:00
tjw123hh	6a01c277e8	Delete some incorrect tags	2023-07-24 20:41:22 +08:00
Trial97	b31644e228	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-22 18:16:03 +03:00
TheKodeToad	57430fd189	Merge branch 'develop' into better-launch ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-22 11:26:02 +01:00
TheKodeToad	6ffcfcd7e9	Merge pull request #1402 from Trial97/flame_import ... feat:made flame instace creation use metadata for recommended version	2023-07-22 11:14:12 +01:00
TheKodeToad	516ddb22ae	More catpack changes :3 ... This is just embarrasing Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-22 11:05:58 +01:00
Trial97	0b74b3833a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import	2023-07-21 19:30:06 +03:00
Trial97	ef21879df4	replaced require with ensure for jvmArgs ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-21 19:30:00 +03:00
Trial97	ad92c30472	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-21 19:12:16 +03:00
TheKodeToad	bfafbdc51e	Merge branch 'develop' into env-vars ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-21 14:30:24 +01:00
TheKodeToad	1a7c5693cc	Remove redundant methods ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-21 13:01:01 +01:00
TheKodeToad	f8b935ab37	Merge remote-tracking branch 'upstream/develop' into icon-indexing	2023-07-21 12:48:05 +01:00
TheKodeToad	8705e88e91	Fix build on Windows ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-21 11:19:55 +01:00
TheKodeToad	0be4db30eb	Merge branch 'PrismLauncher:develop' into better-component-installation	2023-07-21 11:02:57 +01:00
TheKodeToad	c37e1fb9f1	Merge branch 'develop' into skinfix ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-20 18:11:27 +01:00
TheKodeToad	5088d33fd2	Finish things :P ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-20 14:17:01 +01:00
TheKodeToad	39f7bea53e	Revert accidental change in MainWindow ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-20 14:13:29 +01:00
TheKodeToad	842f08dcfc	(UX) Add open folder button next to combo boxes ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-20 11:54:15 +01:00
Trial97	f8d9cd9a03	use range for ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-19 23:08:16 +03:00
TheKodeToad	960093700a	Better theme reset ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-19 20:57:08 +01:00
TheKodeToad	54d393632d	Automatically create theme folders, and add an action to open them ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-19 16:29:52 +01:00
TheKodeToad	c633c6d083	Colors->Widgets ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-19 14:19:28 +01:00
TheKodeToad	96ebdfc9a8	Sorting and invalid reset ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-19 14:12:39 +01:00
TheKodeToad	f55120654a	Merge branch 'PrismLauncher:develop' into icon-indexing	2023-07-19 12:51:26 +01:00
TheKodeToad	44ca7c7d22	Licenses ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-19 12:29:51 +01:00
TheKodeToad	58c2059e10	Remove recursion ... It will add icon packs which aren't available - as QIcon's search paths are not recursed! Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-19 10:38:56 +01:00
Trial97	b7bccb9058	removed subdirectory flag ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-19 12:27:02 +03:00
Trial97	f046bd7d50	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks	2023-07-19 12:26:12 +03:00
TheKodeToad	593f452986	Merge pull request #1399 from Scrumplex/offline-uuid ... fix: generate predictable UUIDs for offline accounts	2023-07-19 10:16:27 +01:00
Trial97	43cc04433d	feat: refactored Instance ImportTask ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-19 11:58:27 +03:00
TheKodeToad	97662f5c8e	Multiple icon themes! ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-18 22:51:34 +01:00
Josiah Glosson	862f4fb061	Make Launch Offline not launch online in 1.6+ ... Signed-off-by: Josiah Glosson <soujournme@gmail.com> (cherry picked from commit 1fbb41f5e2)	2023-07-18 21:40:28 +00:00
Trial97	f393aa684e	wait to load metadata ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-18 23:59:43 +03:00
Trial97	4c319c8f4f	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into flame_import	2023-07-18 23:49:52 +03:00
Trial97	477b72ad33	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2	2023-07-18 23:48:02 +03:00
Sefa Eyeoglu	3728cbb62a	Merge pull request #1397 from Gaming32/develop	2023-07-18 22:47:55 +02:00
Trial97	015f88bf83	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-18 23:46:19 +03:00
TheKodeToad	fe1ea7240e	Merge pull request #1334 from TheKodeToad/litemod-dl ... LiteMod downloading	2023-07-18 22:43:35 +02:00
Sefa Eyeoglu	6f1d594f1c	Merge pull request #1128 from pandaninjas/fix-implicit-fallthrough	2023-07-18 22:43:35 +02:00
Trial97	02082cda09	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file	2023-07-18 23:40:11 +03:00
Trial97	5eec0f5901	feat:managed packs can update from file ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-18 23:40:03 +03:00
Trial97	1389b74a8a	fixed warning ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com> (cherry picked from commit 440afcedb0)	2023-07-18 20:28:46 +00:00
Trial97	5aa3aabdf9	insert header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com> (cherry picked from commit b0a21c9389)	2023-07-18 20:28:46 +00:00
Trial97	42d2c7446a	format ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com> (cherry picked from commit fc4a1ef193)	2023-07-18 20:28:46 +00:00
Sefa Eyeoglu	3fbc25155b	Merge pull request #1362 from Trial97/fix_warning	2023-07-18 22:28:27 +02:00
Sefa Eyeoglu	ecac05b2fc	Merge pull request #1378 from Trial97/prism_export ... Added progress bar to Prism instance export	2023-07-18 22:26:56 +02:00
Trial97	391497645f	feat:made flame instace creation use metadata for recommended version ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-18 22:33:39 +03:00
Sefa Eyeoglu	f8fcb98c68	fix: generate predictable UUIDs for offline accounts ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-07-18 10:07:35 +02:00
Josiah Glosson	1fbb41f5e2	Make Launch Offline not launch online in 1.6+ ... Signed-off-by: Josiah Glosson <soujournme@gmail.com>	2023-07-17 17:07:06 -05:00
Sefa Eyeoglu	eaf125c31a	fix: don't take modloaders by reference ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> (cherry picked from commit 2be630904f)	2023-07-17 16:41:05 +00:00
Sefa Eyeoglu	f7e018d41a	fix: check if any modloader is installed ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> (cherry picked from commit 54a091ca59)	2023-07-17 16:41:05 +00:00
TheKodeToad	01afa8957f	Merge pull request #1387 from Scrumplex/fix-quilt-beacon ... Check if any modloader is installed	2023-07-17 17:40:42 +01:00
Trial97	5162203c7d	Merge branch 'prism_export' of github.com:Trial97/PrismLauncher into prism_export2 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-17 17:58:42 +03:00
Trial97	b0940d696b	Added QFutureWatcher ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com> abort forgot Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-17 17:52:00 +03:00
Trial97	fe73d696cb	replace emplace with insert ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-17 17:24:29 +03:00
Trial97	2ea4a78541	Upgraded ExportToZipTask ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-17 17:24:23 +03:00
Trial97	f5891940e0	translate strings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-17 17:22:35 +03:00
Trial97	cd9310afed	replace emplace with insert ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-17 16:57:52 +03:00
Trial97	64041a84a2	handle file removal in ExportToZipTask ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-17 16:55:26 +03:00
Trial97	78ee63af38	simplify modrinth export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-17 16:40:01 +03:00
Trial97	455c495338	simplify flame export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com> s	2023-07-17 16:27:08 +03:00
Trial97	0bf70d677e	Upgraded ExportToZipTask ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-17 16:24:43 +03:00
Sefa Eyeoglu	2be630904f	fix: don't take modloaders by reference ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-07-17 14:33:01 +02:00
TheKodeToad	49cebc2da4	More consistent behaviour ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-17 12:49:12 +01:00
TheKodeToad	049abc9b1a	Merge remote-tracking branch 'upstream/develop' into rename-groups	2023-07-17 12:13:58 +01:00
Tayou	e8c44e700d	Merge pull request #1286 from TayouVR/better-instance-group-separator	2023-07-17 11:55:31 +02:00
Sefa Eyeoglu	54a091ca59	fix: check if any modloader is installed ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-07-17 10:09:01 +02:00
Trial97	ec32618e11	reveted back to add years ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-17 10:20:22 +03:00
seth	cd011a097b	chore: better explain quilt loader beacon ... Signed-off-by: seth <getchoo@tuta.io> (cherry picked from commit a2a09ffe01)	2023-07-17 04:43:06 +00:00
seth	055bcc2721	feat: add toggle for quilt beacon ... Signed-off-by: seth <getchoo@tuta.io> (cherry picked from commit 89aaedc06c)	2023-07-17 04:43:06 +00:00
Sefa Eyeoglu	aaf1726965	Merge pull request #1357 from getchoo/quilt-beacon ... feat: add toggle for quilt beacon	2023-07-17 06:42:46 +02:00
TheKodeToad	fb5aefffb2	Reduce bugginess ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-16 23:36:01 +01:00
TheKodeToad	20e2c70464	Rename groups and janky reference counting map ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-16 23:23:33 +01:00
Sefa Eyeoglu	0d8283df97	feat: print build platform in application log ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> (cherry picked from commit fce000206f)	2023-07-16 21:16:11 +00:00
Sefa Eyeoglu	d4014534eb	feat: print build platform in log ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> (cherry picked from commit f5e4171df4)	2023-07-16 21:16:11 +00:00
Sefa Eyeoglu	3c5ec5d967	chore: remove obsolete macOS warning ... We don't support that macOS version. This check also never worked, as we never set the platform to that value. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> (cherry picked from commit 0aaec9ae4f)	2023-07-16 21:16:11 +00:00
seth	5e0df9b696	Merge pull request #1276 from Scrumplex/print-build-platform ... Print build platform on launch	2023-07-16 17:15:55 -04:00
Alexandru Ionut Tripon	ec41252535	Update launcher/MMCZip.h ... Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-07-16 23:47:54 +03:00
Alexandru Ionut Tripon	4df9df03ab	Update launcher/MMCZip.cpp ... Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-07-16 23:47:47 +03:00
Sefa Eyeoglu	e3625cad91	Merge pull request #1369 from Trial97/autoselect	2023-07-16 20:43:16 +02:00
Tayou	bb945c5165	Merge pull request #1368 from Trial97/crash_curse_import	2023-07-16 20:43:16 +02:00
Rachel Powers	daa5fcce67	Merge pull request #1351 from Trial97/ftb_import ... fixed substatus on ftb_import	2023-07-16 20:43:16 +02:00
seth	2bcebe2989	Merge pull request #1336 from Ryex/packaging/fix-duplicate-share-directories ... packaging: fix duplicate share directories (use only lowercase)	2023-07-16 20:43:15 +02:00
seth	7926170073	Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-place ... fix(flame install): don't assume .zip is a resource pack. default to mod	2023-07-16 20:43:15 +02:00
Rachel Powers	79537f2948	Merge pull request #1352 from Trial97/crash_after_abort ... Do not reset shared pointer if it's already empty	2023-07-16 20:43:15 +02:00
Tayou	2b3021b7c2	Merge pull request #1345 from Trial97/time2 ... feat:Added option to use system locale	2023-07-16 20:43:15 +02:00
Rachel Powers	b11b86e026	Merge pull request #1350 from Trial97/fix_managed_pack_crash ... fixed crash if no version is loaded on managed page	2023-07-16 20:43:15 +02:00
Sefa Eyeoglu	a0ddd85b32	Merge pull request #1333 from Ryex/fix/null_instance_edit_crash	2023-07-16 20:43:15 +02:00
seth	6f86e8b66e	Merge pull request #1331 from TheKodeToad/hungry-trash ... Fix updating trashing resources	2023-07-16 20:43:15 +02:00
Rachel Powers	d9de326f22	Merge pull request #1321 from TheKodeToad/mr-optional ... Optional mods in mrpack export	2023-07-16 20:43:02 +02:00
seth	1d4cf0fd03	Merge pull request #1329 from Ryex/fix/progress_dialog_centering ... fix(progress dialog): if there is a parent center on creation	2023-07-16 20:43:02 +02:00
Rachel Powers	a65e4af365	Merge pull request #1302 from Ryex/fix/progress-dialog-segfault ... fix: segfault in progress dialog	2023-07-16 20:43:02 +02:00
seth	721ac015f3	Merge pull request #1325 from Scrumplex/validate-meta-url ... Validate Meta URL	2023-07-16 20:42:55 +02:00
Sefa Eyeoglu	81757717f7	Merge pull request #1284 from Ryex/fix/properly-track-failed-copies-and-clones	2023-07-16 20:42:48 +02:00
Tayou	7025f75903	Merge pull request #1127 from Trial97/scale_cat	2023-07-16 20:42:48 +02:00
TheKodeToad	3cc68fcea4	Merge pull request #1232 from telans/screenshots-update ... ScreenshotsPage fixes	2023-07-16 20:42:48 +02:00
Sefa Eyeoglu	34be098f12	Merge pull request #1298 from TurboWafflz/develop	2023-07-16 20:42:48 +02:00
seth	fb5655085f	Merge pull request #1292 from Trial97/export5 ... Removed logs from instance export	2023-07-16 20:42:48 +02:00
Sefa Eyeoglu	316ef9b725	Merge pull request #1266 from TheKodeToad/smol-tweaks	2023-07-16 20:42:48 +02:00
seth	5fdbc9d75e	Merge pull request #1280 from Trial97/shortcut ... Fixed illegal characters in shortcuts name	2023-07-16 20:42:48 +02:00
seth	6464127d05	Merge pull request #1281 from Trial97/screenshot ... Added more information to the screenshot upload warning	2023-07-16 20:42:48 +02:00
TheKodeToad	c349eff522	Merge pull request #1277 from Trial97/remove_mojang ... Removed unused files	2023-07-16 20:42:47 +02:00
Sefa Eyeoglu	5fdf73a2ff	Merge pull request #1274 from TheKodeToad/java-signature	2023-07-16 20:42:47 +02:00
Sefa Eyeoglu	a25a5a7c9f	Merge pull request #1065 from leo78913/gamescope-close-button	2023-07-16 20:42:47 +02:00
Sefa Eyeoglu	20e9bf0e11	Merge pull request #1261 from telans/modrinthexport-url	2023-07-16 20:42:26 +02:00
Rachel Powers	21ccf47ea7	Merge pull request #1255 from Trial97/export4 ... Added Thumbs.db to excluded files in MrPackExport	2023-07-16 20:42:26 +02:00
Rachel Powers	6856c2f922	Merge pull request #1259 from PrismLauncher/update-devs ... Update developers	2023-07-16 20:42:26 +02:00
TheKodeToad	e52fd9d4fe	Merge pull request #1256 from Trial97/fix11 ... Fixed hashers	2023-07-16 20:42:25 +02:00
Rachel Powers	05056e1abf	Merge pull request #1200 from Trial97/net_job_crash ... Made ByteSynkArray to use shared_ptr	2023-07-16 20:42:25 +02:00
seth	9df3c5d3c0	Merge pull request #1251 from getchoo/github-clarify ... chore: add 'suggest a feature' message in help	2023-07-16 20:42:25 +02:00
seth	1a4ea3b1cd	Merge pull request #1252 from getchoo/import-hehe ... chore: avoid confusion in file/url import dialog	2023-07-16 20:42:25 +02:00
Tayou	0a7a7d9bfd	Merge pull request #1235 from ChrisLane/java-check-debug-msg-fix	2023-07-16 20:42:25 +02:00
Sefa Eyeoglu	8b017f9a5f	Merge pull request #1243 from Trial97/export ... Added regex expresion to exclude .DS_Store files	2023-07-16 20:42:25 +02:00
TheKodeToad	b1fe4d1d93	Merge pull request #1228 from Trial97/curent_pack_crash ... Fixes #1212	2023-07-16 20:42:25 +02:00
DioEgizio	80463f9761	Merge pull request #1231 from telans/modrinth-default-icon ... Modrinth: use default icon for non-managed packs	2023-07-16 20:42:25 +02:00
TheKodeToad	567af5b22d	Merge pull request #1233 from p2js/ui-consistency-fix ... Remove inconsistent/unneeded question marks in UI	2023-07-16 20:42:24 +02:00
Trial97	7441974d9d	Removed icon ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-16 21:23:22 +03:00
Trial97	79222a56e3	use shared pointer ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com> use shared pointer	2023-07-16 21:14:39 +03:00
Trial97	cadb7142f0	Added progress bar to Prism instance export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-16 20:57:57 +03:00
clickdevin	949da6b50e	Fix bugs when updating curseforge modpacks ... Signed-off-by: clickdevin <git@clickdevin.me> (cherry picked from commit d4f2059b78)	2023-07-16 17:55:05 +00:00
Trial97	251055302e	format ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-16 20:53:58 +03:00
Jakub Wroński	89dd981dd7	Fix compiling on FreeBSD ... Signed-off-by: Jakub Wroński <kubawronski161@gmail.com> (cherry picked from commit a32a3e25ad)	2023-07-16 17:51:53 +00:00
Trial97	9d0175b81a	Added welcome screen ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-16 17:46:00 +03:00
Trial97	de30a72c4e	made the date a object ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-16 15:16:16 +03:00
TheKodeToad	5f37e339fb	Merge branch 'develop' into feature/java-downloader ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-16 12:32:31 +01:00
Trial97	0a956bbc73	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks	2023-07-16 14:18:26 +03:00
Trial97	1e9a596908	simplified code in cat packs ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-16 14:18:17 +03:00
Sefa Eyeoglu	fcdd9ea986	Merge pull request #1246 from Trial97/export	2023-07-16 12:24:42 +02:00
Sefa Eyeoglu	c145bfa524	Merge pull request #1369 from Trial97/autoselect	2023-07-16 12:21:17 +02:00
Trial97	a3ffa64550	Upgraded pack changelog ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-16 01:59:08 +03:00
Alexandru Ionut Tripon	f42514a1a3	Update launcher/tasks/ConcurrentTask.cpp ... Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-07-16 00:38:39 +03:00
Trial97	06fc8358d9	auto focus search line on resource download ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-15 23:57:32 +03:00
Trial97	c346d875a2	make FileResolvingTask accept empty modlist ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-15 23:26:52 +03:00
seth	a2a09ffe01	chore: better explain quilt loader beacon ... Signed-off-by: seth <getchoo@tuta.io>	2023-07-15 14:25:05 -04:00
Trial97	21ffed3bf5	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-15 20:35:11 +03:00
Trial97	fd7aab466b	Merge branch 'refactor/net-split-headers-to-proxy-class' of https://github.com/Ryex/PrismLauncher into refactor/NetActions	2023-07-15 20:33:48 +03:00
Trial97	6cf7c0a647	Connected last fail signals ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-15 20:17:16 +03:00
Alexandru Ionut Tripon	da87e825a1	Update launcher/ui/dialogs/ExportToModListDialog.ui ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-07-15 15:59:19 +03:00
Trial97	a7e0c9db96	connected failed event for some tasks ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-15 12:01:07 +03:00
Trial97	0880d4d37b	made sure abort signal is catched in cocurent task ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-15 09:16:37 +03:00
Trial97	b54e093313	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task	2023-07-15 09:04:22 +03:00
Trial97	7befd63cce	fixed settings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-15 00:28:58 +03:00
Alexandru Ionut Tripon	2c2c39b42c	Update launcher/modplatform/import_ftb/PackInstallTask.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-07-15 00:17:48 +03:00
Alexandru Ionut Tripon	0692cbe701	Update launcher/modplatform/import_ftb/PackInstallTask.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-07-15 00:17:32 +03:00
Trial97	68b5fdf748	Ask user to retry if netjob fails ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-15 00:03:11 +03:00
Trial97	ab10524cd7	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 23:45:40 +03:00
Trial97	1ccfba13eb	renames ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 23:41:51 +03:00
Trial97	b9ed8283b7	Added buttons ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 23:41:45 +03:00
Trial97	1495bfb73e	Made custom template enabled all time ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 23:41:37 +03:00
Trial97	9b02c31f8d	escaped text for html export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 23:35:18 +03:00
Trial97	50dae9d4f3	Moved to separate functions ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 23:34:28 +03:00
Trial97	9a3931dac6	Added json and csv format ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 23:34:21 +03:00
Trial97	515197fba2	fix: html sintax for modlist export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 23:34:03 +03:00
Trial97	149b6d59cf	fixed tests ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 23:22:11 +03:00
Rachel Powers	37fb52aada	Merge pull request #1351 from Trial97/ftb_import ... fixed substatus on ftb_import	2023-07-14 12:41:21 -07:00
Trial97	db9f5f44e0	Split in two the options ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 22:26:22 +03:00
seth	094af0f78f	Merge pull request #1336 from Ryex/packaging/fix-duplicate-share-directories ... packaging: fix duplicate share directories (use only lowercase)	2023-07-14 14:19:44 -04:00
Trial97	d3dc00dcab	made concurent task fail ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 21:07:53 +03:00
Trial97	7f4665e3cc	format ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 21:07:34 +03:00
Trial97	cebb4dd17a	made the number of concurrent tasks configurable ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 20:39:53 +03:00
Rachel Powers	3487e1cb64	Update launcher/Application.cpp ... Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-14 03:56:18 -07:00
Trial97	440afcedb0	fixed warning ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 13:32:18 +03:00
Trial97	b0a21c9389	insert header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 13:31:28 +03:00
Trial97	fc4a1ef193	format ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 13:31:13 +03:00
Trial97	c8533c0b0d	fixed substatus on ftb_import ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 12:29:03 +03:00
Trial97	b0a018d823	format ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 12:28:23 +03:00
seth	3099a70edc	Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-place ... fix(flame install): don't assume .zip is a resource pack. default to mod	2023-07-14 00:16:43 -04:00
Rachel Powers	cde85947c7	Update launcher/minecraft/mod/tasks/LocalResourceParse.cpp ... Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-13 21:12:12 -07:00
Rachel Powers	5d10045cc8	Merge pull request #1352 from Trial97/crash_after_abort ... Do not reset shared pointer if it's already empty	2023-07-13 21:11:47 -07:00
Rachel Powers	520594e529	Merge branch 'develop' into chore/add-compiler-warnings ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-13 20:05:16 -07:00
Rachel Powers	95b300f1ea	packaging: use PascalCase folder name instead ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-13 19:56:36 -07:00
Trial97	bd6e8533ad	send by reference ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-13 19:58:08 +03:00
Trial97	843c2d67eb	Added FTBAPP Import ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-13 18:41:29 +03:00
seth	89aaedc06c	feat: add toggle for quilt beacon ... Signed-off-by: seth <getchoo@tuta.io>	2023-07-12 21:10:48 -04:00
Tayou	94d4d12ee0	Merge pull request #1345 from Trial97/time2 ... feat:Added option to use system locale	2023-07-13 01:56:12 +02:00
TheKodeToad	997a3709d4	Custom environment variables UI and implementation ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-12 19:21:38 +01:00
Trial97	76cc8ce043	renamed setting ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-12 21:05:13 +03:00
Rachel Powers	9499066375	Merge pull request #1350 from Trial97/fix_managed_pack_crash ... fixed crash if no version is loaded on managed page	2023-07-12 09:55:31 -07:00
Trial97	25f7cf23d3	the other place ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-12 19:55:11 +03:00
Trial97	9ee68b9268	small pointer check ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-12 18:12:31 +03:00
leo78913	1208300ddf	i forgor to change skin upload browse button ... Signed-off-by: leo78913 <leo3758@riseup.net>	2023-07-12 10:57:40 -03:00
Sefa Eyeoglu	06a7d447f6	Merge pull request #1333 from Ryex/fix/null_instance_edit_crash	2023-07-12 15:53:46 +02:00
Trial97	766e833a73	fixed crash if no version is loaded ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-12 16:25:05 +03:00
Rachel Powers	6d5a2ceefe	fix(flameapi): getFile use shared_ptr ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-11 21:45:23 -07:00
Rachel Powers	149bc8e9ce	cleanup: pull out data object so I'm not repeating myself ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-11 21:42:34 -07:00
Rachel Powers	9957aeb003	Merge branch 'develop' into curseforge-url-handle	2023-07-11 21:42:29 -07:00
HyperSoop	bca120e798	Reduce mininmum memory amounts ... Signed-off-by: HyperSoop <pasha.mirus@gmail.com>	2023-07-11 21:25:26 +03:00
Trial97	634612ae81	added missing header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-11 18:20:44 +03:00
Trial97	f0d2aab784	feat:Added option to use system locale ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-11 18:05:43 +03:00
TheKodeToad	4c69290381	Merge branch 'develop' into better-component-installation ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-11 11:14:06 +01:00
seth	640aaa8c23	Merge pull request #1331 from TheKodeToad/hungry-trash ... Fix updating trashing resources	2023-07-10 16:31:43 -04:00
Rachel Powers	1aa5fa03f9	Update launcher/ui/MainWindow.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-10 12:05:01 -07:00
Nathan	99ba02afb6	Shortcuts on macOS (#1081) ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-10 20:26:25 +02:00
TheKodeToad	9aedb5afff	Merge pull request #1334 from TheKodeToad/litemod-dl ... LiteMod downloading	2023-07-10 16:42:38 +01:00
TheKodeToad	e21756ea8c	Remove direct launch ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-10 16:22:37 +01:00
Trial97	35ccfdb799	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-10 16:25:15 +03:00
TheKodeToad	91c9082d19	Merge pull request #1249 from Trial97/curse ... Curseforge modpack export	2023-07-10 14:20:29 +01:00
TheKodeToad	4f4ccdaa59	Merge pull request #1338 from Trial97/unlockVersionPage ... feat:unlocked versions page	2023-07-10 13:06:32 +01:00
TheKodeToad	f816e3cd3f	Merge pull request #1241 from Trial97/settings ... Allow editing of running instances	2023-07-09 22:10:43 +01:00
Rachel Powers	49109b9213	Merge pull request #1332 from TheKodeToad/widebar-pain ... Fix crash when editing instance and prevent similar crashes in future	2023-07-09 14:07:34 -07:00
Rachel Powers	d43399c2b4	Merge pull request #1321 from TheKodeToad/mr-optional ... Optional mods in mrpack export	2023-07-09 14:03:47 -07:00
Trial97	308877aa8f	removed redundant code ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-09 23:18:38 +03:00
Trial97	159f14c076	feat:unlocked versions page ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-09 22:47:38 +03:00
TheKodeToad	6e2fcc9e11	Replace string manipulation in favour of QFileInfo ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-09 12:08:15 +01:00
Rachel Powers	4dc4c589ba	packaging: fix duplicate share directories (use only lowercase) ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-08 15:44:09 -07:00
TheKodeToad	d53d58a5d4	LiteMod downloading ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-08 22:16:43 +01:00
Rachel Powers	e704072892	fix(flame install): don't assume .zip is a resource pack. default to mod ... let identifier move it if needed Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-08 13:38:00 -07:00
Rachel Powers	a54bbae622	fix(instance edit): don't allow editing if no selected instance or instance doesn't support editing ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-08 12:59:55 -07:00
TheKodeToad	08c140b9b4	Fix actionVisitItemPage insersion, and prevent widebar segfault ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-08 20:55:30 +01:00
TheKodeToad	0c6362f28d	Make trash hungry ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-08 18:51:28 +01:00
Rachel Powers	20c781b23b	fix(progress dialog): if there is a parent center on creation ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-08 02:28:37 -07:00
Rachel Powers	3211b265d7	Merge pull request #1302 from Ryex/fix/progress-dialog-segfault ... fix: segfault in progress dialog	2023-07-07 21:25:14 -07:00
Trial97	bc2940e16a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-08 00:14:05 +03:00
Tayou	1131038fdb	Merge pull request #1120 from Trial97/visit_mod_page	2023-07-07 22:23:59 +02:00
ashuntu	51d7a6289e	Fix URL open crash (#596)	2023-07-07 13:24:31 -05:00
ashuntu	10678096e5	Persist app data between install versions	2023-07-07 13:20:15 -05:00
Sefa Eyeoglu	51e62761ee	fix: improve QUrl construction ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-07-07 19:25:12 +02:00
leo78913	d1cceac7d1	disable hiding enable and name columns on folder models ... Signed-off-by: leo78913 <leo3758@riseup.net>	2023-07-07 12:37:24 -03:00
TheKodeToad	b8482a5d89	Update ModFolderPage.cpp ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-07 15:53:50 +01:00
Trial97	3139af8487	Made action text simpler ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-07 17:12:10 +03:00
Sefa Eyeoglu	6fcdac0d36	fix: reset invalid meta url on launch ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-07-07 15:57:25 +02:00
Sefa Eyeoglu	073cb91f88	fix(ui): validate meta override url ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-07-07 15:56:07 +02:00
leo78913	3154c2644a	enable tear off on widebar context menu ... Signed-off-by: leo78913 <leo3758@riseup.net>	2023-07-07 10:30:18 -03:00
Sefa Eyeoglu	e225a72180	Merge pull request #1128 from pandaninjas/fix-implicit-fallthrough	2023-07-07 15:19:00 +02:00
TheKodeToad	ec85266860	Memory leak fixes ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-07 12:18:04 +01:00
TheKodeToad	4c25e3ce75	Add keyboard shortcut to Kill action ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-06 21:04:21 +01:00
TheKodeToad	8ae67b84db	Optional mods in mrpack export ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-06 20:04:26 +01:00
TheKodeToad	440dcdf022	Import QActionGroup properly :P ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-06 18:31:59 +01:00
TheKodeToad	22327bbe71	Combine launch buttons in Instance window, persist profiler ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-06 18:07:45 +01:00
Trial97	93870c315f	better url handling ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-06 18:46:59 +03:00
PandaNinjas	13d67c6524	Keep formatting consistent ... Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>	2023-07-06 08:51:42 -04:00
leo78913	e8dc1564b6	add _kde_side_panel_view property to page container ... With this the sidebars look better with the breeze theme Signed-off-by: leo78913 <leo3758@riseup.net>	2023-07-06 01:39:59 -03:00
leo78913	f9578066d6	make "browse" buttons and java pages more consistent ... Signed-off-by: leo78913 <leo3758@riseup.net>	2023-07-06 01:39:59 -03:00
Sefa Eyeoglu	5ba13297c6	Merge pull request #1284 from Ryex/fix/properly-track-failed-copies-and-clones	2023-07-05 19:26:07 +02:00
PandaNinjas	817ecf8225	Fix VersionProxyModel.cpp ... Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>	2023-07-04 17:19:08 -04:00
PandaNinjas	4509fde410	Merge branch 'develop' into fix-implicit-fallthrough ... Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>	2023-07-04 16:41:34 -04:00
PandaNinjas	34cf28712c	Replace break with return true; ... Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>	2023-07-04 16:39:24 -04:00
PandaNinjas	1fbc17d275	Remove break and add fallthrough comment in WorldListPage.cpp ... Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>	2023-07-04 16:38:04 -04:00
Trial97	908ac813e0	escaped modlist inner html ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-04 15:16:54 +03:00
TheKodeToad	64c591b234	Better parent version filtering; handle old fabric :P ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-03 20:48:37 +01:00
TheKodeToad	0e5c377680	Various tweaks ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-03 17:39:09 +01:00
Trial97	6d758795af	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-03 17:00:56 +03:00
Tayou	dedc9e4edc	Merge pull request #1127 from Trial97/scale_cat	2023-07-03 15:46:56 +02:00
Trial97	fa7cfc77d8	fixed template ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-03 16:08:20 +03:00
Trial97	f0aab541f8	fixed typo ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-03 15:09:35 +03:00
Trial97	026293f773	updated option text ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-03 14:17:39 +03:00
Trial97	5d5f1b86fd	fixed logic regarding range over multiple years ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-03 09:21:25 +03:00
Trial97	ba159ba971	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks	2023-07-03 09:01:22 +03:00
Rachel Powers	e5b9bfb2e7	fix: update if new size is larger ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-02 22:30:25 -07:00
Rachel Powers	8cb8273e67	fix: update if new size is larger ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-02 22:29:45 -07:00
Rachel Powers	73d8343914	fix: header <qpoint.h> -> <QPoint> ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-02 22:27:24 -07:00
Rachel Powers	3960eb7d32	fix: properly calculate min size for progress dialog, apply it at creation ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-02 21:24:43 -07:00
Rachel Powers	4004e0faee	fix: segfault in progress dialog ... - dialog tries to resize after unhiding the subtask scroll area - after resize attempts to recenter on parent - `calls parentWidget()->{x|y}()` - what if there is no parent? nullptr->() = segfault - recenter on last pos, don't access parent Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-02 20:22:25 -07:00
Trial97	f1bd9700f7	Fail NetRequest on connection close from QT ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-02 22:49:58 +03:00
Trial97	5f63c781b4	resolved local vaiables names ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-02 18:50:29 +03:00
TheKodeToad	43e6f05ed5	Merge pull request #1232 from telans/screenshots-update ... ScreenshotsPage fixes	2023-07-02 16:44:54 +01:00
Trial97	aad5ca5474	fixed typos ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-02 16:45:15 +03:00
Trial97	cf2393a509	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings	2023-07-02 15:56:39 +03:00
Tayou	81c0a1c4bd	antialiasing for all painting, make hitbox fullwidth ... Signed-off-by: Tayou <tayou@gmx.net>	2023-07-02 14:01:56 +02:00
Trial97	6fc745e98c	Merge branch 'catpacks' of github.com:Trial97/PrismLauncher into catpacks	2023-07-02 13:34:41 +03:00
Trial97	7579fff532	Added more options for variants planing ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-02 13:34:04 +03:00
Trial97	7ac2a23bc8	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks	2023-07-02 13:14:19 +03:00
Trial97	6c4cf085e0	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-02 12:50:45 +03:00
Rachel Powers	8d7dcdfc5b	chore: fix shadowed member and signed/unsigned mismatch ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> chore: supress unused with [[maybe_unused]] Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> chore: unshadow ^&^& static_cast implicit return Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> chore: deshadow and mark unused in parse task Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> chore: mark unused in folder models Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> chore: deshadow and mark unused with instances Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> chore: more deshadow and unused Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> chore: remove uneeded simicolons Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> chore: mark unused Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> chore: prevent shadow Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-01 23:39:38 -07:00
Finian Wright	3fe518ff2b	Fix compiling on OpenBSD ... Signed-off-by: Finian Wright <turbowafflz@gmail.com>	2023-07-02 00:36:21 -04:00
Rachel Powers	98d6904e4a	chore: fix propagate mispelling ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-01 17:03:12 -07:00
Rachel Powers	d7d2d9f612	chore: remove WARNINGS_AS_ERRORS ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-01 17:03:11 -07:00
Rachel Powers	2a5d291bd9	fix: toml without exceptions usage ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-01 17:03:11 -07:00
Rachel Powers	671d3c1c80	Merge branch 'develop' into chore/add-compiler-warnings ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-07-01 17:03:11 -07:00
TheKodeToad	6cc3587da2	Disable as intended ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-01 20:10:38 +01:00
TheKodeToad	9f9b5254a2	Double-click to install/change version ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-01 19:39:04 +01:00
TheKodeToad	284e374ae8	Nop ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-01 19:39:04 +01:00
TheKodeToad	4cdf669154	Modify "Change Version" to use "Install Loader" dialog ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-01 19:39:04 +01:00
TheKodeToad	4332b62a62	Fix search focusing ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-01 19:39:04 +01:00
TheKodeToad	7138425c85	Merge branch 'develop' into better-component-installation ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-01 13:05:55 +01:00
Rachel Powers	cea285f5f5	fix(updater): fix bad exe_name on linux ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-30 21:33:22 -07:00
Rachel Powers	1fd90e9dd0	fix(updater): ensure updater knows binaries are in ./bin/ on linux and can find them ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-30 21:24:30 -07:00
Rachel Powers	cd527c44a4	fix(updater): build atrifact fix on linux ci + add qt-ver to artifact name ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-30 18:17:06 -07:00
Rachel Powers	6476023cf7	fix(updater): check the app root dir for binary ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-30 10:57:53 -07:00
Rachel Powers	a01a48793c	fix(updater): force asInvoker for updater on windows ... - use `__COMPAT_LAYER` env var in windows to bypass Installer Detection and run as a normal user anyway - set up updater directly after main windows is created - check update locks before main window Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-30 03:19:21 -07:00
Trial97	18e628e873	removed extra condition ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-30 12:10:00 +03:00
Rachel Powers	00f75e2d54	fix(updater): avoid windows installer detection with "asInvoker" in xml exe.manifest ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-30 00:54:29 -07:00
Trial97	81207c6502	Made sure the logs are ignored when collecting files ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-30 10:52:10 +03:00
Rachel Powers	8dd3a02747	Update launcher/Application.cpp ... Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-29 23:49:31 -07:00
Rachel Powers	4320830a86	fix(updater): Explicit conversion to string for QByteArray ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-29 17:59:14 -07:00
Rachel Powers	603e3e7e2e	fix(updater): set minimum dialog / msgbox sizes ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-29 15:56:44 -07:00
Rachel Powers	109ae5bae0	fix(updater): convert int to string ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-29 15:42:36 -07:00
Rachel Powers	41cb8d7ec6	fix: adjust dialog size, add parent to msgboxes ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-29 15:31:12 -07:00
flow	494483fd2b	fix(updater): add parent to dialog to fix issues in tilling WMs ... QProgressDialog without parents in Qt tend to cause graphical issues on some systems, so we add the main window as a parent here! Signed-off-by: flow <flowlnlnln@gmail.com>	2023-06-29 15:31:11 -07:00
Rachel Powers	a6c8a37a5d	fixa(updater): better update timer logs ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-29 14:06:14 -07:00
Trial97	87efa700ab	Removed logs from instance export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-30 00:01:36 +03:00
Rachel Powers	e38adf6006	fix(updater) fixes form first round of testing ... - reset update time after check Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-29 14:01:11 -07:00
Trial97	25ffc4c4b0	Refactor ImgurUpload ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-29 17:58:09 +03:00
Tayou	8211befc29	removed magic 5, removed unnecessary QPainter function calls ... Signed-off-by: Tayou <tayou@gmx.net>	2023-06-28 23:24:57 +02:00
Tayou	1dc7f80034	4 clang-tidy changes, update copyright info ... while already at it I updated all my emails to use one from my domain Signed-off-by: Tayou <tayou@gmx.net>	2023-06-28 23:08:04 +02:00
Rachel Powers	cb7ff81ade	fix: copy needs to overwrite ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-28 13:51:58 -07:00
Rachel Powers	400a2f7201	fix: final fixes ... - use `done(code)` for offer dialog Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-28 12:46:28 -07:00
Rachel Powers	c123558314	fix: add build config header & trimlines form stdout ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-28 11:25:59 -07:00
Rachel Powers	f287d9deac	fix add NetRequest source ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-28 11:09:59 -07:00
Tayou	534d156b12	format VisualGroup.cpp file ... Signed-off-by: Tayou <tayou@gmx.net>	2023-06-28 20:06:17 +02:00
Tayou	54d88e4dbf	use QString.isEmpty() ... oops Signed-off-by: Tayou <tayou@gmx.net>	2023-06-28 20:05:28 +02:00
Rachel Powers	95969e87a1	Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/launcher-updater	2023-06-28 11:05:11 -07:00
Rachel Powers	e29126ca26	fix: add split markdown source ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-28 10:56:16 -07:00
Rachel Powers	1b5c78b066	Merge branch 'develop' into feat/launcher-updater	2023-06-28 10:54:39 -07:00
Trial97	1c3402d081	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions	2023-06-28 20:23:35 +03:00
Tayou	6b3b119db0	give ungrouped instances a group header ... Signed-off-by: Tayou <tayou@gmx.net>	2023-06-28 18:50:44 +02:00
Tayou	66461ac500	some positioning adjustments, deleted the line ... Signed-off-by: Tayou <tayou@gmx.net>	2023-06-28 18:42:49 +02:00
Rachel Powers	46e840fdf1	fix: add thread sleep to wait for resources - add detail text from logs ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-28 09:18:07 -07:00
Tayou	7033e28572	update instance group header to more modern style ... Signed-off-by: Tayou <tayou@gmx.net>	2023-06-28 18:00:40 +02:00
Trial97	0008b22d8b	Renamed function ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-28 18:41:47 +03:00
Trial97	8f9bd9617f	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into scale_cat	2023-06-28 18:29:04 +03:00
Trial97	0f64ee6a5f	Added warnings for running instances ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-28 18:28:25 +03:00
Trial97	c23bf2fd22	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings	2023-06-28 17:46:01 +03:00
Trial97	3ad559ab22	Added version type to review message dialog ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-28 17:43:09 +03:00
Trial97	5f1074471d	Corected variable name ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-28 13:35:42 +03:00
Trial97	c04cee7ff7	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-28 13:21:00 +03:00
Rachel Powers	4123343130	no need for pre release tag ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-28 00:25:09 -07:00
Sefa Eyeoglu	faec21d572	Merge pull request #1266 from TheKodeToad/smol-tweaks	2023-06-28 08:47:53 +02:00
seth	213f03351f	Merge pull request #1280 from Trial97/shortcut ... Fixed illegal characters in shortcuts name	2023-06-27 20:01:48 +00:00
Rachel Powers	00be211169	Update launcher/FileSystem.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-27 13:01:28 -07:00
Rachel Powers	23b3711f96	fix(filesystem): track failed copies and clones ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-27 12:41:36 -07:00
Trial97	54cb077b40	Added more information to the screenshot upload warning ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-27 19:31:36 +03:00
Trial97	92847b9774	omit icon remove on macos ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-27 19:15:20 +03:00
Trial97	6e5716f097	Fixed illegal characters in shortcuts name ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-27 19:05:32 +03:00
Rachel Powers	6f7454243e	fix: prep for changes in #1276 ... - sign updater Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-26 23:25:07 -07:00
Trial97	45c39d078f	More clenup ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-27 09:23:24 +03:00
Trial97	385babb458	Simplify Upload and Download ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-27 08:51:17 +03:00
TheKodeToad	904b128afe	Merge pull request #1277 from Trial97/remove_mojang ... Removed unused files	2023-06-26 23:09:27 +01:00
Trial97	dffffc784e	Removed unused files ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-26 22:33:10 +03:00
Sefa Eyeoglu	fce000206f	feat: print build platform in application log ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-06-26 11:55:23 +02:00
Sefa Eyeoglu	f5e4171df4	feat: print build platform in log ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-06-26 11:54:22 +02:00
Sefa Eyeoglu	0aaec9ae4f	chore: remove obsolete macOS warning ... We don't support that macOS version. This check also never worked, as we never set the platform to that value. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-06-26 11:53:48 +02:00
Sefa Eyeoglu	d25452a64e	Merge pull request #1274 from TheKodeToad/java-signature	2023-06-26 11:19:53 +02:00
Alexandru Ionut Tripon	22bb260ae3	Update launcher/ui/dialogs/ExportToModListDialog.cpp ... Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-06-26 11:45:26 +03:00
Alexandru Ionut Tripon	d82ae31fc1	Update launcher/ui/dialogs/ExportToModListDialog.cpp ... Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-06-26 11:45:05 +03:00
Alexandru Ionut Tripon	cf5c01a5b1	Update launcher/ui/dialogs/ExportToModListDialog.cpp ... Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-06-26 11:44:55 +03:00
Alexandru Ionut Tripon	f2015eee80	Update launcher/ui/MainWindow.ui ... Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-06-26 11:44:47 +03:00
Rachel Powers	c0f0462550	fix(updater): logs/ folder ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-26 01:41:51 -07:00
Rachel Powers	1f70589deb	feat(updater): tie in part 2, let there be UI! ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-26 01:22:33 -07:00
Sefa Eyeoglu	4d49486cc9	Merge pull request #1065 from leo78913/gamescope-close-button	2023-06-26 08:45:28 +02:00
Rachel Powers	b7dd32274c	Proper capture on windows ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 22:30:20 -07:00
Rachel Powers	d8e0b14dc4	feat(updater): tie in updater part 1 ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 21:37:47 -07:00
TheKodeToad	8bebd7f042	Generate special signature ✨ composed of multiple elements instead of relying on timestamp for Java version cache invalidation ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-26 01:30:47 +01:00
Rachel Powers	90da57a806	Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/launcher-updater	2023-06-25 16:13:51 -07:00
Rachel Powers	b142407b21	fix: ensure finished signal is emited ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 16:13:26 -07:00
Rachel Powers	10266f65e4	fix: include ^<optional^> updater doesn't need to know about mods ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 16:10:06 -07:00
seth	c49ee87857	fix(net): fix emit signals in download & upload task ... Signed-off-by: seth <getchoo@tuta.io>	2023-06-25 18:56:54 -04:00
Rachel Powers	8aeec1d52d	fix: use new shared pointer for repsonse buffer ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 14:36:20 -07:00
Rachel Powers	f39d2de0cc	Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/launcher-updater	2023-06-25 14:31:16 -07:00
Rachel Powers	1ba08f4641	fixup! Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class	2023-06-25 14:25:07 -07:00
Rachel Powers	4b65315cdc	chore: add license to headers ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 14:21:55 -07:00
seth	903fae94be	Merge pull request #1272 from Trial97/fix_selected ... fix: Page container extra info set on logs page	2023-06-25 21:16:18 +00:00
Rachel Powers	4313466589	feat(updater): final step for portable install ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 13:47:32 -07:00
Rachel Powers	d2a3acd493	fix: filter archive assets from windows non-portable installs ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 13:47:31 -07:00
Rachel Powers	516dd6bd1a	support windows console ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 13:47:31 -07:00
Rachel Powers	44bc60021d	feat(updater): unpack portable archive ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 13:47:31 -07:00
Rachel Powers	50d5eb0621	feat(updater): download new & back up old ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 13:47:31 -07:00
Rachel Powers	bee88b1c7f	feat(updater) select valid asset ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 13:47:30 -07:00
Rachel Powers	98174b7a37	refactor: use Net tasks for github api download ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 13:47:30 -07:00
Rachel Powers	2357d167b8	Merge branch 'packaging/windows-installer-uninstall-previous' into feat/windows-updater	2023-06-25 13:46:28 -07:00
Rachel Powers	013a26aafe	fix: add ApiUpload to CMakeLists.txt ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 13:23:43 -07:00
Rachel Powers	fe9927d10d	Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/windows-updater	2023-06-25 12:44:25 -07:00
Rachel Powers	df4fd7df7f	Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class	2023-06-25 12:43:48 -07:00
Rachel Powers	c8ff812ab8	feat(net): ApiUpload ^& fix unfired finished signals ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 12:02:46 -07:00
Trial97	6d0e255ca1	fix: Page container extra info set on logs page ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-25 22:00:33 +03:00
Rachel Powers	3105f314cb	fix: class rename (lsp acitons undid the first rename :P) ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 11:09:26 -07:00
Rachel Powers	6db906d623	chore: format ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 11:09:26 -07:00
Rachel Powers	418677ef31	refactor: override / mask static make functions for ApiDownload ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 11:09:25 -07:00
Rachel Powers	9c10965997	refactor: split out setting api headers for downloads ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 11:09:25 -07:00
Trial97	87155e346c	Complicated a little task progress ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-25 19:44:18 +03:00
Trial97	52dd09bdf7	Merge branch 'curse' of github.com:Trial97/PrismLauncher into curse	2023-06-25 17:51:30 +03:00