3044 Commits

Author	SHA1	Message	Date
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
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
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	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
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
tjw123hh	280f041acb	Delete some incorrect notr="true" tags ... Signed-off-by: tjw123hh <tjw123hh@outlook.com>	2023-07-25 17:35:31 +08: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
TheKodeToad	97662f5c8e	Multiple icon themes! ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-18 22:51:34 +01: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
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	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
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
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
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
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
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
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
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
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	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	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	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
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