925 Commits

Author	SHA1	Message	Date
Trial97	609eaa67ab	refactored skin apis ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 21:23:51 +03:00
TheKodeToad	f23a8e4b4b	Enable antialiasing for mod and pack icons ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-29 23:34:19 +01:00
Sefa Eyeoglu	fbf6833124	Merge pull request #1519 from TheKodeToad/better-export-pack	2023-08-28 10:29:32 +02: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	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
Sefa Eyeoglu	df14f88307	Merge pull request #1532 from Trial97/curseforge-url-handle	2023-08-27 12:26:57 +02: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	abfd1a4205	minor dependency crash fix ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-25 18:35:25 +03:00
Trial97	6178e5a975	reverted change for optional ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 13:55:38 +03: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	4704c522e0	moved modloaderTypes to ModPlatform ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 10:26:57 +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
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
Trial97	d25e89a4c1	refactor packwiz file write ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-20 00:48:46 +03:00
TheKodeToad	f99b04bd16	Merge pull request #1320 from TheKodeToad/better-launch ... Combine launch buttons in instance window, persist profiler	2023-08-19 11:08:02 +01:00
Sefa Eyeoglu	acf586ef82	chore: add fixme about UI code in Minecraftinstance ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-19 10:21:46 +02:00
Trial97	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	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
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
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	4a1d85f999	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-08-17 14:23:37 +03:00
TheKodeToad	6da2e7d3f6	I was forced ... /j Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-17 10:12:38 +01:00
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	f919d363b7	made safe for vegetarians ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-16 20:02:32 +03:00
Trial97	589d8b6923	feat:Added remove metadata button ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-16 19:53:39 +03:00
Trial97	c41c39b5d8	cleanup the mod name checking ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 23:55:09 +03:00
Trial97	f7f7bc6865	Removed update disabled warning ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 20:52:17 +03:00
Trial97	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
Sefa Eyeoglu	3a0aa353cc	feat: add NeoForge to ModLoaderType ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 11:06:13 +02:00
Sefa Eyeoglu	8f5bb982cd	Merge pull request #1513 from lumiscosity/fix/skin_transparency_bug	2023-08-15 10:54:07 +02:00
Sefa Eyeoglu	c2d6a137ab	fix: only add native library overrides if files exist ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 10:52:08 +02:00
Sefa Eyeoglu	4c446ccd50	fix: remove meta OpenAL workaround ... LWJGL 2 doesn't have a separate zip for OpenAL. So there is no reason for this code. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 10:51:48 +02:00
Sefa Eyeoglu	83aa0062c7	feat: add custom native library path settings ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 10:51:21 +02:00
Sefa Eyeoglu	ff67fd10c3	feat: implement override for GLFW/OpenAL with split natives ... Fixes PrismLauncher/PrismLauncher#513 Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-15 10:50:38 +02:00
Trial97	9546c77113	Some warnings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-15 00:52:34 +03:00
Sefa Eyeoglu	215d7dbb74	chore: update license headers ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-14 18:17:05 +02:00
Sefa Eyeoglu	91ba4cf75e	chore: reformat ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-14 18:16:53 +02:00
Sefa Eyeoglu	779f70057b	Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging	2023-08-14 18:16:13 +02:00
TheKodeToad	6d070e8607	"Format" ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-12 21:50:02 +01:00
TheKodeToad	983c943eef	Merge branch 'develop' into quick-play ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-12 21:48:41 +01:00
TheKodeToad	5056a51c18	Improvements and refinements to pack export ... - Persist fields - Toggle optional files Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-12 21:20:51 +01:00
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	73adac2501	fix: use QColorConstants in Qt 5.14+ ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-11 15:57:12 +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
TheKodeToad	f6d8c9659c	Rework ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-11 00:39:05 +01:00
TheKodeToad	e2d77f21ba	More system properties because yes!! 🎉 ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-11 00:02:48 +01:00
Sefa Eyeoglu	ef6f9487f4	Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings	2023-08-10 20:38:32 +02:00
maple!	97ef8e8d0e	Fix transparency in skin icon ... QPainter has a bug where drawing transparency to a freshly initialized, empty QPixmap causes garbage data to be drawn. This broke the rendering of the skin icon. The fix is simply to fill the QPixmap with empty transparent pixels beforehand. Signed-off-by: maple! <averyrudelphe@gmail.com>	2023-08-10 15:32:47 +02:00
Sefa Eyeoglu	2090f958c8	Merge pull request #1324 from leia-uwu/ui-tweaks	2023-08-10 12:24:41 +02:00
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	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	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
Sefa Eyeoglu	1d468ac35a	chore: reformat ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-02 18:35:35 +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	ea56ff255d	Merge pull request #1339 from TheKodeToad/remove-direct-launch	2023-08-02 18:31:27 +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	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
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
Sefa Eyeoglu	566425166b	Merge pull request #1449 from Trial97/tehnic ... Reintroduce parsing of INI files	2023-07-30 09:47:40 +02: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
seth	af59c41713	fix: typo in task.h ... Signed-off-by: seth <getchoo@tuta.io>	2023-07-26 16:20:30 -04:00
TheKodeToad	f505d43fc0	Fix token "0" being replaced ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-24 13:43:26 +01: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	bfafbdc51e	Merge branch 'develop' into env-vars ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-21 14:30:24 +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	593f452986	Merge pull request #1399 from Scrumplex/offline-uuid ... fix: generate predictable UUIDs for offline accounts	2023-07-19 10:16:27 +01:00
Sefa Eyeoglu	f8fcb98c68	fix: generate predictable UUIDs for offline accounts ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-07-18 10:07:35 +02:00
Josiah Glosson	1fbb41f5e2	Make Launch Offline not launch online in 1.6+ ... Signed-off-by: Josiah Glosson <soujournme@gmail.com>	2023-07-17 17:07:06 -05:00
Sefa Eyeoglu	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
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
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
seth	a2a09ffe01	chore: better explain quilt loader beacon ... Signed-off-by: seth <getchoo@tuta.io>	2023-07-15 14:25:05 -04:00
Trial97	6cf7c0a647	Connected last fail signals ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-07-15 20:17:16 +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
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	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
seth	89aaedc06c	feat: add toggle for quilt beacon ... Signed-off-by: seth <getchoo@tuta.io>	2023-07-12 21:10:48 -04:00
TheKodeToad	997a3709d4	Custom environment variables UI and implementation ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-12 19:21:38 +01:00
seth	640aaa8c23	Merge pull request #1331 from TheKodeToad/hungry-trash ... Fix updating trashing resources	2023-07-10 16:31:43 -04: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
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
TheKodeToad	0c6362f28d	Make trash hungry ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-07-08 18:51:28 +01: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
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	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
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
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
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	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
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	5f1074471d	Corected variable name ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-28 13:35:42 +03:00
TheKodeToad	8bebd7f042	Generate special signature ✨ composed of multiple elements instead of relying on timestamp for Java version cache invalidation ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-26 01:30:47 +01:00
Rachel Powers	df4fd7df7f	Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class	2023-06-25 12:43:48 -07:00
Rachel Powers	9c10965997	refactor: split out setting api headers for downloads ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-25 11:09:25 -07:00
Trial97	ce4a86fbcd	Made custom url function ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-25 10:41:29 +03:00
Trial97	158b07a39e	moved getRequiredBy ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-25 00:24:08 +03:00
Trial97	8b576fd2bd	Added translation ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-24 15:59:55 +03:00
Trial97	7fdd68d768	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-06-24 15:58:55 +03:00
leo78913	750209b8bb	fix: fix crash when hiding columns on resource packs page ... Signed-off-by: leo78913 <leo3758@riseup.net>	2023-06-23 16:55:51 -03: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
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
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
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	3e3be9ae6f	Added fallback for quilt if the API or Kotilin is not present ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-20 13:28:57 +03: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
Trial97	b62e4c0cc7	Fixed build ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-19 21:32:19 +03:00
Trial97	f6f0fbbd9f	Fixed removeIf ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-19 21:23:48 +03:00
Trial97	c13a90540c	Added overide for Quilt/Fabric ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-19 21:20:35 +03: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	8ad9692daa	Changed qWarning to qDebug for raw data ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-19 14:10:29 +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
Sefa Eyeoglu	7ad9abf9bc	fix: add JavaVendor as an instance override ... This should suppress a critical error that gets printed every time an instance gets launched, as JavaCheck wants to store the vendor in the instance settings. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-06-15 12:45:03 +02:00
Trial97	182e19eae3	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-06-15 10:35:26 +03:00
TheKodeToad	180ed0cc1a	Merge branch 'PrismLauncher:develop' into skinfix	2023-06-13 11:08:21 +01:00
TheKodeToad	aaab95ba55	Basic Quick Play support ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-06-12 12:08:57 +01:00
PandaNinjas	318d11481d	Resolve other switch fallthrough issues	2023-06-07 19:37:54 -04:00
PandaNinjas	5d425ecc02	Fix the AccountList code ... Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>	2023-06-07 18:14:05 -04:00
PandaNinjas	c225ecbb55	Add sensible defaults in AccountList.cpp ... Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>	2023-06-07 18:01:39 -04:00
Tayou	9b9d439fce	Merge pull request #1111 from Trial97/requires	2023-06-07 18:57:46 +02:00
leo78913	a9302468e7	update resource and data pack pack_format_versions ... Signed-off-by: leo78913 <leo3758@riseup.net>	2023-06-06 16:10:15 -03:00
Trial97	6505a62801	Renamed requires fields ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-06-06 10:34:05 +03:00
Rachel Powers	cc41b039e6	chore: clean up after new compiler warnings ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-06-04 14:59:48 -07: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	4eb9083ddc	refactor: column names as class property, use string names in setting ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-28 13:00:08 -07:00
Rachel Powers	b28f682ad9	Merge branch 'develop' into feature/images-for-resource-page	2023-05-28 12:01:49 -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
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	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
Trial97	94cd831e8d	Made sure the metadata is valid when checking mod deps ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-05-14 22:13:53 +03:00
Trial97	ffcc58cb3e	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-05-14 14:20:24 +03: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	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
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	ee94be624e	use 32x32 images for image column ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-05 11:28:19 -07:00
Rachel Powers	2fe3dc5960	fix: fix qchar conversion and codeql ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-05 11:13:36 -07:00
Rachel Powers	ed185f047f	feat(resourcePackPage): icon column ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-04 23:46:00 -07:00
Rachel Powers	d384d991fa	feat(texturepackPage): icon column ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-04 23:45:24 -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
Rachel Powers	ec157b766e	feat(mod parsing): load extra mod details ... - (image, license, issuetracker) Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-04 23:42:42 -07:00
Trial97	107b470289	Updated required_by as dependency ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-05-04 23:54:46 +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
Sefa Eyeoglu	64ba5e4ed1	Merge pull request #833 from Ryex/advanced_copy_instance	2023-05-02 12:11:41 +02:00
Rachel Powers	b6452215c1	feat: add details signal to Task ... feat: add details to mod pack downloading feat: add logging rule sloading form `ligging.ini at data path root feat: add `launcher.task` `launcher.task.net` and `launcher.task.net.[down|up]load` logging categories fix: add new subtask progress to the end of the lay out not the beginning (cuts down on flickering) Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-01 10:47:50 -07:00
Rachel Powers	9d2f0e4dc8	feat: Propogated subtask progress ... Oh boy this is big. > TaskStepProgress struct is now QMetaObject compatabile and can be sent through signals > Task now has a method to propogates sub task progress it must be signal bound by each task containing a task wishing to report progress of it's children. > Downloads report speed > Tasks now have UUIDS to track them - use when reporting - use when logging - use when storeing them or objects related to them Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-01 10:47:20 -07:00
Rachel Powers	495103f72e	fix: set x-xbl-contract-version header during xbox auth step ... Refrencing GDlauncher and ATLauncher code for auth as well as https://learn.microsoft.com/en-us/gaming/gdk/_content/gc/reference/live/rest/additional/httpstandardheaders it is possible some of microsoft's server's are rejecting our request because of this missing header? Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-05-01 10:43:31 -07:00
Rachel Powers	d80dee2a54	refactor: pass instance ptr to resource models. use it to find instance root. ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-04-29 19:55:37 -07:00
Rachel Powers	788fa40c2a	refactor: Move ini to use QSettings && drop get/setList functions ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-04-29 19:55:24 -07:00
Japa	7298f9c273	Fixed typo ... Signed-off-by: Japa <japa4551@protonmail.com>	2023-04-26 16:06:17 -03:00
Japa	672f5cf160	Update launcher/minecraft/MinecraftInstance.cpp ... Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Japa <japa4551@protonmail.com>	2023-04-21 19:46:33 -03:00
Trial97	2c744da9f7	More cleanup ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-04-21 18:42:06 +03:00
Trial97	ffaa47bf54	Small cleanup ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-04-21 18:42:06 +03:00
Trial97	c1490cd627	Refator task to work with multiple providers ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-04-21 18:42:06 +03:00
Trial97	fac33498db	Made some copy by reference ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-04-21 18:42:06 +03:00
Trial97	f3f8f3574a	Small headers removal ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-04-21 18:42:05 +03:00
Trial97	7bd26ce468	Semi fixed the Modrinth dependency implementation ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-04-21 18:42:05 +03:00
Trial97	bcea19b957	Tried to fix codeQL ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-04-21 18:42:05 +03:00
Trial97	5079ce8d64	Fixed headers ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-04-21 18:42:05 +03:00
Trial97	4fe497cd68	First working version with curseforge mods ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-04-21 18:42:05 +03:00
Japa	92cda68480	Update launcher/minecraft/MinecraftInstance.cpp ... Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com> Signed-off-by: Japa <japa4551@protonmail.com>	2023-04-21 11:18:17 -03:00
Japa	f41426f394	Instance Description displays the last launch date ... Initial Draft using the Standard C++ Library, still requires testing. Signed-off-by: Japa <japa4551@protonmail.com>	2023-04-21 00:30:38 -03:00
Rachel Powers	12f0d51c0c	Fix: signal/slot macro -> func pointer & network fixes ... - convert qt connect calls to use function pointers instead of the signal/slot macros wherever practical (UI classes were mostly left alone, target was tasks and processes) - give signals an explicit receivers to use the static method over the instance method wherever practical - ensure networks tasks are using the `errorOccured` signal added in Qt5.15 over the deprecated `error` signal - ensure all networks tasks have an sslErrors signal connected - add seemingly missing `MinecraftAccount::authSucceeded` connection for `MSAInteractive` login flow Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-04-17 18:23:18 -07:00
Trial97	4fbd5abe41	Added task to load dependencies ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-04-12 00:45:44 +03:00
Trial97	d524935b67	Added task to load local mod information ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-04-11 20:55:10 +03:00
Rachel Powers	458c2f38bc	cleanup: code review sugestions ... clean up translation strings Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-03-20 14:56:33 -07:00
Rachel Powers	a0e03c41c0	fix: typos ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-03-20 14:56:32 -07:00
Rachel Powers	a1053a4c5a	feat: warnings when instance resources are linked ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-03-20 14:56:32 -07:00
TheKodeToad	2e1c123c05	Merge branch 'PrismLauncher:develop' into skinfix	2023-03-10 11:17:06 +00:00
Sefa Eyeoglu	f3f0652d2b	Merge pull request #853 from kumquat-ir/nil ... NilLoader mod metadata support	2023-03-05 13:39:00 +01:00
Sefa Eyeoglu	651e511ff0	fix: use makeShared for importing components ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-03-01 12:33:00 +01:00
Sefa Eyeoglu	4878f1a438	Merge pull request #735 from Scrumplex/import-component	2023-03-01 09:49:47 +01:00
kumquat-ir	dc8109658c	review fixes ... Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>	2023-02-22 13:20:13 -05:00
kumquat-ir	7973b01e81	fix metadata for mods with .nilmod extension ... Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>	2023-02-19 17:21:53 -05:00
TheKodeToad	9cc3d9d4ce	Merge remote-tracking branch 'upstream/develop' into skinfix ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-02-19 11:35:26 +00:00
kumquat-ir	256fc322a8	minor cleanup ... Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>	2023-02-16 12:57:35 -05:00
kumquat-ir	9c2a3231c5	do not create nilmods folder ... "it cant be that easy" - me, clueless Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>	2023-02-13 01:45:23 -05:00
kumquat-ir	c07fff7503	switch to qdcss for parsing ... make it not horrible to look at Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>	2023-02-12 17:23:15 -05:00
kumquat-ir	7896dd19c1	nilmods instance page ... mostly copied from the coremod page impl Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>	2023-02-11 17:46:17 -05:00
kumquat-ir	f5f2d33f93	parse nil metadata ... Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>	2023-02-11 17:46:17 -05:00
Rachel Powers	34460dd77a	ensure command env vars use native path seperators ... fix #824 Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-02-04 12:28:52 -07:00
Sefa Eyeoglu	6ac073e779	fix: fix component uid regex ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-02-03 18:32:57 +01:00
flow	4166d9ab7b	fix: give error when components have bad uids ... This allows other code to reject proceeding when the UID is bad, which is generally a good idea. :p Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: flow <flowlnlnln@gmail.com>	2023-02-02 17:11:24 -03:00
flow	29f7ea752f	refactor: make shared_qobject_ptr ctor explicit ... This turns issues like creating two shared ptrs from a single raw ptr from popping up at runtime, instead making them a compile error. Signed-off-by: flow <flowlnlnln@gmail.com>	2023-01-25 16:57:51 -03:00
Sefa Eyeoglu	199a7df807	refactor: add error handling to component import ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-01-25 10:43:23 +01:00
Sefa Eyeoglu	5186ad95d3	Merge pull request #784 from flowln/fix_resource_folder_double_smart_ptrs	2023-01-25 10:33:01 +01:00
flow	6d27ef5eea	fix(ResourceFolder): don't create two smart ptrs for the same raw ptr ... Signed-off-by: flow <flowlnlnln@gmail.com>	2023-01-24 17:04:01 -03:00
Sefa Eyeoglu	6e841a3b7e	Merge branch 'develop' into remove-updater ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-01-24 14:40:17 +01:00
Sefa Eyeoglu	16477a8f6c	Merge pull request #675 from flowln/generalize_mod_model	2023-01-23 23:58:52 +01:00
Sefa Eyeoglu	1a35fec134	Merge pull request #696 from Ryex/import-all-the-things ... Fixes https://github.com/PrismLauncher/PrismLauncher/issues/581 Fixes https://github.com/PrismLauncher/PrismLauncher/issues/700	2023-01-16 10:04:09 +01:00
Sefa Eyeoglu	cd893e18d2	chore: update license headers ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-01-14 17:21:52 +01:00
flow	cf022524d1	Merge pull request #743 from flowln/fix_mods_with_wrong_modListVersion	2023-01-14 12:19:12 -03:00
flow	ebb0596c1a	fix: don't fail mod parsing when encountering invalid modListVersion ... The spec (admitely a very old one) states that this entry should always have the value "2". However, some mods do not follow this convention, causing issues. One notable example is the 1.6 version of Aether II for 1.7.10, that has this value set at "5" for whatever reason. Signed-off-by: flow <flowlnlnln@gmail.com>	2023-01-13 21:15:10 -03:00
flow	6a18079953	refactor: generalize mod models and APIs to resources ... Firstly, this abstract away behavior in the mod download models that can also be applied to other types of resources into a superclass, allowing other resource types to be implemented without so much code duplication. For that, this also generalizes the APIs used (currently, ModrinthAPI and FlameAPI) to be able to make requests to other types of resources. It also does a general cleanup of both of those. In particular, this makes use of std::optional instead of invalid values for errors and, well, optional values :p This is a squash of some commits that were becoming too interlaced together to be cleanly separated. Signed-off-by: flow <flowlnlnln@gmail.com>	2023-01-13 16:23:00 -03:00
Aaron Sonin	b2f48eaeb8	Merge branch 'PrismLauncher:develop' into instance-accounts	2023-01-12 20:11:46 -08:00
Sefa Eyeoglu	fff52cb247	feat: add button to import component JSONs ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-01-11 13:50:57 +01:00
Rachel Powers	574af2c795	chore: cleanup review suggestions ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-01-09 17:18:08 -07:00
Rachel Powers	03b75bf2a9	feat: Import all the things! ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2023-01-07 15:04:22 -07:00
Sefa Eyeoglu	f3f628410d	Merge pull request #576 from Ryex/identify-zip-packs ... fix https://github.com/PrismLauncher/PrismLauncher/issues/349	2023-01-07 17:33:34 +01:00
TheKodeToad	17317ea308	Move legacy support classes to another jar ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-01-06 09:23:36 +00:00
Aaron Sonin	e0e3d4d8fe	Merge branch 'PrismLauncher:develop' into instance-accounts	2023-01-02 11:59:29 -07:00
Aaron	7e2d78bab5	Allow selecting a default account to use with an instance ... Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>	2023-01-02 11:17:19 -07:00
Rachel Powers	0ebf04a021	fix newlines ... Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-12-30 10:21:49 -07:00
flow	d55f47077a	Merge pull request #626 from leo78913/mods-provider-column ... closes https://github.com/PrismLauncher/PrismLauncher/issues/402	2022-12-30 11:39:03 -03:00
Rachel Powers	7f438425aa	refactor: add an identify function to make easy to reuse ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-12-29 19:47:19 -07:00
flow	257970c27d	refactor(Mods): make provider() return a std::optional ... This makes it easier to check if a mod has a provider or not, without having to do a string comparison. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-29 13:21:49 -03:00
Sefa Eyeoglu	c8d8046412	refactor: add logging category for credentials ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-27 17:04:42 +01:00
Rachel Powers	3691f3a296	fix: cleanup and suggested changes ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-12-26 14:50:15 -07:00
Sefa Eyeoglu	6ea1234a3b	Merge pull request #618 from TheKodeToad/safer-destructive-actions ... Fixes https://github.com/PolyMC/PolyMC/issues/948	2022-12-26 17:48:43 +01:00
Rachel Powers	8422e3ac01	feat: zip resource validation check for flame ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-12-24 20:43:17 -07:00
Rachel Powers	cfce54fe46	fix: update parse tests ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-12-24 20:43:17 -07:00
Rachel Powers	a7c9b2f172	feat: validate world saves ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-12-24 20:43:17 -07:00
Rachel Powers	eb31a951a1	feat: worldSave parsing and validation ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-12-24 20:43:01 -07:00
Rachel Powers	ccfe605920	feat: add shaderpack validation ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-12-24 15:55:10 -07:00
Rachel Powers	878614ff68	feat: add a ModUtils::validate ... moves the reading of mod files into `ModUtils` namespace Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-12-24 09:42:02 -07:00
Rachel Powers	64c51a70a3	feat: add initial support for parseing datapacks ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-12-24 09:42:02 -07:00
TheKodeToad	884bd85495	Skin fix -> online fixes ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-12-23 09:35:29 +00:00
TheKodeToad	94067f34cf	Try to make some of the suggested changes ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-12-23 09:34:26 +00:00
leo78913	aa3633d2d7	fix: translate unknown mod provider ... Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: leo78913 <leo3758@riseup.net>	2022-12-16 11:13:54 -03:00
flow	c440f33122	fix(ResourceModel): use a single ConcurrentTask for parsing tasks ... This avoids creating a bunch of threads that fills up the maximum amount allowed by QThreadPool, and causes a deadlock between the helper threads and the main thread (main thread tries to create threads in painting code, but isn't able to, so it keeps waiting for a thread to free up, but all the threads are waiting on the main thread to process some events). Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-15 13:51:07 -03:00
TheKodeToad	87bcefd08a	Automatically add add-opens if Java version >= 9 ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-12-15 15:28:24 +00:00
leo78913	4ee29b388d	feat: add a provider column to the mods page ... Signed-off-by: leo78913 <leo3758@riseup.net>	2022-12-15 12:02:08 -03:00
TheKodeToad	b544661e81	Experimental skin fix, inspired by craftycodie's ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-12-15 14:59:38 +00:00
Sefa Eyeoglu	849b92665e	Merge branch 'develop' into remove-updater	2022-12-14 23:22:27 +01:00
TheKodeToad	127b094c41	Improve handling of destructive actions ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-12-14 15:20:42 +00:00
Una	822c5a530e	Not all libraries are from Mojang ... Signed-off-by: Una <me@unascribed.com>	2022-12-11 16:11:32 -08:00
Sefa Eyeoglu	7cc42269a9	Merge pull request #569 from Jan200101/PR/fix-mangohud	2022-12-11 18:31:05 +01:00
flow	5622bcc563	Merge pull request #461 from flowln/fix_big_resource_pack_imgs ... Fixes https://github.com/PrismLauncher/PrismLauncher/issues/360	2022-12-11 04:16:21 -08:00
Jan200101	deb9c98630	chore: replace naive mangohud preload with vklayer detection ... Signed-off-by: Jan200101 <sentrycraft123@gmail.com>	2022-12-11 11:01:34 +01:00
Jan200101	514e7ae6a0	fix: re-add LD_LIBARY_PATH to mangohud ... Upstream officially supports the use of $LIB/mangohud/ Signed-off-by: Jan200101 <sentrycraft123@gmail.com>	2022-12-08 23:09:14 +01:00
flow	ab23f542c6	Merge pull request #423 from TheKodeToad/addagent ... Fixes https://github.com/PrismLauncher/PrismLauncher/issues/414	2022-12-02 06:40:18 -08:00
flow	fa98bf1ee7	Merge pull request #481 from ryanccn/import-resource-pack-dialog-uwu	2022-12-02 06:39:54 -08:00
TheKodeToad	31dc82b1a6	Make requested changes ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-29 09:43:08 +00:00
flow	4e27e132a0	fix: don't disable interaction on non-mod models when inst. is running ... It is still useful for mods though, since we don't wnt to allow disabling mods when the instance is running, as that wouldn't affect the running instance, possibly causing confusion Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-28 12:02:38 -03:00
Sefa Eyeoglu	8cac61f0be	fix: check resource pack validity solely using pack format ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-27 18:41:52 +01:00
TheKodeToad	96e8217b00	Button to add agent ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-23 09:46:55 +00:00
Ryan Cao	f916ce8752	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import-resource-pack-dialog-uwu	2022-11-21 23:19:50 +08:00
Sefa Eyeoglu	fdbd8d9d2b	refactor: remove old updater ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-21 16:18:05 +01:00
flow	f55fc51e9b	fix: remove commented-out assertions ... They may not hold true at all times, and that's fine. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-20 11:11:08 -03:00
flow	df0f9259c0	refactor: move RP/TP validation to their respective utils ... This makes it easier to validate individual resources, and allows the logic to be used in other places in the future, if we need to. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-20 11:10:26 -03:00
Sefa Eyeoglu	30607c34a1	Merge pull request #291 from TheKodeToad/betterjavalauncher	2022-11-19 18:45:15 +01:00
Ryan Cao	1f6b8f9d2b	fix instance IDs and resource pack imports ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-19 23:59:30 +08:00
Ryan Cao	a33b804923	fix: add resource pack format for 1.19.3 ... Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com> Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-19 23:47:47 +08:00
Ryan Cao	f527958cb3	fix: check if packFormat is valid for resourcepack parsing ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-19 23:42:56 +08:00
Ryan Cao	b1bdc6f745	fix resource packs and add support for texture packs ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-19 23:38:05 +08:00
Sefa Eyeoglu	ce958f4ffd	refactor: use isEmpty instead of size for lists ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-16 23:20:47 +01:00
Sefa Eyeoglu	40970a1a87	fix: serialize metadata extensions ... Prism has introduced a few extensions to the meta component version format, which were not exported as JSON in the launcher. This caused the `Customize` button on the version page to not write these new properties to the custom component file. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-16 18:11:18 +01:00
Sefa Eyeoglu	8aae652be1	fix: remove unnecessary condition ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-16 18:10:54 +01:00
flow	c4c1e75de8	fix: use QPixmapCache only from the main thread ... It's a required condition. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-15 18:14:03 -03:00
flow	7705f290ca	fix: don't retry to load RP images that can't fit in the cache ... Avoids an infinite loop when the image is too big. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-15 12:07:11 -03:00
flow	cedc7754d9	Merge pull request #428 from DioEgizio/fixes-to-CI	2022-11-14 14:16:01 -08:00
TheLastRar	aef5349aee	Pass index.parent() as parent parameter for rowCount ... Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-14 19:05:57 +00:00
TheLastRar	ac993aa31f	Use Q_UNUSED instead of [[maybe_unused]] in onParseFailed ... Qt5 on Ubuntu cannot handle [[maybe_unused]] in this function Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-14 19:05:57 +00:00
TheLastRar	fce323b945	Check parent in rowCount/columnCount/canFetchMore ... Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-14 19:05:57 +00:00
TheLastRar	5558f3d2cc	Mark paramaters of dropMimeData as unused ... Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-14 19:05:57 +00:00
TheLastRar	08f8623cb7	Mark paramaters of onParseFailed as unused ... Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-14 19:05:56 +00:00
TheLastRar	3cba359d38	Mark paramater runtimeContext as unused ... Base class uses variable, but ImplicitRule does not Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-14 19:05:56 +00:00
txtsd	0a04c3a2a7	fix: Fix the error that CodeQL caught ... Signed-off-by: txtsd <code@ihavea.quest>	2022-11-13 18:54:55 +01:00
Sefa Eyeoglu	392452d422	Merge pull request #397 from flowln/windows_mod_updater_fixes_maybe ... Fixes https://github.com/PrismLauncher/PrismLauncher/issues/226	2022-11-10 14:34:15 +01:00
TheKodeToad	32c2ad2bbd	A lot more cleanup ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-08 17:51:18 +00:00
TheKodeToad	9931c9a286	Remove arguments being passed twice ... Passing the classpath into stdin has no effect. Java is already provided the classpath with -cp, which pretty much takes up the largest part of the arguments anyway, which leads me to wonder, what's the point of stdin arguments at all? Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-08 16:37:00 +00:00
TheKodeToad	e68dcea6bc	Various tweaks to the Java component of the launcher ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-08 16:24:55 +00:00
flow	353b51f11e	refactor: move MMCStrings -> StringUtils ... General utilities can go in here >:) Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-04 16:53:24 -03:00
flow	76050880f1	fix: use unicode variant for marking '.index' hidden ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-04 16:53:21 -03:00
txtsd	8f045af867	Merge pull request #374 from flowln/fix_lto	2022-11-04 15:39:41 +05:30
flow	7956e6f04e	fix: don't use forward-declared Ptr types in meta/ ... This would cause ODR violations when those headers were included in other places that also included stuff like "Version.h" (note the "meta/Version.h"), which can cause problems, especially in LTO. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-01 19:48:26 -03:00
Ryan Cao	8467daa0ec	oop ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-10-31 14:58:38 +08:00
Ryan Cao	27dfe30fe6	Update VerifyJavaInstall.cpp ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-10-31 14:44:11 +08:00
Ryan Cao	19a8d51bf3	fix: more user friendly Java warning text ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-10-30 11:56:43 +08:00
Samisafool	8201d1df02	Rename ... Signed-off-by: Samisafool <thenerdiestguy@gmail.com>	2022-10-19 15:02:43 +05:30
Sefa Eyeoglu	3ac398ac49	fix: use display name in code ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-18 09:50:27 +02:00
Sefa Eyeoglu	fafc9cf9ca	Merge pull request #1033 from Scrumplex/multi-arch-support	2022-10-08 20:12:40 +02:00
Sefa Eyeoglu	3111e6a721	chore: add missing license headers ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-08 20:12:07 +02:00
Sefa Eyeoglu	0dca9cb6b8	Merge pull request #1162 from Trial97/feature/Replace-toml-library	2022-09-30 19:44:45 +02:00
timoreo	9ff364b0d3	huge nit: added const refs, everywhere ... Signed-off-by: timoreo <contact@timoreo.fr>	2022-09-26 11:50:31 +02:00
Alexandru Ionut Tripon	ed261f0af9	Update launcher/minecraft/mod/tasks/LocalModParseTask.cpp ... Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2022-09-25 20:38:55 +03:00
Trial97	600c49f7f0	Replaced tomlc99 with tomlplusplus ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2022-09-24 00:10:27 +03:00
flow	6131346e2f	refactor: change the way instance names are handled ... While working on pack updating, instance naming always gets in the way, since we need both way of respecting the user's name choice, and a standarized way of getting the original pack name / version. This tries to circunvent such problems by abstracting away the naming schema into it's own struct, holding both the original name / version, and the user-defined name, so that everyone can be happy and world peace can be achieved! (at least that's what i'd hope :c). Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:08 -03:00
flow	941d75824a	refactor: add instance creation abstraction and move vanilla ... This is so that 1. Code is more cleanly separated, and 2. Allows to more easily add instance updating :) Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:32:36 -03:00
Sefa Eyeoglu	7bd8bd13fe	feat: support multiarch system classifiers ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-20 16:01:06 +02:00
Sefa Eyeoglu	09e85e948c	refactor: introduce RuntimeContext ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-20 15:59:43 +02:00
Sefa Eyeoglu	9ec1c00887	fix: register JavaRealArchitecture for MinecraftInstance ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-20 15:58:56 +02:00
Sefa Eyeoglu	a24d589845	fix: ensure all resource folders exist ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-20 10:39:05 +02:00
Sefa Eyeoglu	23fc453fae	fix: comments and naming of texture pack stuff ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-20 10:26:15 +02:00
Sefa Eyeoglu	aad6f74db6	fix: tests ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-20 10:26:15 +02:00
Sefa Eyeoglu	07dcefabcb	feat: add texture pack parsing ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-20 10:26:15 +02:00
txtsd	40c68595d7	Merge pull request #1150 from flowln/fix_crash_on_game_quit	2022-09-20 09:41:59 +05:30
flow	0873b8d304	fix: prevent container detaching in ResourceFolderModel ... and use const accessors whenever we can! Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-16 20:12:31 -03:00
flow	c9eb584ac8	fix: prevent deletes by shared pointer accidental creation ... This fixes the launcher crashing when opening the game :iea: Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-16 20:12:30 -03:00
flow	10493bd44a	fix: move newly allocated resources to the main thread ... This avoids them getting deleted when the worker thread exits, due to thread affinity on the created thread. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-16 20:12:30 -03:00
flow	9e35230467	fix: memory leak when getting mods from the mods folder ... friendly reminder to always delete your news. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-16 20:12:30 -03:00
flow	81e326571b	fix: enable demo launch only on supported instances ... e.g. >= 1.3.1 instances Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-15 19:27:42 -03:00
Sefa Eyeoglu	4c7d3a103c	refactor: restructure tests ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-11 22:29:01 +02:00
flow	333dbca01e	Merge pull request #1105 from flowln/better_resource_packs ... Add basic resource pack parsing and fix issues	2022-09-07 08:30:36 -03:00
Sefa Eyeoglu	b70a82c609	Merge pull request #1111 from PolyMC/revert-1067-classpath-epicness	2022-09-05 20:06:33 +02:00
Sefa Eyeoglu	8e3356f11a	Merge pull request #1034 from Scrumplex/detect-performance-features	2022-09-05 17:45:17 +02:00
Sefa Eyeoglu	1b559c7776	Revert "Move classpath definition into NewLaunch itself" ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-05 17:37:10 +02:00
flow	bedd3c50b6	fix: improve handling of unrecognized pack formats ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 15:05:23 -03:00
flow	9db27c6acc	fix: crash when adding resource packs directly in the folder ... This fixes an issue in which, when adding a new resource pack externally to PolyMC, when the resource pack view was open, would crash poly. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37:22 -03:00
flow	42c81395b3	fix: race condition on ResourceFolderModel tests ... This (hopefully) fixes the race contiditions that sometimes got triggered in tests. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37:22 -03:00
flow	3b13e692d2	feat: move resource pack images to QPixmapCache ... This takes care of evicting entries when the cache gets too big for us, so we can add new entries without much worries. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37:22 -03:00
flow	0331f5a1eb	feat(tests): add tests for resource pack parsing ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37:22 -03:00
flow	8a7e117f6b	refactor: move resource pack file parsing utilities to separate namespace ... This makes it easier to use that logic in other contexts. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37:22 -03:00
flow	9b984cedac	feat: add image from pack.png to resource packs ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37:22 -03:00
flow	6a93688b2e	fix: filtering in regex search in resource packs ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37:21 -03:00
flow	3ab17a97a8	fix: sorting by pack format ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37:21 -03:00
flow	f21ae66265	feat: add basic resource pack parsing of pack.mcmeta ... This parses the pack format ID and the description from the local file, from both a ZIP and a folder, and hooks it into the model. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37:21 -03:00
flow	050768c266	feat: add more resource pack info ... Adds pack format id and description to ResourcePack, that'll be parsed from pack.mcmeta. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37:21 -03:00
flow	cda2bfc240	feat: allow specifying factory for resources in BasicFolderLoadTask ... This allows us to hook our own resource type, that possibly has more content than the base Resource, to it. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37:20 -03:00
flow	ba3ac85356	Merge pull request #1067 from Scrumplex/classpath-epicness ... Move classpath definition into NewLaunch itself	2022-08-31 18:28:29 -03:00
flow	ec29cedeb7	Merge pull request #1080 from flowln/eternal_cache ... Never invalidate libraries cache entries by time elapsed	2022-08-31 18:28:07 -03:00
flow	ddf1e1ccee	fix: make FML libraries cache eternal ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-21 13:47:49 -03:00
flow	5ac4e73697	fix: make libraries cache eternal ... This restores the behavior prior to PR #920. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-21 13:47:49 -03:00
flow	0b81b283bf	fix: LGTM warnings ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:49:56 -03:00
flow	e2ab2aea32	change: add enable/disable to resources ... TIL that zip resource packs, when disabled, actually have the effect of not showing up in the game at all. Since this can be useful to someone, I moved the logic for it to the resources. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:49:54 -03:00
flow	c3ceefbafb	refactor+fix: add new tests for Resource models and fix issues ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:49:23 -03:00
flow	e7cf9932a9	refactor: simplify Mod structure ... No need to keep track of pointers left and right. A single one already gives enough headaches! Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:48:51 -03:00
flow	0c9d03f5df	fix(tests): add timeout on ModFolderModel's tests ... If the update never ends, the signal is not emitted and we become stuck in the event loop forever. So a very lenient timer is added to prevent that. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:48:01 -03:00
flow	92aa24ae34	fix: don't give shared pointer to obj. external to the model ... It causes some weird problems and adds refcounting overhead. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:48:00 -03:00
flow	97a74d5c1f	refactor: adapt rest of the codebase to the new resource model ... In order to access the ModFolderModel from the ModFolderPage, i created a new m_model for the correct type, shadowing the m_model of type ResourceFolderModel. This creates two shared_ptr references to the same object, but since they will have the same lifetime, it doesn't generate a memory leak. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:47:58 -03:00
flow	256f8094f5	refactor: make Resource Pack model inherit from ResourceFolderModel ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:47:11 -03:00
flow	1e2f0ab308	refactor: move more tied logic to model and move logic to the resources ... This moves the QSortFilterProxyModel to the resource model files, acessible via a factory method, and moves the sorting and filtering to the objects themselves, decoupling the code a bit. This also adds a basic implementation of methods in the ResourceFolderModel, simplifying the process of constructing a new model from it. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:47:08 -03:00
flow	af2cf2734d	refactor: move things around in the mod model ... Makes the method order in the cpp file the same as in the header file. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:46:33 -03:00
flow	ec62d8e973	refactor: move general code from mod model to its own model ... This aims to continue decoupling other types of resources (e.g. resource packs, shader packs, etc) from mods, so that we don't have to continuously watch our backs for changes to one of them affecting the others. To do so, this creates a more general list model for resources, based on the mods one, that allows you to extend it with functionality for other resources. I had to do some template and preprocessor stuff to get around the QObject limitation of not allowing templated classes, so that's sadge :c On the other hand, I tried cleaning up most general-purpose code in the mod model, and added some documentation, because it looks nice :D Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:45:01 -03:00
flow	3225f514f6	refactor: move general info from Mod to Resource ... This allows us to create other resources that are not Mods, but can still share a significant portion of code. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:41:59 -03:00
Sefa Eyeoglu	92d7e44525	Merge pull request #878 from flowln/lazy_settings	2022-08-20 12:50:56 +02:00
Sefa Eyeoglu	a517f442ea	Merge pull request #1023 from flowln/better_shared_ptr	2022-08-20 12:50:50 +02:00
Sefa Eyeoglu	01505910f4	refactor: move classpath definition into NewLaunch itself ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-08-18 18:14:01 +02:00
flow	2f5e55bea0	fix: only remove orphaned metadata on first opening ... This avoids deleting the metadata while one is updating their mods. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-11 13:11:56 -03:00
Sefa Eyeoglu	d82bb29919	fix: don't apply GameMode/MangoHud, if they aren't supported ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-08-08 21:19:46 +02:00
Sefa Eyeoglu	33af0c6a7c	refactor: don't include mangohud's library path ... This could cause issues on some environments. Users should just put MangoHud libs into global LD_LIBRARY_PATH, just like with any other library Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-08-08 21:16:37 +02:00
flow	362ecdb583	refactor+fix: use QSharedPointer for shared_qobject_ptr ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-04 15:33:51 -03:00
flow	31ba1de53b	fix: remove orphaned metadata to avoid problems with auto-updating insts ... Just as my master has taught me. 🔫 Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-02 16:15:39 -03:00
LennyMcLennington	94a63e3859	Merge pull request #941 from Scrumplex/bump-cxx-standard ... Bump to C++17	2022-07-30 17:10:59 +01:00
flow	1a6cb9ee99	chore: add some debugging prints in AccountList ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-26 15:11:56 -03:00
Sefa Eyeoglu	c65f5f7728	Merge pull request #877 from Scrumplex/refactor-offline-accounts	2022-07-23 13:54:36 +02:00
Sefa Eyeoglu	2e94562f79	fix: treat accounts as offline, if auth servers are down ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-07-23 12:38:01 +02:00
flow	439e7bbf4e	change: unicode chars for folders and disabled mods in mod list ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-22 17:45:27 -03:00
flow	33853b6107	fix: use single-space unicode char for checkmark in mod list ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-22 11:48:08 -03:00
Sefa Eyeoglu	c666c3e251	refactor!: bump to C++17 and C17 ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-07-20 14:22:10 +02:00
flow	54b335711a	fix: raw-pointers and leaks in ModFolderLoadTask ... Co-authored-by: timoreo <contact@timoreo.fr> Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-17 11:56:23 -03:00
flow	de9e304236	fix: std::list -> QList ... Qt6 removed Qlist::toStdList() 😭 Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-17 11:33:45 -03:00
flow	650af5eb64	change: use ModStatus as a simple member instead of a pointer ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-17 11:33:44 -03:00
flow	c4316e81e6	change: make Mod a QObject used as a pointer ... Prevents problems when copying it around! Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-17 11:33:44 -03:00
flow	fd6755c93f	change: mod metadata improvements ... - Use slug instead of name - Keep temporary status before having local details Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-17 11:33:43 -03:00
flow	a53ee2e35c	fix: mod parsing of 'String-fied' version (i.e. OpenBlocks) ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-17 11:33:43 -03:00
flow	91a5c4bdcb	feat: add metadata get/delete via mod id ... This is, in many cases, more reliable than name comparisons, so it's useful specially in cases where a mod changes name between versions Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-17 11:33:43 -03:00
flow	dfab55112b	feat: remove existing mod when updating/redownloading it ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-17 11:33:42 -03:00
flow	2d10c246a8	feat: add update mods to the ui / mod model ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-17 11:33:42 -03:00
flow	43b9db6e45	change: allow deleting mods while preserving their metadata ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-17 11:33:41 -03:00
flow	509f7bd018	fix: move time record overrides to BaseInstance ... This is needed so that we can show time stats in the UI without having to load all type-specific settings, which would make all the previous changes useless :c This is apparently done with console settings too, so I don't think there's a problem doing this too :> Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-12 21:15:59 -03:00
Sefa Eyeoglu	3b4539de79	chore: update license headers ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-07-10 12:19:15 +02:00
Sefa Eyeoglu	15c5bbcf22	fix: fix slots for Qt 6 ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-07-10 12:19:15 +02:00
Sefa Eyeoglu	c363423718	refactor: fix deprecation up to Qt 6 ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-07-10 12:19:15 +02:00
Sefa Eyeoglu	ff2cd50bfa	refactor: replace QRegExp with QRegularExpression ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-07-10 12:17:52 +02:00
Sefa Eyeoglu	984692dc62	refactor: fix deprecation up to Qt 5.15 ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-07-10 12:17:52 +02:00
dada513	3b187b5246	Merge pull request #876 from Scrumplex/revert-updater-stuff ... Revert "fix: remove updater if it is not used"	2022-07-10 10:50:03 +02:00
Sefa Eyeoglu	e6fe701727	Merge pull request #808 from Scrumplex/fix-lgtm-warnings	2022-07-09 01:10:59 +02:00
Sefa Eyeoglu	08989bde5e	Merge pull request #839 from flowln/modrinth_packs_bug_hunt	2022-07-08 16:25:35 +02:00
flow	273cf3d565	feat: lazy-load MinecraftInstance settings ... Makes the startup go fast! vrum Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-06 17:17:54 -03:00
flow	f432cfd73a	change: put settings initialization in a separate function ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-06 16:18:09 -03:00
Sefa Eyeoglu	e210a4b244	Revert "fix: remove updater if it is not used" ... This reverts commit 2ff0aa09e3. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-07-06 18:13:51 +02:00
Sefa Eyeoglu	f1902a4471	Merge pull request #794 from Scrumplex/resolve-jars-dynamically	2022-07-06 17:40:09 +02:00
Sefa Eyeoglu	04b865adae	Merge pull request #707 from Jan200101/PR/gamemode ... Add Performance related settings	2022-07-06 17:11:43 +02:00
Jan200101	cad581388f	Add Performance related settings ... Integrates support for Feral Gamemode, discrete GPU support for Mesa and the proprietary Nvidia driver and MangoHud support Signed-off-by: Jan200101 <sentrycraft123@gmail.com>	2022-07-06 09:34:14 +02:00
flow	e5f6dc1b14	fix: aborts when using a Qt build with assertions enabled ... Preventing undefined behaviour hooray! :D Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-03 12:44:19 -03:00
Sefa Eyeoglu	474d77ac57	feat: resolve JARs dynamically ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-07-03 17:31:01 +02:00
Sefa Eyeoglu	5599b5a337	Merge pull request #855 from Gingeh/account-list	2022-07-03 12:55:36 +02:00
flow	cd22da9c62	Merge pull request #864 from ivanpu/uncensored-offline ... Don't censor "offline" word when that's the access token	2022-07-02 17:56:04 -03:00
flow	fb75c23f4e	Merge pull request #784 from Scrumplex/refactor-cmake ... Refactor tests	2022-07-02 17:50:08 -03:00
Ezekiel Smith	7f22994f68	Merge pull request #831 from flowln/abort_connections ... Add missing connections to the abort signal in some tasks	2022-07-03 01:50:36 +10:00
Ezekiel Smith	e32030f364	Merge pull request #860 from kthchew/fix/status-version ... Show MC version of instance in status bar	2022-07-03 01:47:27 +10:00
Ivan Puntiy	b40619bcbd	don't censor offline access token	2022-07-02 18:05:33 +03:00
Sefa Eyeoglu	8cec4b60a6	fix: update NewLaunch package name	2022-07-01 19:50:41 +02:00
Kenneth Chew	79840f0fca	Remove redundant type name from status bar ... The type name is always "Minecraft", so it showed "Minecraft X.X.X (Minecraft)"	2022-06-30 23:02:56 -04:00