2057 Commits

Author	SHA1	Message	Date
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	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
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	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
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
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	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	c81689d393	fixes html elide issue with InfoFrame	2023-09-15 20:41:21 -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
Trial97	8c8e4329d7	fix codeql ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-05 23:45:32 +03:00
Trial97	8bad255a91	added more import options ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-05 20:13:16 +03: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
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
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
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	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	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	c54fecf5d9	added condition for empty loader type ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-25 09:05:04 +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
Sefa Eyeoglu	85c23b26de	chore: reformat ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-23 13:46:23 +02: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
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	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
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
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	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
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
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	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	4a1d85f999	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-08-17 14:23:37 +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
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	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	52e5ee7111	feat: add NeoForge to UIs ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 11:06:14 +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	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	7ba1e7d356	Merge pull request #1407 from TheKodeToad/icon-indexing	2023-08-15 10:43:29 +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	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
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
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
Sefa Eyeoglu	ef6f9487f4	Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings	2023-08-10 20:38:32 +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
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
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
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	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	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	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	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
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	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	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	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	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
TheKodeToad	d4ea9c2717	Merge branch 'develop' into feature/java-downloader ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-28 14:50:59 +01: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	97ff7afbe7	keep the icon suffix ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-28 08:37:45 +03:00
Sefa Eyeoglu	bdec11c501	Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2	2023-07-27 09:40:31 +02: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
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	b15f689ccf	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions	2023-07-27 00:03:42 +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
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
LostLuma	361583edfc	Ignore cache files when exporting instances ... Signed-off-by: LostLuma <lilly@lostluma.net>	2023-07-26 04:23:01 +02:00
tjw123hh	280f041acb	Delete some incorrect notr="true" tags ... Signed-off-by: tjw123hh <tjw123hh@outlook.com>	2023-07-25 17:35:31 +08: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	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	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	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
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
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
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
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
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	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	f5891940e0	translate strings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-17 17:22:35 +03: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
Trial97	ec32618e11	reveted back to add years ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-17 10:20:22 +03: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	20e2c70464	Rename groups and janky reference counting map ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-16 23:23:33 +01: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
Trial97	7441974d9d	Removed icon ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-16 21:23:22 +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
Trial97	251055302e	format ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-16 20:53:58 +03: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
Trial97	a3ffa64550	Upgraded pack changelog ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-16 01:59:08 +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
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	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	7befd63cce	fixed settings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-15 00:28:58 +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	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
Trial97	db9f5f44e0	Split in two the options ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-14 22:26:22 +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	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
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
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	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	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
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
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
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	d53d58a5d4	LiteMod downloading ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-08 22:16:43 +01: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
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
Sefa Eyeoglu	51e62761ee	fix: improve QUrl construction ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-07-07 19:25:12 +02: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	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
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	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
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
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
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	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
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
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
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
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	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
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	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
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
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
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
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
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	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	df4fd7df7f	Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class	2023-06-25 12:43:48 -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	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
Leo	953a2590e2	Add fixme comment for no SSD detection ... Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Leo <leo3758@riseup.net>	2023-06-25 10:11:58 -03:00
Trial97	3546f57a42	Use internal markdown implementation ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-25 15:17:09 +03:00
Trial97	8d3bc6b6b9	Added markdown QT version check ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-25 14:58:54 +03:00
TheKodeToad	c75ba0f855	Fix big mistake :iea: ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-25 12:46:07 +01:00
Trial97	84c63f4f01	Added plantxt export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-25 14:11:41 +03:00
TheKodeToad	603ed22015	Replace accidental usages of QAbstractButton::pressed ... This signal is not usually what you want, and creates an inconsistent experience. Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-25 10:36:54 +01:00
Trial97	ef0752972a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export	2023-06-25 12:26:54 +03:00
Trial97	fd5b155ee7	Added error message when exporting snapshots with curseforge ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-25 12:24:59 +03:00
Trial97	40fbae8ff6	Fixed links tooltip ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-25 11:36:37 +03:00
Trial97	ce4a86fbcd	Made custom url function ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-25 10:41:29 +03:00
Trial97	54d7477679	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page	2023-06-25 10:12:29 +03:00
Trial97	6f7d901a1f	removed extra variable ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-25 09:17:28 +03:00
TheKodeToad	5eb71fc6a9	Revert "feat(Mods): hide 'Provider' column when no mods have providers" ... With Ryex's change, this causes issues. Apparently you need to sign off reverts! That's just weird... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-24 23:36:32 +01:00
TheKodeToad	8a3aba1634	Fix Open Global Settings, why not ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-24 23:30:51 +01:00
TheKodeToad	529e2054ea	A few tweaks, with inspiration from Zeke :3 ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-24 23:26:27 +01:00
Trial97	158b07a39e	moved getRequiredBy ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-25 00:24:08 +03:00
Trial97	932531c8ba	fixed authors ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-24 23:48:18 +03:00
Trial97	69c21454ec	removed projectID ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-24 22:15:18 +03:00
Trial97	564e394ec8	feat:Update mods now fills missing dependencies ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-24 21:48:12 +03:00
Trial97	81c1a95166	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse	2023-06-24 20:04:56 +03:00
Trial97	7fdd68d768	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-06-24 15:58:55 +03:00
Trial97	4a84084d9d	Added condition for modlist ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-24 15:02:00 +03:00
Trial97	25579fbedc	Renamed ExportMrPackDialog to ExportPackDialog ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-24 14:54:39 +03:00
Trial97	30ef5475c7	Made sure CurseForge string is corect ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-24 14:50:05 +03:00
Trial97	cd1e8dc8cc	Removed modlist checkbox ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-24 11:12:23 +03:00
Trial97	377707d3db	Merge branch 'curse' of github.com:Trial97/PrismLauncher into curse	2023-06-24 11:02:40 +03:00
Trial97	7ebc8c48a8	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse	2023-06-24 11:02:13 +03:00
Alexandru Ionut Tripon	42bc04a0d2	Update launcher/ui/MainWindow.cpp ... Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-06-24 11:01:23 +03:00
Rachel Powers	4322222acc	Merge pull request #1255 from Trial97/export4 ... Added Thumbs.db to excluded files in MrPackExport	2023-06-23 21:40:55 -07:00
Trial97	cf94adb363	Added some warnings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-24 01:05:49 +03:00
TheKodeToad	d74a23d5b2	Update developers ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-23 21:00:55 +01:00
Trial97	69c709b05a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-23 20:01:17 +03:00
Trial97	cb2671a02c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse	2023-06-23 19:35:47 +03:00
Trial97	0a56631831	Added curseforge search ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-23 19:35:41 +03:00
Trial97	90df092174	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse	2023-06-23 17:29:58 +03:00
Trial97	85bbab0e92	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash	2023-06-23 14:38:30 +03:00
Alexandru Ionut Tripon	c5ea8367aa	Update launcher/ui/themes/CatPack.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-06-23 14:25:21 +03:00
Trial97	f8adb508ab	Made catpack id optional in catpack.json ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-23 11:44:40 +03:00
Trial97	6613deca0f	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks	2023-06-23 11:42:28 +03:00
Trial97	763b3c3236	Added Thumbs.db to excluded files in MrPackExport ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-23 10:38:26 +03:00
Trial97	718aca3d06	Fixed date constructor ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-23 09:24:18 +03:00
Trial97	bf95cfb30e	Added CatPacks ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-23 01:37:28 +03:00
seth	8df5ab8aa7	Merge pull request #1251 from getchoo/github-clarify ... chore: add 'suggest a feature' message in help	2023-06-22 17:13:00 -04:00
seth	83efdccfe1	Merge pull request #1252 from getchoo/import-hehe ... chore: avoid confusion in file/url import dialog	2023-06-22 17:12:35 -04:00
Rachel Powers	f1ebec641a	Merge pull request #1058 from Ryex/feature/images-for-resource-page ... Feature: image coumn for Mod, Resource Pack, and Texturepack pages	2023-06-22 13:26:47 -07:00
seth	a4521ac0bb	chore: avoid confusion in file/url import dialog ... Signed-off-by: seth <getchoo@tuta.io>	2023-06-22 16:15:03 -04:00
seth	03361e51ef	chore: add 'suggest a feature' message in help ... Signed-off-by: seth <getchoo@tuta.io>	2023-06-22 15:58:53 -04:00
Trial97	049b02cee4	finished up the curesforge export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-22 21:06:01 +03:00
TheKodeToad	05d2c1f0b0	Dynamic button text ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-22 18:18:33 +01:00
Trial97	58321f3491	Added curseforge export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-22 20:03:44 +03:00
Trial97	836e8d2e28	Fixed code quality ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-22 17:39:57 +03:00
Trial97	b84dc8551a	Fixed trigger function ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-22 16:49:19 +03:00
Trial97	f7d502c68c	Added ExportModsToStringDialog ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-22 16:08:04 +03:00
TheKodeToad	e7ad373d89	Merge branch 'PrismLauncher:develop' into better-component-installation	2023-06-22 13:22:44 +01:00
TheKodeToad	dea33a3c1d	Make selectedPage const 🤦‍♀️ ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-22 13:13:25 +01:00
TheKodeToad	1f16380efc	Fix ... I could use rvalue references and fix my brain fart, but i think regular references are more readable and safer here. Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-22 12:56:47 +01:00
Trial97	0063d52952	Merge branch 'settings2' of github.com:Trial97/PrismLauncher into settings	2023-06-21 23:25:37 +03:00
Trial97	2e82c1d40c	Added regex expresion to exclude .DS_Store files ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-21 23:22:25 +03:00
Trial97	820892d7cc	Made settings editable when instance is running ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-21 22:42:08 +03:00
Trial97	0d2105dec4	Made buttons on ModsFolderPage enabled all the time ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-21 21:34:40 +03:00
Trial97	480faca559	Removed unused variable ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-21 21:17:17 +03:00
TheKodeToad	0975dbc3dd	Merge pull request #1228 from Trial97/curent_pack_crash ... Fixes #1212	2023-06-21 15:35:09 +01:00
Rachel Powers	470518eb3a	fix: resize columns on hide ^& uniform heights ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-21 02:31:40 -07:00
Trial97	ba609f3600	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-21 09:14:58 +03:00
seth	ca659136e2	Merge pull request #1119 from Trial97/mods_txt ... Added dynamic page extra info	2023-06-20 19:56:38 -04:00
TheKodeToad	94510edd72	Rework icons (Fabric is blurry now but looks better) ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-20 19:57:15 +01:00
Alfio	f769b0b4c6	Remove inconsistent/unneeded question marks in UI ... Signed-off-by: P2 <tomarchioalfio5@gmail.com>	2023-06-20 10:40:27 +02:00
James Beddek	75bd626f33	Screenshots: do not retry image thumbnailing on null result ... This causes the thumbnailing thread pool to spend a lot of time attempting to retry an image that failed. A null result is common where the image is too large to be allocated (>128MiB alloc). The repeated retries continue after page delete, causing hangs if a user tries to exit the application. Fixes: #1201 Signed-off-by: James Beddek <telans@posteo.de>	2023-06-20 16:59:59 +12:00
James Beddek	f2471f0f68	Screenshots: clear the thumbnailing pool on page delete ... Removes pending QThreadPool jobs which linger after page delete. May help with #1201 by allowing the pool to finish earlier. Signed-off-by: James Beddek <telans@posteo.de>	2023-06-20 16:54:15 +12:00
James Beddek	d9b24f7705	Screenshots: remove path from watcher if it no longer exists ... Signed-off-by: James Beddek <telans@posteo.de>	2023-06-20 16:52:57 +12:00
TheKodeToad	a389983d7d	Just use the old ordering ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-20 00:28:42 +01:00
TheKodeToad	82d3755e25	License all the things ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-19 23:36:20 +01:00
TheKodeToad	6ccc7e77f9	Basic, unfinished & broken impl ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-19 22:42:30 +01:00
Trial97	6fd729e285	Fixed regresion regarding modrinth project_id in dependence array ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-19 17:42:16 +03:00
Trial97	d02858040e	Fixes #1212 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-19 13:09:37 +03:00
Trial97	3ee0fec729	Removed mods from lambda ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-19 12:22:22 +03:00
Trial97	ec063470d7	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt	2023-06-19 12:20:50 +03:00
Trial97	1bdde1f947	Small fixes ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-19 00:36:37 +03:00
Trial97	319ce8c19f	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-06-19 00:06:44 +03:00
Trial97	4e66f55d84	Removed extra headers ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-18 23:32:17 +03:00
Trial97	6826f1d605	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash	2023-06-18 23:27:41 +03:00
Trial97	0161520b33	Fixed leaks ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-18 23:27:26 +03:00
seth	fd9a8d1551	Merge pull request #1110 from TheKodeToad/version-search ... Add a search bar to version lists	2023-06-16 14:47:39 -04:00
DioEgizio	412349ac58	Merge pull request #1135 from Trial97/installed_mods	2023-06-16 09:56:51 +02:00
Trial97	147366bc0a	Made ByteSynkArray to use shared_ptr ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-15 22:59:41 +03:00
Trial97	98a07da39b	Renamed variable ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-15 14:12:29 +03:00
Sefa Eyeoglu	90a4f622d2	Merge pull request #1063 from RedsonBr140/feat/RootFolder	2023-06-15 12:49:21 +02:00
Sefa Eyeoglu	6812823b55	fix: simplify resolving of data path ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-06-15 12:48:22 +02:00
Trial97	cb52be433d	Made the installed mods more apparent ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-15 13:20:08 +03:00
Trial97	1f2b0ad698	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into installed_mods	2023-06-15 12:39:20 +03:00
Trial97	6667ff9330	Updated text and fixed mod page text update ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-15 12:32:48 +03:00
Trial97	5bf091149d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt	2023-06-15 11:46:44 +03:00
Trial97	be0df38453	Added tooltip for name label ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-15 11:40:39 +03:00
Trial97	fcfb3d2df7	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page	2023-06-15 10:37:10 +03:00
Trial97	1ff8136f98	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into scale_cat	2023-06-15 10:36:05 +03:00
Trial97	182e19eae3	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-06-15 10:35:26 +03:00
TheKodeToad	3526d00a23	Merge branch 'develop' into feat/dont-hide-settings ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-14 20:05:02 +01:00
DioEgizio	a4502f44c2	Merge pull request #1145 from Trial97/net_job_crash	2023-06-14 12:46:00 +02:00
TheKodeToad	180ed0cc1a	Merge branch 'PrismLauncher:develop' into skinfix	2023-06-13 11:08:21 +01:00
Tayou	b174f82261	Merge pull request #1162 from leo78913/i-hate-naming-branches	2023-06-12 21:41:17 +02:00
leo78913	d6c7b4e813	add icons to export menu ... Signed-off-by: leo78913 <leo3758@riseup.net>	2023-06-11 21:50:29 -03:00
Tayou	5aa1c340dc	rainbow konami & toggle ... Signed-off-by: Tayou <tayou@gmx.net>	2023-06-11 01:58:37 +02:00
Trial97	ae9e8dbafd	Removed const specification ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-10 22:04:08 +03:00
TheKodeToad	b7d82354cb	[ci skip] License headers!! (yay) ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-10 14:43:58 +01:00
Trial97	b3d743635c	Updated the messages ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-09 21:29:12 +03:00
Trial97	f2932c6d03	Fixed some crashes ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-09 21:23:41 +03:00
Trial97	f96b135ef7	Higlight installed mods ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-08 20:26:09 +03:00
PandaNinjas	318d11481d	Resolve other switch fallthrough issues	2023-06-07 19:37:54 -04:00
TheKodeToad	0b4807dc1f	Questionable fix two ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-07 22:55:37 +01:00
Trial97	d33de2e427	Made cat scalable ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-08 00:54:32 +03:00
Trial97	bbd9e4de9b	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt	2023-06-07 20:18:56 +03:00
Trial97	8abe6b6732	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page	2023-06-07 20:18:36 +03:00
Tayou	9b9d439fce	Merge pull request #1111 from Trial97/requires	2023-06-07 18:57:46 +02:00
Sefa Eyeoglu	accf0cd40e	Merge pull request #1115 from leo78913/fix-resource-downloader-crash	2023-06-07 08:47:19 +02:00
Trial97	e936bc4c60	Added custom text for multiple selection ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-07 01:38:10 +03:00
Trial97	f724059b88	Added visit mod's page ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-07 01:23:53 +03:00
Trial97	1e702ee40f	Added dynamic page extra info ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-07 00:16:23 +03:00
Tayou	3b9d822d72	Merge pull request #1073 from leo78913/accounts-menus-fixes	2023-06-06 20:34:41 +02:00
leo78913	a807b231a7	fix: fix crash when selecting resource/texture/shader packs ... Signed-off-by: leo78913 <leo3758@riseup.net>	2023-06-06 15:17:13 -03:00
TheKodeToad	a2d0d5a71d	Allow arrow key movement, fix auto-focus ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-06 18:26:26 +01:00
leo78913	d59a06344a	fix main toolbar accounts toolbutton name ... previously it was not using the selected account name when opening the launcher and i also added an action group to the menu items so it uses radio buttons instead of checkboxes :p Signed-off-by: leo78913 <leo3758@riseup.net>	2023-06-06 14:21:41 -03:00
Tayou	e884341795	save meta custom url as string, not QUrl ... Signed-off-by: Tayou <tayou@gmx.net>	2023-06-06 18:15:26 +02:00
TheKodeToad	c343036d3b	Simplify ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-06 12:24:53 +01:00
Trial97	1043d29dd5	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into requires	2023-06-06 10:34:36 +03:00
Trial97	6505a62801	Renamed requires fields ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-06 10:34:05 +03:00
TheKodeToad	961285d6ab	Add a search bar to version lists ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-05 22:47:42 +01:00
TheKodeToad	37b4f606c8	Validate input lengths on mrpack export ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-05 17:54:24 +01:00
Rachel Powers	3dccc38f42	Merge pull request #904 from TheKodeToad/mrpack-export ... mrpack export	2023-06-04 19:01:50 -07:00
TheKodeToad	e26827b849	Optimised icons ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-03 13:39:42 +01:00
Trial97	9ca74cd009	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-03 00:48:13 +03:00
Alexandru Ionut Tripon	1840505a0f	Fix crash when selecting same mod from different providers (#1029)	2023-06-02 18:04:06 -03:00
Sefa Eyeoglu	0ece0b5b27	Merge pull request #1086 from TayouVR/fix-qt6_5-brown-system-theme	2023-06-02 12:18:37 +02:00
Rachel Powers	5fe9e30f39	fix: use instance settings, make image column user resizeable, fix memory leak ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-28 14:53:15 -07:00
Rachel Powers	b28f682ad9	Merge branch 'develop' into feature/images-for-resource-page	2023-05-28 12:01:49 -07:00
Rachel Powers	eb079c8060	cleanup: msgbox msg editor ... Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-28 11:13:53 -07:00
Trial97	b4dff181f7	Fixed Ptr logic ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-05-28 18:22:55 +03:00
Trial97	737fc1a2a4	Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-05-28 18:01:39 +03:00
Trial97	bdff8591aa	Removed extra loop ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-05-28 17:54:46 +03:00
Trial97	27c3775f99	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-05-28 17:44:23 +03:00
Trial97	bf0a577fb9	Fixed repaint issue ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-05-28 16:57:35 +03:00
Rachel Powers	7af116fb00	refactor: function scope statics ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-28 05:06:28 -07:00
Rachel Powers	0357921284	cleanup: move qstyle getInstance decl inline ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-28 04:37:09 -07:00
Rachel Powers	a04a6f1e0d	fix(memory leak): don't give shared pointers out to foldermodels (causes cyclic refrence) ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-28 02:15:39 -07:00
Rachel Powers	37420405c7	fix(memory leak): refactor NoBigComboStyle -> singleton ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-27 23:22:40 -07:00
Rachel Powers	ff03dd22fe	fix(memory leak): don't override default deconstructor + reset shared_ptr + ensure modal get's cleaned up ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-26 21:10:49 -07:00
Rachel Powers	aae892dfd1	fix(memory leak): IndexedPack too large to live inside a qlist without pointers () ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-26 19:21:07 -07:00
Rachel Powers	cf4df19986	feat: display release type ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-26 16:23:43 -07:00
Rachel Powers	e61d8e4dc8	fix: katabasis and QStyle leaks ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-25 16:16:58 -07:00
Rachel Powers	086a7e19f0	feat: Column on left, hideable ... - columns are hideable (saves to settings) - image column moved to left - datamodals can provide resize modes Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-24 20:15:34 -07:00
Tayou	3c937532f2	fix System theme colors on windows ... Signed-off-by: Tayou <tayou@gmx.net>	2023-05-24 15:18:08 +02:00
TheKodeToad	863027cbe8	Enable size grip ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-05-22 11:56:54 +01:00
Rachel Powers	6b8fe283f0	fix: memory leak, set parent so it's in tree to get cleaned up. ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-21 01:49:13 -07:00
leo78913	4f0ec908ec	feat: add a close button to the main toolbar when running on gamescope ... Signed-off-by: leo78913 <leo3758@riseup.net>	2023-05-17 00:57:28 -03:00
Rachel Powers	bd1ea64d02	cleanup ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-16 00:01:52 -07:00
Rachel Powers	649753e97e	cleanup: remove unneeded headers ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-15 16:40:56 -07:00
Rachel Powers	fc656b6927	fix: when given a remost resource, download and identify it before import. ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-15 16:34:33 -07:00
Kode	3be18b58bb	Better variable name :p ... Signed-off-by: Kode <TheKodeToad@proton.me>	2023-05-15 19:15:56 +01:00
TheKodeToad	22aaf56855	De-hardcode .index ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-05-15 18:48:49 +01:00
leo78913	7537ea1ef5	make instance settings account selector a comboBox ... Signed-off-by: leo78913 <leo3758@riseup.net>	2023-05-14 16:33:41 -03:00
Trial97	ffcc58cb3e	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-05-14 14:20:24 +03:00
Trial97	8c7fd3327e	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert	2023-05-14 14:20:04 +03:00
Kode	f60562c5a2	Merge branch 'develop' into mrpack-export ... Signed-off-by: Kode <TheKodeToad@proton.me>	2023-05-13 19:07:03 +01:00
TheKodeToad	e1b6020b76	Make some changes ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-05-13 18:24:01 +01:00
Redson	79ce7eb1fc	fix: shouldDisplay() is now redundant. ... Signed-off-by: Redson <redson@riseup.net>	2023-05-13 09:00:10 -03:00
Rachel Powers	b1ffc8ddab	refactor: normalize url fn & cleanup ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-12 16:37:45 -07:00
Rachel Powers	6b6d6a01dc	Merge branch 'develop' into fix/network_and_signals ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-12 01:13:17 -07:00
Rachel Powers	82287e0407	Merge branch 'develop' into curseforge-url-handle	2023-05-12 01:00:26 -07:00
Redson	37a6ef95f0	feat: Don't hide the settings tab when an instance is running ... Signed-off-by: Redson <redson@riseup.net>	2023-05-10 08:25:13 -03:00
Redson	475761b295	fix: Prism sets the data dir to the working directory. ... Signed-off-by: Redson <redson@riseup.net>	2023-05-09 06:36:21 -03:00
Redson	0b251fa754	feat: Add the launcher root folder to the Folders menu ... Signed-off-by: Redson <redson@riseup.net>	2023-05-08 19:57:30 -03:00
Rachel Powers	884ac73078	Merge remote-tracking branch 'upstream/develop' into better-tasks ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-07 13:21:21 -07:00
Trial97	ef6cbdfa2a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-05-07 19:01:20 +03:00
Sefa Eyeoglu	ce5bb29c44	Merge pull request #1054 from Ryex/more-lax-block-mods-filename-check	2023-05-06 09:54:59 +02:00
Sefa Eyeoglu	d535f73a58	Merge pull request #950 from DioEgizio/resize-settings ... fix: divide minecraftpage into tabs	2023-05-06 08:28:46 +02:00
DioEgizio	d38696f411	Update launcher/ui/pages/global/MinecraftPage.ui ... Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2023-05-06 07:15:14 +02:00
Rachel Powers	a3173b5371	fix: ensure Application accepts URLs and local files form cmd args ... refactor: Move curseforge:// url scheme detection to Import Page feat: pass along extra CF pack info so pack metadata is established. Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-05 15:05:17 -07:00
Rachel Powers	b266068644	Apply suggestions from code review ... Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-05 14:07:10 -07:00
Rachel Powers	74e7c13a17	feat: display license and issue tracker ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-05 13:46:38 -07:00
Rachel Powers	3cfcc83ea9	change: don't toggle a resource's enabeling just by selecting it. only if they are on the checkbox. ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-05 13:46:01 -07:00
Rachel Powers	9913080a82	feat(modpage): mod icon in description and column ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-04 23:44:28 -07:00
Trial97	469ef3e06d	Fixed code error ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-05-05 00:04:24 +03:00
Trial97	107b470289	Updated required_by as dependency ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-05-04 23:54:46 +03:00
Rachel Powers	e0635955df	fix: super lax compare ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-04 13:30:39 -07:00
Trial97	8b14b946e2	Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-05-04 22:35:16 +03:00
Trial97	f7b912fc9d	Fixed comments ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-05-04 22:25:05 +03:00
Trial97	9fbec3793f	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-05-04 20:29:33 +03:00
Rachel Powers	5ec4cbf1cb	fix add an addtion lax file name match with replaced with + ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-03 20:31:15 -07:00
Trial97	e4449a0ba3	Initialized variable ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-05-03 09:09:07 +03:00