2240 Commits

Author	SHA1	Message	Date
flow	80054e4db2	fix(ManagedPackPage): preserve pack ID from Modrinth update ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:34 -03:00
flow	1630a23fb0	refactor(InstanceImport): require rvalue from 'extra_info' mappings ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:34 -03:00
flow	4e75419e08	fix(ManagedPagePage): don't reload pack info when not needed ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:34 -03:00
flow	089018015a	refactor(ManagedPackPage): use smart pointers instead of raw ones ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:34 -03:00
flow	feb6f285ce	feat(ManagedPackPage): add reload button when in a fail state ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:34 -03:00
flow	cb12c51afc	fix(ManagedPackPage): check app capabilities for creating the CF page ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:34 -03:00
flow	c5c426ecbc	chore(ManagedPackPage): format and add headers ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:33 -03:00
flow	74f7039abf	fix(ManagedPackPage): clear combo boxes when adding new versions ... Prevents versions to undergo mitosis. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:33 -03:00
flow	57b905be24	feat(ManagedPackPage): implement Flame modpack updating button ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:33 -03:00
flow	34794cc4af	fix(ManagedPackPage): give extra_info to InstanceImportTask in MR packs ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:33 -03:00
flow	38f59fdf39	fix(ManagedPackPage): add warning about old bug with pack IDs ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:33 -03:00
flow	527c1113f1	feat(ManagedPackPage): add Flame UI ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:33 -03:00
flow	04dbe28793	fix(ManagedPackPage): better changelog text when fetching / no changelog ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:33 -03:00
flow	968366c2ae	feat+fix: allow forwarding extra info to InstanceImportTask ... This allows us to pass to the creation instances their actual pack ID and version ID, that in Flame's case, are only available before starting to create an instance. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:32 -03:00
flow	7f5dea28bb	feat(ManagedPackPage): add link to the Modrinth's pack page ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:32 -03:00
flow	d4979974b4	fix(ManagedPackPage): better UX for when network requests fail / are pending ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:32 -03:00
flow	9539230915	fix: do not display managed pack page for providers without an impl. yet ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:32 -03:00
flow	25cfa26e7b	fix: use rich text in changelog for modrinth modpacks ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:32 -03:00
flow	0ff8891c66	feat: add ManagedPackPage to the instance pages ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:32 -03:00
flow	58d2c15ffa	feat: add functionality to MR modpack update in the page :D ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:32 -03:00
flow	82699cc297	feat: allow skipping the update confirmation dialog ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:32 -03:00
flow	08d008a5aa	refactor: abstract away update confirmation dialog ... ... so that we can avoid code duplication. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 17:00:29 -03:00
flow	9e17ff884f	feat: add PageContainer::getPage ... This allows us to directly access a page from outside. This will be useful for telling the ManagedPackPage who is the window it's on, so that we can close it when updating :^) Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 16:54:54 -03:00
flow	1c567232e3	feat: add (current) indicator to the currently installed version in MR ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 16:54:54 -03:00
flow	cba2608c1c	feat: add logic for the modrinth instance modpack page ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 16:54:54 -03:00
flow	e5c42f68c2	feat: add basic ManagedPackPage classes ... The idea is to have a base class that defines common behavior, and subclasses for each modpack provider, adding specific behavior. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 16:54:54 -03:00
flow	02b4468bcd	feat(ui): add ManagedPackPage ui ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-06 16:54:50 -03:00
Sefa Eyeoglu	746f6945da	fix: remove rogue notr ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-06 20:52:32 +01:00
Sefa Eyeoglu	5cab4d8864	chore: reformat code ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-06 20:52:31 +01:00
Sefa Eyeoglu	5cedfcbfaf	chore: add license headers ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-06 20:52:14 +01:00
Sefa Eyeoglu	c06abd9b6b	refactor: replace Open All with Open Missing ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-06 20:52:13 +01:00
Sefa Eyeoglu	e08d97825d	feat: implement lax filename match in BlockedModsDialog ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-06 20:51:18 +01:00
Sefa Eyeoglu	d61323aa6d	fix: improve resize behavior of BlockedModsDialog ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-06 20:51:18 +01:00
flow	5ae044db93	Merge pull request #556 from DioEgizio/modrinth-icon-larger	2022-12-06 11:50:35 -08:00
flow	c6e4fdac7e	Merge pull request #557 from Scrumplex/fix-fswatcher-segfault ... Closes https://github.com/PrismLauncher/PrismLauncher/issues/555	2022-12-06 11:50:03 -08:00
Sefa Eyeoglu	c8c3fe1023	chore: add license headers ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-06 13:18:50 +01:00
Sefa Eyeoglu	85bddbed86	chore: reformat code ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-06 13:16:27 +01:00
Edgar Onghena	318a2a429c	Fix minutes unit ... Replaced "m" with "min" in `Time::prettifyDuration` Signed-off-by: Edgar Onghena <dev@edgar.bzh>	2022-12-06 13:01:43 +01:00
Sefa Eyeoglu	07359865c6	fix: don't allocate BlockedsModsDialog ... Fixes temporary memory leak! Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-05 21:39:26 +01:00
Sefa Eyeoglu	2fd7338cd3	dix: disable FS watcher after closing BlockedModsDialog ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-05 21:39:24 +01:00
DioEgizio	ce3cfa212c	fix: make modrinth icon larger ... before it was considerably smaller than the other modpack platform icons which looked weird Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2022-12-05 20:27:29 +01:00
DioEgizio	b29c99656e	Merge pull request #546 from DioEgizio/add-server-icon ... feat: add a proper server icon	2022-12-05 07:49:55 +01:00
DioEgizio	aceafb28f6	feat: add server icon to simple colored icons too ... Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Co-Authored-By: leo78913 <leo3758@riseup.net>	2022-12-04 21:29:00 +01:00
flow	928939cbe3	fix(Inst.Copy): create FS::copy object inside the secundary thread ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-04 12:29:38 -03:00
DioEgizio	2462b8e524	feat+fix: better flat icon ... Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2022-12-04 13:30:24 +01:00
DioEgizio	263a72879d	fix: oyxgen is lgpl3! ... Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2022-12-04 12:50:40 +01:00
DioEgizio	70620d5137	feat: add a proper server icon ... Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2022-12-04 12:45:39 +01:00
Ryan Cao	fa3caf091a	fix: warn before trashing instances ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-12-03 21:54:41 +08:00
Sefa Eyeoglu	5c6f325071	Remove blue-ish tint from remaining flat white icons ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-02 20:47:11 +01:00
Sefa Eyeoglu	b9a17f5999	Merge branch 'upstream/develop' into develop ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-12-02 20:46:04 +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
flow	3cc987a5b4	fix: explicitly set scheme for local file in -I argument ... Otherwise isLocalFile() will return false for local files without the file:// thingy. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-01 22:54:03 -03:00
flow	386fb28a35	fix(FileResolvingTask): Fail instead of crash when there's API errors ... Also remove non-used variable (rip). Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-01 15:33:35 -03:00
flow	79b79b752c	fix(Inst.Import): Show error reason in fail dialog ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-01 15:32:26 -03:00
flow	a116778402	fix(Inst.Import): don't search inside 'overrides/' for the manifest ... It will never be there anyways, and saves a **bunch** of time when the overrides folder is big and we traverse all the tree when searching for the MMC 'instance.cfg' file. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-12-01 15:15:15 -03:00
Sefa Eyeoglu	9e1653ebb4	Merge pull request #436 from Scrumplex/feat-change-maxmem ... Closes https://github.com/PrismLauncher/PrismLauncher/issues/426	2022-11-30 18:22:55 +01:00
flow	42c00213ce	Merge pull request #238 from santiagocezar/new-icons	2022-11-29 14:30:29 -08:00
Sefa Eyeoglu	52d06ed814	chore: move instance_icons.svg ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-29 20:07:00 +01: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	a5b0b4800a	fix: make resource buttons work when instance is running ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-27 23:10:32 +01:00
Santiago Cézar	e6244c937a	Merge branch 'develop' into new-icons ... Signed-off-by: Santiago Cézar <48573316+santiagocezar@users.noreply.github.com>	2022-11-27 16:28:42 -03:00
Santiago Cézar	3cbf8d4993	resolving reviews ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>	2022-11-27 16:24:45 -03:00
Sefa Eyeoglu	f3279a0697	Merge remote-tracking branch 'upstream/develop' into import-resource-pack-dialog-uwu	2022-11-27 20:05:21 +01: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
Sefa Eyeoglu	236c196e68	fix: improve code readability ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-27 18:38:56 +01:00
DioEgizio	c90f2c3ac6	fix: use monochrome icon for breeze ... Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2022-11-26 15:05:08 +01:00
Santiago Cézar	a8943ce1ee	remove unused ftb icon ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>	2022-11-25 15:15:08 -03:00
Santiago Cézar	71d35dc70b	meat is now round ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>	2022-11-25 15:15:08 -03:00
Santiago Cézar	9daf2a2996	resize to 24x24 ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>	2022-11-25 15:15:07 -03:00
Santiago Cézar	f5d6aea942	forgot ftb ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>	2022-11-25 15:15:07 -03:00
Santiago Cézar	5850447fd0	merge with upstream ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>	2022-11-25 15:14:52 -03:00
Santiago Cézar	e12a7a4415	gradients! ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>	2022-11-25 14:22:49 -03:00
Santiago Cézar	81d84b8d02	initial icons ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>	2022-11-25 14:22:49 -03:00
flow	bae0a0530b	fix(RPImportDialog): allow changing item size to accomodate wrapped text ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-25 11:51:08 -03:00
Sefa Eyeoglu	cbf4159c7e	fix: add missing shortcut icons ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-25 14:03:10 +01:00
flow	4a1d082614	reafctor(WideBar): connect to signal instead of overriding menu method ... This makes stuff more standard and closer to what we do in other places in the codebase. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-25 09:33:05 -03:00
Sefa Eyeoglu	fd8b4c5368	Merge pull request #227 from Leo40Git/feature/instance-shortcuts ... Closes https://github.com/PrismLauncher/PrismLauncher/issues/210	2022-11-25 13:11:00 +01:00
Sefa Eyeoglu	5872c34315	Merge pull request #412 from leo78913/legacy-icons ... add the missing icons to the legacy icon theme	2022-11-25 08:36:42 +01:00
TheKodeToad	96e8217b00	Button to add agent ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-23 09:46:55 +00:00
flow	20c281d6f8	fix: reset wide bar settings when the list of actions changes ... This prevents changes to the actions to cause non-intuitive issues in the Wide bar, hiding items that previously weren't hidden. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-22 14:30:54 -03:00
Trisave	66f9fed2f2	Remove blue-ish tint from flat white icons ... Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com>	2022-11-22 18:30:21 +01: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
Sefa Eyeoglu	4208c2c72a	fix: actually emit fileCopied ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-21 15:47:15 +01:00
DioEgizio	5cc91965d0	Merge pull request #487 from TayouVR/breeze-icon-themes	2022-11-21 14:43:58 +01:00
Sefa Eyeoglu	c74f852364	Merge pull request #243 from Scrumplex/migration-dialog ... Closes https://github.com/PrismLauncher/PrismLauncher/issues/46 Closes https://github.com/PrismLauncher/PrismLauncher/issues/204	2022-11-21 12:14:49 +01:00
Ryan Cao	7096f02b88	fix: text wrapping ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-21 18:15:03 +08:00
Sefa Eyeoglu	884fe0d574	feat: validate maximum memory allocation in wizard ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-20 18:16:19 +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
Tayou	bb7a321c6e	add breeze themes ... Signed-off-by: Tayou <tayou@gmx.net>	2022-11-20 05:24:10 +01:00
flow	2d69d63efe	feat(InstancePages): save/load wide bar visibility settings ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-19 18:41:31 -03:00
flow	479843f56b	feat(WideBar): allow loading/unloading visibility via a byte array ... I really wanted to use a QBitArray :c Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-19 18:41:31 -03:00
flow	6e1639551b	feat(WideBar): allow hiding buttons with right-click ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-19 18:41:30 -03:00
flow	2367903ac6	refactor: clean up WideBar a bit ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-19 18:41:30 -03:00
Sefa Eyeoglu	30607c34a1	Merge pull request #291 from TheKodeToad/betterjavalauncher	2022-11-19 18:45:15 +01:00
Ryan Cao	d92ae530d7	fix: stray include ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-20 00:34:44 +08:00
Ryan Cao	e0e428ce38	fix: add support for CLI and drag and drop ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-20 00:28:35 +08:00
jopejoe1	d1db7a0e23	Fix New Zealand English display ... Signed-off-by: jopejoe1 <34899572+jopejoe1@users.noreply.github.com>	2022-11-19 16:28:27 +00:00
Ryan Cao	a99cd16422	fix: resource pack import dialog icons and add message ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-20 00:14:16 +08: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
Ryan Cao	8dacbafc8b	feat: initial support for smart resource pack parsing on file handler ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-19 23:14:57 +08:00
Sefa Eyeoglu	c6d9edb78f	chore: improve display names of more languages ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-18 22:21:55 +01:00
DioEgizio	dbd01d35e6	Merge pull request #455 from leo78913/menubar-stuff	2022-11-18 17:20:50 +01:00
flow	b24c09665f	Merge pull request #439 from Ryex/better-blocked-mods	2022-11-17 11:29:28 -08:00
Rachel Powers	52d43f843b	feat(BlockModsDialog): remove redundant Ui info ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-17 11:46:14 -07:00
flow	5cf2a8b5fc	Merge pull request #454 from RedsonBr140/menu-themes	2022-11-17 09:47:55 -08:00
Redson	f72ac94c11	fix: Fix usage below ... Signed-off-by: Redson <redson@riseup.net>	2022-11-17 06:39:05 -03:00
RedsonBr140	bd3a693e70	chore: Change var name ... Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: RedsonBr140 <redson@riseup.net>	2022-11-17 06:20:53 -03:00
Sefa Eyeoglu	298871e207	Merge pull request #467 from Scrumplex/fix-meta-extensions-json ... Fix serialization of components with custom metadata	2022-11-16 23:54:26 +01: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
RedsonBr140	37a117d2ef	chore: Var definition inside the for loop ... Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: RedsonBr140 <redson@riseup.net>	2022-11-16 12:24:28 -03:00
Fayne Aldan	e8b871ac72	Merge branch 'PrismLauncher:develop' into version	2022-11-15 18:34:24 -07:00
Fayne Aldan	9f30c6d94b	Add commit hash to --version ... Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>	2022-11-15 18:33:51 -07: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
leo78913	7439fd6bcb	fix: Fix some stuff in the menu bar ... - Remove duplicated launch actions - Enable the add instance action icon in menus - Remove ugly separator at the end of the help menu if the updater is disabled - Add icons to the help and news menu items Signed-off-by: leo78913 <leo3758@riseup.net>	2022-11-15 10:56:41 -03:00
Redson	6fe626ab9a	feat: Make the changes persistent. ... Signed-off-by: Redson <redson@riseup.net>	2022-11-15 06:09:13 -03:00
Redson	a12f892841	fix: Check the box when the theme is changed via settings ... Signed-off-by: Redson <redson@riseup.net>	2022-11-15 05:46:24 -03:00
Redson	aa3ea79f94	fix: Check the current theme box on startup. ... Signed-off-by: Redson <redson@riseup.net>	2022-11-15 05:38:31 -03:00
Redson	ef53455b66	fix: Build on QT6 ... Signed-off-by: Redson <redson@riseup.net>	2022-11-15 05:19:46 -03:00
ADudeCalledLeo	ba46ff6692	Merge remote-tracking branch 'upstream/develop' into feature/instance-shortcuts	2022-11-15 10:05:04 +02:00
leo78913	0e916244f0	feat: Add themes and their logic. ... Signed-off-by: leo78913 <leo3758@riseup.net>	2022-11-14 21:10:48 -03:00
RedsonBr140	1e4ee02cbc	Merge branch 'PrismLauncher:develop' into menu-themes	2022-11-14 21:09:37 -03:00
flow	cedc7754d9	Merge pull request #428 from DioEgizio/fixes-to-CI	2022-11-14 14:16:01 -08:00
flow	fece9e207b	Merge pull request #448 from TheLastRar/fixup-warnings	2022-11-14 14:15:46 -08:00
ADudeCalledLeo	cca052ccc9	Restore QRC headers ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-14 22:46:41 +02:00
Sefa Eyeoglu	5be9472912	fix: fix potentially uninitialized variable ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-14 21:20:38 +01:00
Redson	be765f8d88	feat: Add empty menu ... Signed-off-by: Redson <redson@riseup.net>	2022-11-14 16:33:25 -03:00
leo78913	8d6aecd944	add the missing icons to the legacy icon theme ... Signed-off-by: leo78913 <leo3758@riseup.net>	2022-11-14 16:16:52 -03: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	f8a137a26e	Mark loadExtraPackInfo abstract ... All classes that inherit from ModModel override this method 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
TheLastRar	b8d7aedb2c	Mark paramater line as unused in guessLevel() ... The base method doesn't use this variable, but classes overriding this method do Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-14 19:05:56 +00:00
TheLastRar	55c7b291e1	Remove unused qhash function ... Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-14 19:05:56 +00:00
TheLastRar	472d931b4b	Prefix member variables in HttpMetaCache ... MSVC warns about shadowing variables Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-14 19:05:56 +00:00
ADudeCalledLeo	ce892c9e77	Add icon ... NOTE: Currently missing on Legacy, Flat and Flat (White) Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-14 21:02:31 +02:00
Sefa Eyeoglu	e14b998da3	refactor: improve readability ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-14 18:38:12 +01:00
Ryan Cao	2c9452efaf	Merge branch 'develop' into macos-add-to-path	2022-11-14 19:26:31 +08:00
Ryan Cao	97a7af855f	slight reword: "install to PATH" ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-14 19:21:47 +08:00
ADudeCalledLeo	5be8545edc	Windows, Linux: prevent segfault on missing icon ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-13 20:18:51 +02: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
ADudeCalledLeo	acd50969e0	Linux: remove TryExec entry from .desktop files ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-13 19:50:27 +02:00
ADudeCalledLeo	b0269e6dfc	Linux: fixes ... - Fix shortcut icons - Possibly fix shortcut creation on AppImages - Fix shortcut not working if path to launcher contains spaces Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-13 17:51:29 +02:00
ADudeCalledLeo	43b9d9484d	tabs -> spaces ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-13 15:49:28 +02:00
ADudeCalledLeo	69bbb29328	Mac: attempt 2 ... - create .command files instead of .sh - fix shortcuts not working if path to Prism Launcher contains spaces - fix path to executable in shortcutss - add check for running from extracted folder (prevents creating shortcuts) Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-13 15:47:37 +02:00
flow	577069cfb4	fix: don't have the clear button on instance page filters ... This thing is otherworldly unoptimized. o.O Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-12 19:23:57 -03:00
Sefa Eyeoglu	fe94c3609e	fix: implement code review suggestions ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-12 20:28:30 +01:00
Sefa Eyeoglu	173aed7fd8	chore: add REUSE headers ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-12 20:28:30 +01:00
Sefa Eyeoglu	335bec68fb	fix: prevent abort for un-abortable tasks ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-12 20:28:30 +01:00
Sefa Eyeoglu	bbb7e9f5c7	feat: show current copy operation in migration dialog ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-12 20:28:30 +01:00
Sefa Eyeoglu	086304f7f2	feat: add initial Migration dialog ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-12 20:28:30 +01:00
Sefa Eyeoglu	bd7065eece	feat: add SimplePrefixMatcher ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-12 20:28:30 +01:00
Sefa Eyeoglu	15aaff7c1c	feat: add dryRun to copy operation ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-12 20:28:29 +01:00
Sefa Eyeoglu	e048bce13e	refactor: allow copy operation with whitelist ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-12 20:27:13 +01:00
Sefa Eyeoglu	ddfb449b28	fix: remove PolyMC data paths ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-12 20:27:13 +01:00
ADudeCalledLeo	5322155b19	Mac: fix build ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:48:21 +02:00
ADudeCalledLeo	45ce72593a	Windows: remove icon if shortcut creation fails ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:43:58 +02:00
ADudeCalledLeo	b813c867b5	refactor #if checks ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:41:52 +02:00
ADudeCalledLeo	f7d7d76ee8	Mac: now supported! [UNTESTED] ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:36:49 +02:00
ADudeCalledLeo	7e5076b068	Linux: fix path shortcut is written to ... Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:19:32 +02:00
ADudeCalledLeo	dbe0553b4a	Move addAction call above left-align loop ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:19:31 +02:00
ADudeCalledLeo	9be48f1dc4	this ain't static, falco ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:19:31 +02:00
ADudeCalledLeo	6043444e4e	Apply suggestions from code review ... Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:19:30 +02:00
ADudeCalledLeo	487e352642	Fix nested #if directive ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:19:29 +02:00
ADudeCalledLeo	cc5f82bfac	Windows: fix window icon being replaced ... Dunno why it happens but the fix was literally 2 lines, so whatever I guess Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:19:28 +02:00
ADudeCalledLeo	4d4dfab388	Windows: add instance icon to shortcut ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:19:28 +02:00
ADudeCalledLeo	b83f9be1bd	Add missing fail check for CoInitialize ... Add a few comments Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:19:27 +02:00
ADudeCalledLeo	6ae3b183fd	Remove unnessecary "is defined" check ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:19:27 +02:00
ADudeCalledLeo	f12117c532	[UNTESTED] Linux: add icons to shortcuts ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:19:26 +02:00
ADudeCalledLeo	70768189ba	Windows: implement FS::createShortcut ... Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:19:25 +02:00
ADudeCalledLeo	30b266622c	Add 'Create shortcut' button to instance toolbar ... Implemented on Windows only rn! Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>	2022-11-12 20:18:49 +02:00
Rachel Powers	25b306b7e1	feat: mark folder paths as links ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-11 18:32:11 -07:00
Rachel Powers	9af1b00df5	feat: add list of watched folders ... move explanation text into dialog class and it's own label Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-11 18:05:19 -07:00
Rachel Powers	51c27e2748	always use the pending path set to avoid task duplication. ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-11 16:33:52 -07:00
Rachel Powers	b9e2c3524c	chore: clang format & cleanup ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-11 16:07:57 -07:00
Rachel Powers	3f6cc17818	properly handle a currently running hashing task ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-11 15:45:40 -07:00
Rachel Powers	5909af9878	drag&drop + add folder to watch ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-11 14:17:33 -07:00
flow	64576f4c4c	Merge pull request #304 from Ryex/move-downloads ... Fixes https://github.com/PrismLauncher/PrismLauncher/issues/222	2022-11-11 12:48:53 -08:00
Sefa Eyeoglu	b57fee1a44	fix: swap spin box and state icon ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-11 15:24:14 +01:00
Sefa Eyeoglu	cabd887866	feat: use icons to show memory allocation state ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-11 15:22:16 +01:00
Sefa Eyeoglu	863a168cb5	feat: raise memory limits to 1TiB ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-11 15:05:00 +01:00
Sefa Eyeoglu	5ee4fb3522	feat: validate maximum memory allocation ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-11 15:04:05 +01:00
Rachel Powers	2f10fa8b61	add some extra debug logs for CF blocked mods ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-11 05:41:32 -07:00
flow	46a8e18841	Merge pull request #367 from TheKodeToad/linkjumping ... fix https://github.com/PrismLauncher/PrismLauncher/issues/363	2022-11-10 08:08:44 -08:00
flow	6c53e68a52	Merge pull request #406 from Scrumplex/fix-clear-metadata	2022-11-10 07:50:14 -08: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	99ed0b6c2c	Implement flowln's suggestions ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-10 11:14:58 +00:00
Sefa Eyeoglu	e6d057fe6d	Merge pull request #415 from TayouVR/fix-main-warning	2022-11-09 18:27:40 +01:00
flow	9ad6eb11a3	refactor: fix CodeQL warnings in StringUtils::naturalCompare ... I have no idea why this function exists, so better to just let it exist. =D Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-09 14:14:25 -03: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
txtsd	fcb9733df0	Merge pull request #392 from PrismLauncher/max_ram_logic	2022-11-08 12:23:24 +05:30
flow	589d160515	fix: use cross-platform toStdString in FlameHasher ... Almost the same issue from toml++ :p Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-07 14:04:48 -03:00
Tayou	9ac6114b63	Fix warning in main function ... main could according to the compiler end up not returning. of course it will always return, but I satisfied the compiler by adding a default case. Signed-off-by: Tayou <tayou@gmx.net>	2022-11-07 14:33:37 +01:00
TheLastRar	456999eee6	Fix: Configuration-less config for Qt Install ... Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-06 14:25:38 +00:00
TheKodeToad	16e3b786fc	Implement Scrumplex's suggestions ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-06 10:09:06 +00:00
DioEgizio	126bbd67f7	Merge pull request #405 from AshtakaOOf/spooky	2022-11-06 07:27:39 +01:00
Sefa Eyeoglu	9fb80a2687	Merge pull request #242 from marcelohdez/more-copy-options	2022-11-06 01:10:24 +01:00
Sefa Eyeoglu	d5d224d89a	fix: save metacache after clearing ... If the user closes the launcher right after clearing, it probably didn't actually clear the cache yet. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-06 01:05:13 +01:00
Sefa Eyeoglu	4708ce4226	refactor: rename halloween cats to -spooky ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-06 00:47:33 +01:00
Sefa Eyeoglu	a0580946dc	fix: allow -ween variants for all cats ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-11-06 00:04:43 +01:00
Sefa Eyeoglu	e68fd7c1e3	Merge pull request #383 from leo78913/toolbar-lock	2022-11-06 00:00:47 +01:00
Adrien	369419870e	add: Spooky Rory ... Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com>	2022-11-05 23:55:43 +01:00
leo78913	0938f80b41	Update launcher/ui/MainWindow.cpp ... Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: leo78913 <leo3758@riseup.net>	2022-11-05 18:10:36 -03:00
Ryan Cao	3df31579a1	fix: @timoreo22 ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-05 22:31:38 +08:00
Ryan Cao	f1d3481a29	fix: remove dumb FS::symlink function ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-05 22:25:22 +08:00
Ryan Cao	cf3aad9c41	fix: use osascript to get admin privileges ... inspired from VSCode's approach Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-05 22:18:05 +08:00
Ryan Cao	7b1e68bfa8	initial support for add to PATH action ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-11-05 22:17:59 +08:00
Sefa Eyeoglu	4af22d663a	Merge pull request #229 from ryanccn/macos-drag-n-drop	2022-11-05 11:17:21 +01:00
Sefa Eyeoglu	ba8322aa5c	Merge pull request #396 from leozamboni/develop	2022-11-05 11:17:13 +01:00
Sefa Eyeoglu	e4bd82190a	Merge pull request #149 from TayouVR/better-custom-themes	2022-11-05 11:16:41 +01:00
Sefa Eyeoglu	695734636f	Merge pull request #294 from piperswe/add-snapcraft-yml	2022-11-05 11:09:51 +01:00
Sefa Eyeoglu	5e9b26dbef	Merge pull request #366 from TheLastRar/MSVC-Build	2022-11-04 23:49:54 +01:00
flow	d35c2db41e	fix: separate types of std::string in Packwiz ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-04 16:53:25 -03:00
flow	dff5fea976	feat: add more separation between types of std::string in StringUtils ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-04 16:53:25 -03:00
flow	ab6c7244fc	refactor: move FS's toStdString to StringUtils ... This is so that anyone can use it :) Signed-off-by: flow <flowlnlnln@gmail.com>	2022-11-04 16:53:25 -03: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
TheLastRar	e29259cd55	Fix: Resolve ambiguous overload errors ... Clang-cl fails to select the correct function and instead errors Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-04 18:11:39 +00:00
TheLastRar	f8ad1a052f	CMake: Support multi-configuration generators ... Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-04 18:11:38 +00:00
TheLastRar	653a953d2f	CMake: Add zlib ... Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-04 18:11:35 +00:00
leozamboni	9f5537d936	feat: spooky cat for halloween ... Signed-off-by: leozamboni <leonardonunes169@gmail.com>	2022-11-04 15:09:57 -03:00
Sefa Eyeoglu	21a7af535c	Merge branch 'develop' into macos-drag-n-drop	2022-11-04 18:30:42 +01:00
txtsd	8f045af867	Merge pull request #374 from flowln/fix_lto	2022-11-04 15:39:41 +05:30
TheLastRar	e682c3e9b8	Fix: Correct exclusions for debug QT plugins ... Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-03 21:35:28 +00:00
TheLastRar	c993209b76	Fix: Explicitly specify Version.h path ... MSVC uses a different search mechanism that ends up picking the mete Version.h Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-11-03 21:35:27 +00:00
Tayou	c2f37716e5	clang_format for PR files ... I'm getting a rendezvous... I thought I did this already Signed-off-by: Tayou <tayou@gmx.net>	2022-11-03 05:05:07 +01:00
Tayou	e9bfd43ff7	added requested changes ... Signed-off-by: Tayou <tayou@gmx.net>	2022-11-03 05:04:36 +01:00
leo78913	3d11d044d2	add an option to lock the toolbars ... Signed-off-by: leo78913 <leo3758@riseup.net>	2022-11-02 20:33:02 -03:00
TheKodeToad	cb796dbdfb	Remove unnecessary block ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-02 16:38:32 +00:00
Sefa Eyeoglu	094b57bb23	Merge pull request #372 from santiagocezar/rory	2022-11-02 12:06:08 +01:00
Santiago Cézar	9ca4f19aea	remove logcat ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>	2022-11-02 07:45:43 -03:00
TheKodeToad	a29d88c313	Even more fixes ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-02 09:59:58 +00:00
TheKodeToad	a1ed8154f7	Another fix ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-02 09:31:39 +00:00
TheKodeToad	6c45a990ef	A good use of auto ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-02 09:13:44 +00:00
TheKodeToad	8dfa3393dc	Formatting and forward-declaration ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-02 08:43:46 +00:00
txtsd	d12323396f	Merge pull request #346 from ryanccn/more-user-friendly-java-warning-text-ahaha	2022-11-02 10:38:26 +05:30
Santiago Cézar	48d34741f3	keyboard navigation is important ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>	2022-11-01 22:53:45 -03:00
Santiago Cézar	76203018e9	forgot the qrc ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>	2022-11-01 20:21:34 -03:00
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
Santiago Cézar	668342b470	add rory flat too (and holiday variants) ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com> Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>	2022-11-01 19:31:37 -03:00
Santiago Cézar	0a0ce74105	add rory ... Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com> Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>	2022-11-01 19:06:27 -03:00
txtsd	718a9a3559	change: Update credits ... Replaces txtsd's GitHub link with their website Moves DioEgizio and flowln from contributors to dev team Signed-off-by: txtsd <code@ihavea.quest>	2022-11-02 01:20:58 +05:30
Tayou	afcdf4b9cf	condensed icon theme code ... Signed-off-by: Tayou <tayou@gmx.net>	2022-11-01 20:18:07 +01:00
Tayou	a3f5ea3598	added suggested changes ... Signed-off-by: Tayou <tayou@gmx.net>	2022-11-01 20:17:53 +01:00
Tayou	fef60a9da0	add support for multiple custom themes ... also moved theme related code from Application.cpp to new ui/themes/ThemeManager.cpp, this class should cleanly isolate theme related functions and help avoid code duplication in future theme related additions. Themes can now be just qss or css files, they won't have color pallette information with them in that case Signed-off-by: Tayou <tayou@gmx.net>	2022-11-01 20:10:12 +01:00
TheKodeToad	576867605d	Add another fallback ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-01 18:40:12 +00:00
TheKodeToad	d1626d20bd	Slight cleanup ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-01 18:30:11 +00:00
TheKodeToad	c890aa18f7	Only select correct mod ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-01 18:25:54 +00:00
TheKodeToad	6c7d040439	Hacky tweaks ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-01 18:12:27 +00:00
TheKodeToad	d03ae34b61	Auto-select first result ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-01 17:19:54 +00:00
TheKodeToad	b9547adce7	Add more license headers ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-01 17:02:24 +00:00
TheKodeToad	7f32c6464d	Initial better mod browser link implementation ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2022-11-01 16:58:22 +00:00
Rachel Powers	209a1650e4	clang_format and code cleanup ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-01 07:06:36 -07:00
Rachel Powers	6010ce0dc5	chore(remove FS::copyFile): ... Now that #333 is merged and FS::copy works on non directory copyFile can be removed. Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-01 04:28:57 -07:00
Rachel Powers	a7a331a26e	ensure FS::copyFile is marked for removal ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-01 04:24:11 -07:00
Rachel Powers	fda2c116be	code quality cleanup ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-01 04:24:11 -07:00
Rachel Powers	d2f3dbaa29	fix mispellings and wrap strings for translation ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-01 04:24:11 -07:00
Rachel Powers	e9d4793b1e	minor clean up and add some docs ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-01 04:24:11 -07:00
Rachel Powers	13c7efa058	copy found mods to instance (FTB and Flame) ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-01 04:24:11 -07:00
Rachel Powers	1598d65824	watch filesystem, compute and match hashes ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-01 04:24:11 -07:00
Rachel Powers	028e086960	send blocked mod info to dialog & prototype UI ... Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>	2022-11-01 04:24:11 -07:00
timoreo	04b39294ba	Merge pull request #333 from flowln/fix_atl_packs_post_modpack_update	2022-11-01 09:56:16 +01:00
timoreo	3a446c410c	Merge pull request #329 from flowln/only_safe_workarounds	2022-11-01 09:55:43 +01:00
Chrono	ce1a4857cc	Merge branch 'PrismLauncher:develop' into develop	2022-10-31 20:06:59 -04:00
Chrono	dfdf739282	remove one space ... Signed-off-by: Chrono <me@disilla.org>	2022-10-31 19:44:55 -04:00
Sefa Eyeoglu	7086b1e65c	Merge pull request #351 from Scrumplex/fix-trash	2022-10-31 22:56:07 +01:00
Sefa Eyeoglu	f2d445d27b	fix: fix undo key sequence ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-31 11:34:48 +01:00
Sefa Eyeoglu	29d362a6e0	fix: do not trash instances in Flatpak ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-31 11:34:46 +01:00
DioEgizio	c8adc4e356	Merge pull request #354 from Scrumplex/translations-maybe ... Improve display names of certain languages	2022-10-31 08:43:43 +01:00
Ryan Cao	8467daa0ec	oop ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-10-31 14:58:38 +08:00
DioEgizio	13e14b712e	Merge pull request #352 from TheLastRar/Win-setDarkWinTitlebar-10OrGreater	2022-10-31 07:51:13 +01: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
Sefa Eyeoglu	42350e689d	chore: improve display names of certain languages ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-30 23:50:57 +01:00
Fayne Aldan	b7d5fee995	Change Profiles to Accounts for consistency ... Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>	2022-10-30 15:56:45 -06:00
TheLastRar	fd099166c6	Fix: Check if Windows 10 before calling setDarkWinTitlebar() ... Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>	2022-10-30 20:49:56 +00:00
Sefa Eyeoglu	b4be28b9bb	fix: fix disabled trash undo action ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-30 18:37:06 +01: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
Marcelo Hernandez	5d1aac3c53	added option to not copy screenshots ... + moved select all checkbox to top row, centered. Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>	2022-10-29 22:27:31 -04:00
fn2006	b142a6da5b	fix hardcoded svg ... Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>	2022-10-29 16:42:37 +01:00
Sefa Eyeoglu	5ed7eb9d53	chore: update credits ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-29 13:12:51 +02:00
Marcelo Hernandez	c00f96c7ca	create getters and setters for InstanceCopyPrefs ... + use pragma once like other .h files in this directory Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>	2022-10-29 00:55:33 -04:00
flow	be3c9abcfe	fix: copy single files too in FS::copy ... eek Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-28 20:54:58 -03:00
Sefa Eyeoglu	177f17450a	Merge pull request #173 from Scrumplex/fix-icons	2022-10-29 00:35:48 +02:00
leo78913	76146e0f17	add a flat white version of the launch icon ... Signed-off-by: leo78913 <leo3758@riseup.net>	2022-10-28 15:51:20 -03:00
leo78913	4500e345b3	Merge branch 'PrismLauncher:develop' into toolbar-icons	2022-10-28 15:46:02 -03:00
Sefa Eyeoglu	e885f3c26a	Merge pull request #65 from he3als/develop	2022-10-28 18:43:30 +02:00
flow	e6e92f2b0e	fix: only allow workarounds for blocked mods from MR when 100% safe ... If a version on Modrinth has more than a single mod loader associated, it means that it's possible we might get the wrong file for download, since individual files don't really have this kind of metadata in the API response. So, in such cases, it's best to let the user take care of it instead. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-28 13:31:21 -03:00
Sefa Eyeoglu	7b446dd30f	Merge pull request #319 from Scrumplex/fix-avoid-mr-segfault	2022-10-28 13:40:52 +02:00
Sefa Eyeoglu	93894f62ff	fix: avoid segfault for unexpected API reponse ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-28 00:08:15 +02:00
Sefa Eyeoglu	2ba3de79d8	chore: add comment about copy bug ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-27 21:23:17 +02:00
Piper McCorkle	2e0f818905	Add a snapcraft.yml for building Snaps ... The included snapcraft.yml can be used to build a Snap (the application format used by Canonical's modern package manager) out of Prism. If the project wants in the future, Prism can publish these Snaps to the Snap Store so the Prism Launcher can be installed through the Ubuntu Software app on vanilla Ubuntu. I haven't registered the Snap name, so it's currently free for anyone to reserve. I'd suggest that a Prism developer register the name prismlauncher at https://snapcraft.io/register-snap to ensure the name belongs to the project, even if there are no plans of setting up CI to publish snaps in the short term. I have also modified JavaUtils.cpp to be able to autodetect the Java versions included in the Snap, and added "*.snap" to the .gitignore so the compiled Snap isn't accidentally committed to the repository. Signed-off-by: Piper McCorkle <contact@piperswe.me>	2022-10-26 09:25:54 -05:00
Marcelo Hernandez	63b6c6685c	Abstract away InstanceCopyPrefs' internals through new getSelectedFiltersAsRegex() function ... + fix typo in comment + remove unused import + add [[nodiscard]] to methods Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>	2022-10-26 00:20:36 -04:00
DioEgizio	b516dd970f	Merge pull request #206 from flowln/changelog_height_fix	2022-10-25 11:29:14 +02:00
Marcelo Hernandez	385c452ddf	remove checkBool function, add updateSelectAllCheckbox function ... Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>	2022-10-24 20:49:40 -04:00
Marcelo Hernandez	a89df42561	Simplify bool check in CopyInstanceDialog.cpp ... Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>	2022-10-24 19:31:40 -04:00
Sefa Eyeoglu	08cd5d52fa	Merge pull request #283 from flowln/fix_abort_on_autosearch	2022-10-24 23:00:02 +02:00
Sefa Eyeoglu	d0e668e1d8	Merge pull request #211 from Hibiii/show-instace-arg	2022-10-24 22:51:30 +02:00
flow	b638a6ae95	fix: retry mod search job after aborting it ... This way, we don't get stuck with an aborted job in our way! :o Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-24 09:09:24 -03:00
Sefa Eyeoglu	6a474a0125	fix: update icon generate script ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-24 11:18:53 +02:00
Marcelo Hernandez	4caf06bc99	Check "Select all" checkbox if all options are already selected ... + code cleanup Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>	2022-10-23 19:30:41 -04:00
Marcelo Hernandez	15593b5c09	Add "Select all" checkbox + ui revamp + code cleanup ... Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>	2022-10-23 19:30:41 -04:00
Marcelo Hernandez	e7e56eb1e3	add more options to copy instance dialog ... - Copy game options, copy resource packs, copy shaders, copy servers, and copy mods - Also made a new InstanceCopyPrefs struct to store those options rather than passing 7 different booleans into InstanceCopyTask's constructor Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>	2022-10-23 19:30:28 -04:00
leo78913	43bf601f12	add icons to the instance toolbar ... Signed-off-by: leo78913 <leo3758@riseup.net>	2022-10-23 20:04:19 -03:00
Trisave	d5109f024b	Better dark theme selection contrast ... Tweak background of the selection background in order to make text more readable Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com>	2022-10-23 20:32:04 +02:00
flow	7f441f5b87	Merge pull request #228 from bensuperpc/change_cast	2022-10-23 14:28:33 -03:00
he3als	0aac85dda1	Replace tab with spaces in flat_white.qrc ... Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>	2022-10-23 14:35:33 +01:00
he3als	4777a45722	Fix new flat white icons ... Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>	2022-10-23 14:32:35 +01:00
jn64	01db80d19a	Fix version labels width ... Make labels fit to the contents, so Ibeam cursor doesn't appear over empty space. Should have been done with 90025ed. Signed-off-by: jn64 <23169302+jn64@users.noreply.github.com>	2022-10-23 03:35:23 +08:00
flow	8b28ed67ae	Merge pull request #234 from AliceDTRH/fix/dedupejava	2022-10-22 13:14:26 -03:00
Ryan Cao	f35a30d371	oops ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-10-22 23:47:53 +08:00
AliceDTRH	b2789fef0f	Use correct variable for Windows ... Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>	2022-10-22 17:19:34 +02:00
he3als	46fe7e77b3	DCO Remediation Commit for he3als <65787561+he3als@users.noreply.github.com> ... I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: d87f743a2b I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 92dfd659f1 I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: a6e65dfc7a I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 99e1c13e80 Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>	2022-10-22 16:14:50 +01:00
he3als	99e1c13e80	fix: add flat_white to code	2022-10-22 15:50:06 +01:00
he3als	a6e65dfc7a	Add new flat white icons	2022-10-22 15:40:39 +01:00
AliceDTRH	1471eddc7e	Deduplicates java installs before passing it on ... Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>	2022-10-22 16:40:31 +02:00
he3als	89fd84d916	Merge branch 'PrismLauncher:develop' into develop	2022-10-22 15:30:40 +01:00
Jamie Mansfield	0e17eee096	ATLauncher: Fix pack installation always aborting ... I made a mistake during when cherry picking a previous commit, this applies the change - and fixes installing ATLauncher packs.	2022-10-22 15:22:30 +01:00
flow	81f1305270	Merge pull request #215 from forkiesassds/develop	2022-10-22 10:48:00 -03:00
Sefa Eyeoglu	24e4db676a	Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog	2022-10-22 15:31:53 +02:00
Sefa Eyeoglu	6e21a9829d	Merge pull request #225 from Scrumplex/fix-segfault-fileresolver	2022-10-22 15:31:46 +02:00
flow	4e99e10cbd	Merge pull request #218 from getchoo/change-jars-path	2022-10-22 10:18:58 -03:00
Ryan Cao	a406aeb3ea	feat: register as zip/mrpack handler on macOS ... Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>	2022-10-22 20:51:46 +08:00
Sefa Eyeoglu	970e4b020e	fix: fix segfault when resolving Flame resources ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-22 14:11:51 +02:00
Jamie Mansfield	a6b13487f0	ATLauncher: Abort install if optional mods dialog is closed ... This matches the behaviour of ATLauncher.	2022-10-22 12:35:34 +01:00
Bensuperpc	56ae4e5b6a	Change old style cast to C++ cast ... Change old style cast to C++ cast Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2022-10-22 13:04:48 +02:00
Sefa Eyeoglu	54c26b05fa	Merge pull request #185 from flowln/fix_blocked_mods_crash	2022-10-22 12:44:20 +02:00
seth	4a2b25e841	fix: use correct variable for jars path ... Signed-off-by: seth <getchoo@tuta.io>	2022-10-21 21:40:21 -04:00
seth	ba4af1a890	fix: make jars path specific to prism ... Signed-off-by: seth <getchoo@tuta.io>	2022-10-21 21:40:20 -04:00
forkiesassds	9b17cde019	CurseForge modpack page improvements ... Signed-off-by: forkiesassds <icanttellyou@memeware.net>	2022-10-22 01:20:08 +03:00
Sefa Eyeoglu	aefb8b353e	Merge pull request #187 from leo78913/menu-icons	2022-10-21 22:39:35 +02:00
Hibi	1288b92615	Add argument to show instance window	2022-10-21 15:40:28 -03:00
flow	7eecf454e8	fix: remove max height logic for mod update changelogs ... It's not worth it to keep this, it's just a heuristic that fails from time to time. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-21 14:07:43 -03:00
leo78913	ccf7d1e0c4	material design icons ... Signed-off-by: leo78913 <leo3758@riseup.net>	2022-10-21 14:04:04 -03:00
leo78913	e4b5cd23e6	the trashcan icons dont look like trash now ... Signed-off-by: leo78913 <leo3758@riseup.net>	2022-10-21 13:49:31 -03:00
circuit10	ff2f40f5e1	Fix typo ... Signed-off-by: circuit10 <heath.mitchell27@gmail.com>	2022-10-21 16:28:04 +01:00
Sefa Eyeoglu	12d8409e65	Merge pull request #39 from Sebbl0508/mod_dialog_fontsize	2022-10-21 15:25:28 +02:00
leo78913	8db89b4cfb	Merge branch 'PrismLauncher:develop' into menu-icons	2022-10-20 17:54:43 -03:00
leo78913	31dc92dafe	add icons to the instance menu and 4 new icons: ... delete rename tag export Signed-off-by: leo78913 <leo3758@riseup.net>	2022-10-20 17:48:57 -03:00
flow	01b90809e8	fix: memory leak when finishing blocked mods job ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-20 16:55:22 -03:00
flow	0a7383a4e1	fix: hide ProgressDialog when failing/succeeding tasks ... WHY IS QT LIKE THAT AAAAAAAA Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-20 16:54:39 -03:00
Chrono-byte	88341b923a	fix contributor notices in AboutDialog.cpp for license compliance ... Signed-off-by: Chrono-byte <me@disilla.org>	2022-10-20 15:14:26 -04:00
flow	5d27633821	fix: show a single line in ProjectItem's desc. when there's no more space ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-20 15:03:46 -03:00
Sebastian Rueth	b46c4a81e0	check space requirements of project description ... if there isn't enough space for 2 lines of project description, only draw one Signed-off-by: Sebastian Rueth <sebastian.rueth@protonmail.com>	2022-10-20 08:02:05 +02:00
flow	d6479e133d	fix: properly center project descriptions ... In particular, this takes into account the space used by the title, so (hopefully) there won't be problems with custom themes with that. Signed-off-by: flow <flowlnlnln@gmail.com> Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>	2022-10-19 20:12:50 +02:00
Sebastian Rüth	50bbf2aacc	fix text clipping ... Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>	2022-10-19 20:12:50 +02:00
Sefa Eyeoglu	4e08f28246	Merge pull request #31 from flowln/who_needs_webview	2022-10-19 14:28:29 +02:00
Sefa Eyeoglu	46c57e120f	Merge pull request #27 from flowln/ftb_install_improve	2022-10-19 13:51:35 +02:00
Sefa Eyeoglu	61fbc5a791	refactor: replace with new logo ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-19 13:08:23 +02:00
Samisafool	8201d1df02	Rename ... Signed-off-by: Samisafool <thenerdiestguy@gmail.com>	2022-10-19 15:02:43 +05:30
Fayne Aldan	888a87463e	Add fallback for multimc.cfg ... Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>	2022-10-18 14:40:34 -06:00
flow	3a95a3b7c1	fix: don't take item from a possibly empty list ... The list gets destroyed when we take the last object, so things explode. 😔 Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-18 16:51:42 -03:00
DioEgizio	fb4cf0b75d	Merge pull request #55 from flowln/config_add_fallback	2022-10-18 19:50:34 +02:00
he3als	92dfd659f1	Fix .QRC file for flat white icons	2022-10-18 17:54:26 +01:00
he3als	d87f743a2b	Add flat white icons ... This is mainly for dark mode users, as I think that the regular colour of the flat icons do not look good with dark mode.	2022-10-18 17:49:35 +01:00
Cleo John	83ceb26151	Streamline Button changes to improve source readability.	2022-10-18 17:28:23 +02:00
flow	32cdfb871c	fix: add fallback for polymc.cfg ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-18 12:22:42 -03:00
flow	801e7da5ee	feat: allow specifying fallbacks to INI files ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-18 12:22:42 -03:00
Sefa Eyeoglu	3405fd91c6	Merge pull request #33 from DioEgizio/remove-useless-actions	2022-10-18 15:31:32 +02:00
DioEgizio	194822f11e	Merge pull request #28 from flowln/fix_copy	2022-10-18 15:27:53 +02:00
Sefa Eyeoglu	98963d4cdf	Merge pull request #29 from Scrumplex/feat-clear-metadata	2022-10-18 15:25:56 +02:00
DioEgizio	804ef36b20	Merge pull request #26 from Scrumplex/armhf	2022-10-18 15:24:33 +02:00
DioEgizio	e05fe77bfe	feat: remove redundant actions from instance toolbar and redundant "instance"s ... Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2022-10-18 14:43:29 +02:00
Sefa Eyeoglu	6db3f68ae1	refactor: use correct data path ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-18 13:58:50 +02:00
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	722194405a	refactor: initial rebrand ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-18 09:37:59 +02:00
DioEgizio	87d35f0d16	fix: remove some unused libs ... Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2022-10-15 20:16:15 +02:00
Sefa Eyeoglu	c089f9b59f	Merge pull request #1203 from DioEgizio/macos-legacy	2022-10-15 15:24:30 +02:00
flow	8bc529be3d	fix: include hidden files when copying instances ... fixes instance ccopy on linux .-. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-15 09:20:31 -03:00
Sefa Eyeoglu	303628bb05	refactor: support system ghc-filesystem ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-15 13:13:38 +02:00
Sefa Eyeoglu	3b92ec8e82	chore: clang-format RuntimeContext ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-15 12:43:15 +02:00
Sefa Eyeoglu	545944cb0d	refactor: support armhf ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-15 12:41:16 +02:00
flow	c90a88b6b6	fix: correct ftb legacy too ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-14 12:18:06 -03:00
flow	124097d3a5	feat!: use ghc/filesystem in place of std's one if needed ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-14 14:08:48 +02:00
flow	c520faed6d	feat: add gulrak/filesystem submodule ... ... for old macs that don't have std::filesystem in their stdlib. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-14 14:08:42 +02:00
flow	dfa220ef02	fix: issues with aborts (again) ... i hate it Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-13 15:10:35 -03:00
flow	f26be00571	fix: abort search if we're already trying to download a pack ... Meaning we don't have to wait for the searches to finish in the background to finally start the modpack download, when we have already selected it -_- Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-13 13:49:06 -03:00
flow	83654a193e	refactor+fix: Make FTB install task similar to other install tasks ... In particular, this changes the order so that the instance gets created before downloading the mods (like other install tasks), and the mod download directly puts the files in the staging folder (like the others), instead of that weird makeCached and copy stuff. This fixes some issues with modpack downloads from FTB, like creating an instance with no mods in it. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-13 13:27:52 -03:00
flow	b2a5d8daf4	fix: don't include opted out versions with the 'Any' filter on the MD ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-12 10:26:14 -03:00
flow	fda3f1352e	feat: add image support for the news reader :^) ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-11 16:11:08 -03:00
flow	d194b02e28	fix: prevent images overriding content when changing pages ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-11 15:51:54 -03:00
Tayou	aaba99dc10	Update launcher/ui/MainWindow.cpp ... make " Offline" string for profilers translatable Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>	2022-10-11 14:58:34 +02:00
Tayou	93a2e0f777	Merge Launch Buttons ... Signed-off-by: Tayou <tayou@gmx.net>	2022-10-10 23:23:06 +02:00
Sefa Eyeoglu	71f3c6b461	feat: add clear metadata action ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-10 12:48:25 +02:00
Sefa Eyeoglu	aabcca5059	Merge pull request #1175 from Ozynt/patch-1	2022-10-09 20:20:05 +02:00
Ozynt	7e67fd8c79	Update LaunchController.cpp ... Signed-off-by: Ozynt <104643560+Ozynt@users.noreply.github.com>	2022-10-09 13:20:50 +02:00
Ozynt	fecf1ffcb9	Update LaunchController.cpp ... Signed-off-by: Ozynt <104643560+Ozynt@users.noreply.github.com>	2022-10-09 13:19:38 +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
flow	28f84902f6	Merge pull request #1185 from DioEgizio/fix-tooltip ... Fix outdated 'Disable mod metadata' button's warning message.	2022-10-08 14:34:59 -03:00
Trisave	ebee50eedc	Improve default light and dark themes (#1174)	2022-10-08 14:33:24 -03:00
flow	e0ef09dfe1	Merge pull request #1183 from Scrumplex/fix-capabilities-first-run	2022-10-08 14:29:14 -03:00
flow	d7992ab29d	feat: add image support for FTB packs ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-08 14:12:05 -03:00
flow	60f19f305e	feat: add image support for modrinth modpack pages ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-08 14:12:03 -03:00
flow	d99976f5d7	fix: make mod and modpack caches separate for Modrinth ... This makes it similar to CF mods / modpacks. The mods cache is maintained with the same name because it most likely has more data it in, so this commit will affect existing caches as minimally as possible. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-08 14:11:20 -03:00
flow	db158a5735	feat: add image support for mod pages ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-08 14:11:20 -03:00
flow	ea3be17220	feat: add widget for a text browser with image support ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-10-08 14:11:20 -03:00
DioEgizio	f26049009e	fix: mod updating isn't upcoming anymore :p ... Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2022-10-08 16:20:46 +02:00
Sefa Eyeoglu	787234a53a	Merge pull request #1163 from flowln/fix_list_icons	2022-10-08 12:12:38 +02:00
Sefa Eyeoglu	fc3a64056c	Merge pull request #1154 from Scrumplex/epic-formatting-codes	2022-10-08 12:12:26 +02:00
Sefa Eyeoglu	6ebc9abb80	fix: update capabilities before first-run wizard ... On first run, the condition for the wizard would return, before running updateCapabilities(). This moves that call up, as its only dependency is the settings system. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-10-06 14:46:13 +02:00
txtsd	f315025a8d	Merge pull request #1167 from Scrumplex/epic-commandline	2022-10-02 00:41:34 +05:30
stoltsvensk	8e43d97133	Microsoft account only ... Signed-off-by: stoltsvensk <104643560+stoltsvensk@users.noreply.github.com>	2022-10-01 16:47:23 +02:00
Sefa Eyeoglu	7ccafdc993	fix: add missing includes to fix Qt 6.4 build ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-30 19:56:01 +02:00
Sefa Eyeoglu	0dca9cb6b8	Merge pull request #1162 from Trial97/feature/Replace-toml-library	2022-09-30 19:44:45 +02:00
Sefa Eyeoglu	11c44c676c	fix: remove unused MACOS_HINT ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-26 13:28:46 +02:00
flow	370c3aa598	Merge pull request #894 from flowln/update_from_external_source ... epic PR	2022-09-26 08:25:12 -03:00
Sefa Eyeoglu	1cdadafdf8	refactor: use QCommandLineParser instead ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-26 13:21:27 +02:00
timoreo	dd6f670dec	fix: Fixed memory leak ... Signed-off-by: timoreo <contact@timoreo.fr>	2022-09-26 11:50:55 +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
Sefa Eyeoglu	58a5331f7b	Merge pull request #1164 from Scrumplex/fix-sort-languages	2022-09-25 19:50:55 +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
ErogigGit	8a4f1c66f8	Allow double clicking to mark for dowload ... Signed-off-by: Erogig <erogigabyte@gmail.com>	2022-09-24 22:37:51 +02:00
Sefa Eyeoglu	b187231b0e	fix: sort languages by their name instead of key ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-24 11:53:41 +02:00
Sefa Eyeoglu	60b38de69f	fix: fallback for languages without a native name ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-24 11:48:33 +02:00
Trial97	600c49f7f0	Replaced tomlc99 with tomlplusplus ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2022-09-24 00:10:27 +03:00
flow	e7380e70a3	fix: use placeholder icon when the project has no icon in MR ... Projects with no icon return a null icon URL in Modrinth's API. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-23 18:05:58 -03:00
flow	3df8594f19	feat: change project item delegate for modrinth modpacks ... more info! \ ^-^/ Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-23 16:59:40 -03:00
flow	ee4a829293	fix: remove manual icon resize in ModModel ... THis fixes a FIXME, now that we fixed the issue :o Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-23 16:59:40 -03:00
flow	1862f3c124	fix: set icon sizes correctly in ProjectItemDelegate ... no more dumb hacks with icons!! Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-23 16:59:40 -03:00
Sefa Eyeoglu	777ab3416f	feat: also format resource/texture pack names ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-21 15:00:28 +02:00
Sefa Eyeoglu	ecf5ab75e7	feat: support more formatting codes ... also fix some crashes Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-21 14:59:01 +02:00
flow	4f6d964217	fix: don't change groups when updating an instance ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:10 -03:00
flow	06019f01e3	feat: add dialog to ask whether to chaneg instance's name ... This prevents custom names from being lost when updating, by only changing the name if the old instance name constains the old version, so that we can update it if the user whishes to. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:10 -03:00
flow	ddde885084	fix: show warning in case there's no old index when updating ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:10 -03:00
flow	be8c6f218c	refactor: setAbortStatus -> setAbortable ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:10 -03:00
flow	9eb35ea7c8	fix: don't load specific settings for managed pack info ... This avoids loading all settings for all instances when searching for one with a specific managed pack name. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:10 -03:00
flow	d2fdbec41d	fix: move file deletion to the end of the instance update ... This makes it harder for problems in the updating process to affect the current instance. Network issues, for instance, will no longer put the instance in an invalid state. Still, a possible improvement to this would be passing that logic to InstanceStaging instead, to be handled with the instance commiting directly. However, as it is now, the code would become very spaguetti-y, and given that the override operation in the commiting could also put the instance into an invalid state, it seems to me that, in order to fully error-proof this, we would need to do a copy operation on the whole instance, in order to modify the copy, and only in the end override everything an once with a rename. That also has the possibility of corrupting the instance if done without super care, however, so I think we may need to instead create an automatic backup system, with an undo command of sorts, or something like that. This doesn't seem very trivial though, so it'll probably need to wait until another PR. In the meantime, the user is advised to always backup their instances before doing this kind of action, as always. What a long commit message o.O Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:09 -03:00
flow	2dd372600c	fix: some abort-related issues ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:09 -03:00
flow	eda6cf11ef	feat(ui): improve info dialog before updating an instance ... Adds a 'Cancel' option, and add a note about doing a backup before updating. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:09 -03:00
flow	68facd6b93	fix(ui): hook up abort status signal in ProgressDialog ... Now we have a visual indication on when tasks are abortable! Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:09 -03:00
flow	87002fb8f8	fix: hook up setAbortStatus in instance import tasks ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:09 -03:00
flow	6a50fa35ec	feat: add canAbort() status change in Task ... By now, it's a recurring pattern of wanting to restrict aborting in certain situations. This avoids further code duplication, and adds a signal that external users can hook up to to respond to such change. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:09 -03:00
flow	6541570969	fix: simplify abort handling and add missing emits ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:09 -03:00
flow	4b0ceea894	fix: correctly set managed pack fields in CF pack ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:09 -03:00
flow	8c0816c166	feat: add override awareness to CF modpack updating ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:08 -03:00
flow	be769d07f1	fix: correctly set all managed pack fields in Modrinth pack ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:08 -03:00
flow	3a9d58e31c	feat: add override handling in modrinth pack update ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:08 -03:00
flow	7024acac06	feat: add override helper functions ... These help us keep track of relevant metadata information about overrides, so that we know what they are when we update a pack. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:08 -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	eed73c9078	refactor: clean up InstanceImportTask a bit ... Also removes a divide by two in the download progress (why was it there???) Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:08 -03:00
flow	795d6f35ee	feat: add curseforge modpack updating ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:08 -03:00
flow	ebd46705d5	refactor: move creation of CF file download task to a separate function ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:08 -03:00
flow	72d2ca234e	refactor: move flame modpack import to separate file ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:07 -03:00
flow	2246c3359b	refactor: add throw_on_blocked arg to Flame file parse ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:07 -03:00
flow	242fb156a2	feat: add 'getFiles' by fileIds route in Flame API ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:07 -03:00
flow	208ed73e59	feat: add early modrinth pack updating ... Still some FIXMEs and TODOs to consider, but the general thing is here! Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:36:06 -03:00
flow	4441b37338	refactor: move modrinth modpack import to separate file ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:32:36 -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
flow	ec9ddc4f22	chore: add helper function for copying managed pack data between insts. ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-20 18:32:36 -03:00
Sefa Eyeoglu	98b6f90172	fix: add more legacy architectures ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-20 16:01:08 +02:00
Sefa Eyeoglu	7e280de361	refactor: drop 64-bit check ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-20 16:01:08 +02: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	ebbcc9f6da	fix: actually render color codes for texture packs ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-20 10:26:15 +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
txtsd	fe9a4fece4	Merge pull request #1142 from flowln/better_fs	2022-09-20 09:00:19 +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
flow	1b2a7de4e2	fix: show 'demo' instead of 'offline' in log when in demo mode ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-15 18:44:18 -03:00
flow	11216d200c	change: move demo action to "Play offline" menu ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-15 18:44:18 -03:00
jopejoe1	777be6a48d	Add 'Ctrl+Alt+O' Shortcut to launch demo instance. ... Signed-off-by: jopejoe1 <johannes@joens.email>	2022-09-15 18:44:18 -03:00
jopejoe1	29dcb9d274	Added Launch Demo button. ... Signed-off-by: jopejoe1 <johannes@joens.email>	2022-09-15 18:44:18 -03:00
Sefa Eyeoglu	1ca2be0039	Merge pull request #982 from DavidoTek/windarkmode2	2022-09-14 13:17:17 +02:00
flow	ee0fb2d0e0	fix: use std::wstring for Windows filenames ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-12 13:07:24 -03:00
flow	c496ad1237	chore: make DirNameFromString add normal duplicate identifier ... Wrap the number in parenthesis to be similar to other software. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-12 13:07:24 -03:00
flow	277fa21f5f	refactor: remove Win32 'crap' in FileSystem ... We should use std::filesystem symlink and hardlink functions instead. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-12 13:07:23 -03:00
flow	1cf949226e	refactor: use std::filesystem for overrides ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-12 13:07:23 -03:00
flow	be3fae6511	refactor: use std::filesystem for path deletion ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-12 13:07:23 -03:00
flow	5932f36285	refactor: use std::filesystem for file copy ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-12 13:07:23 -03:00
flow	30abb65368	Merge pull request #1133 from Scrumplex/refactor-tests ... Move tests to a separate folder, to fix issues and improve maintenance	2022-09-12 12:57:55 -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	a091245793	fix: emit signals when aborting NetJob ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-10 09:10:16 -03:00
flow	7cf2c3be0f	fix: start at least one task in ConcurrentTask ... This allows us to emit all the necessary stuff when we're finished in the case of starting a task with no subtasks. In particular, this caused the mod updater to not work properly :) Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-07 12:11:42 -03:00
flow	f65d506f26	Merge pull request #997 from flowln/fix_major_version_filter	2022-09-07 10:34:50 -03: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
flow	42eb265624	refactor: create mod pages and filter widget by factory methods ... This takes most expensive operations out of the constructors. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-07 08:29:58 -03:00
flow	8a65726e9d	fix: use more robust method of finding matches for major version ... This uses the proper version list to find all MC versions matching the major number (_don't say anything about SemVer_ 🔫). Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-07 08:27:53 -03:00
flow	1b0ca47682	Merge pull request #939 from flowln/mod_downloader_improve ... Some more UI / UX improvements to the mod downloader!	2022-09-07 08:27:11 -03:00
flow	8e3f5c3305	Merge pull request #966 from flowln/refactor_tasks ... Reduce code duplication in tasks, fix some bugs and add some tests	2022-09-07 08:26:28 -03:00
timoreo	4817f0312d	Fixed up a warning ... Signed-off-by: timoreo <contact@timoreo.fr>	2022-09-06 14:32:19 +02:00
Sefa Eyeoglu	b70a82c609	Merge pull request #1111 from PolyMC/revert-1067-classpath-epicness	2022-09-05 20:06:33 +02:00
Sefa Eyeoglu	25d1e0c4e6	Merge pull request #1107 from DioEgizio/smaller-about	2022-09-05 17:52:16 +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
DioEgizio	d5583f0f02	make the about dialog smaller ... Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2022-09-04 14:32:33 +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	43a7af3f44	fix: removing mods with their metadata as well ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37: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	dd9e30b24a	feat: add resource icon to InfoFrame ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-03 13:37:21 -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	afa1a5e932	feat: modify InfoFrame and ResourcePackPage to show ResourcePack info ... 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
Sefa Eyeoglu	2f167b1512	Merge pull request #1095 from flowln/ensure_file_path_in_override	2022-09-01 09:54:22 +02: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	064ae49d2b	fix: make MultipleOptionsTask inherit directly from SequentialTask ... It's not a good idea to have multiple concurrent tasks running on a sequential thing like this one. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-28 16:29:02 -03:00
flow	247f99ce2f	feat(test): add more tests to Tasks ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-28 16:29:01 -03:00
flow	7b6d269904	refactor: make NetJob inherit from ConcurrentTask as well! ... Avoids lots of code duplication Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-28 16:29:01 -03:00
flow	87a0482b8b	refactor: make MultipleOptionsTask inherit from ConcurrentTask too ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-28 16:29:01 -03:00
flow	e899699918	refactor: make SequentialTask inherit from ConcurrentTask ... In a way, sequential tasks are just concurrent tasks with only a single task running concurrently, so we can remove LOTS of duplicated logic :) Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-28 16:29:01 -03:00
flow	bdf464e792	fix: abort logic running subsequent tasks anyways some times ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-28 16:29:01 -03:00
flow	c410bb4ecb	fix: 'succeeded while not running' spam in ConcurrentTask ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-28 16:29:01 -03:00
flow	a720bcc637	fix: bogus progress update when the total step progress was zero ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-28 16:29:01 -03:00
flow	369a8cdc74	fix: only try to start tasks that are really there ... This fixes an annoying issue where concurrent tasks would try to start multiple tasks even when there was not that many tasks to run in the first place, causing some amount of log spam. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-28 16:29:00 -03:00
flow	3f4e55be4f	fix: ensure destination file paths exist when overriding folders ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-28 16:28:23 -03:00
flow	2186b134a4	fix: Mod type enum -> Resource type enum ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-28 14:47:52 -03:00
Sefa Eyeoglu	f371ec210c	Merge pull request #1052 from flowln/resource_model	2022-08-28 16:52:53 +02:00
Sefa Eyeoglu	afcd669d2f	Merge pull request #965 from flowln/fat_files_in_memory ... Refactor a bit EnsureMetadataTask and calculate hashes in a incremental manner	2022-08-28 11:03:12 +02:00
DioEgizio	13184eb8e9	fix: fix urls on ftb legacy ... Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2022-08-24 12:31:38 +02: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	6be59b53f1	feat: add eternal cache entries ... Those are entries that don't get stale over time, so we don't invalidate them if they 'expire'. 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
flow	2d63c86022	feat: make Task a QRunnable ... This makes it possible to run a task in another thread. I added a variable to toggle debug prints because they seem to trigger an assertion on Qt internals when the task in on another thread. Of course, this isn't awesome, but can wait until we improve our logging. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-20 10:41:59 -03:00
Sefa Eyeoglu	afb9ebcd99	fix: distinguish Coremods ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-08-20 12:53:13 +02: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	311758233b	Merge pull request #1044 from flowln/better_orphan_fix	2022-08-20 12:50:43 +02:00
Sefa Eyeoglu	6e086eb808	Merge pull request #992 from Scrumplex/refactor-version	2022-08-20 12:50:25 +02:00
Sefa Eyeoglu	7e8644430c	Merge pull request #1007 from Gingeh/disable-update-button	2022-08-20 12:50:19 +02:00
Sefa Eyeoglu	70a8f6743a	Merge pull request #919 from kumquat-ir/download-all-blocked	2022-08-20 12:50:01 +02:00
Sefa Eyeoglu	d5a2185030	Merge pull request #1068 from TayouVR/improvedWindowsJavaCheck	2022-08-19 14:26:36 +02:00
Tayou	26f31e9288	use qEnvironmentVariable instead of qgetenv in JavaUtils ... Signed-off-by: Tayou <tayou@gmx.net>	2022-08-18 23:59:35 +02:00
Sefa Eyeoglu	e654e66839	Merge pull request #1049 from flowln/waiting_for_news_-_-	2022-08-18 22:53:41 +02:00
Tayou	bb4861cf0d	check for java installs in PATH on windows ... this should find java installs from scoop as well as any other installer, that registers java in the PATH environment variable. Signed-off-by: Tayou <tayou@gmx.net>	2022-08-18 18:24:32 +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
Sefa Eyeoglu	ab766a0598	Merge pull request #968 from magneticflux-/utf8-logging ... Decode process lines as UTF-8	2022-08-18 10:44:01 +02:00
Mitchell Skaggs	3c4b45c9e7	Use C locale codec for decoding ... This should correctly decode multi-byte non-UTF-8 text, such as Windows-936 (Simplified Chinese) Signed-off-by: Mitchell Skaggs <skaggsm333@gmail.com>	2022-08-13 10:39:05 -05:00
flow	93507a263b	fix: hide 'More news...' button if the news aren't loaded yet ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-12 17:41:11 -03:00
Sefa Eyeoglu	1175461030	refactor: switch to new versioning scheme ... The new versioning system is based on the versioning system used by the GNOME Foundation for the GNOME desktop. We are dropping the "major version" as defined by SemVer and move to a version number with a most and least significant number. The most significant number must be incremented, if there are new features or significant changes since last major release. Otherwise, the least significant number must be incremented, if there are only minor changes since the last release. New features or significant changes mustn't be introduced by a bump of the least significant number. If a minor change would introduce small user-facing changes (like a message-box or slight UI changes), it could still be classified as a minor change. At the end of the day, a human shall decide, if a change is minor or significant, as there is no clear line that would separate a "minor" and a "significant" change in a GUI-application. Definitions: feature: New user-facing functionality significant change: Something that changes user-facing behavior minor change: Something that fixes unexpected behavior Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-08-12 14:22:24 +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
timoreo	c375e7b4df	Merge pull request #897 from jamierocks/atl-updating-initial	2022-08-11 08:50:05 +02:00
timoreo	5d188c69ed	Merge pull request #1039 from budak7273/fix-world-safety-nag-title-text	2022-08-11 07:33:13 +02:00
timoreo	1a5986abe0	Merge pull request #920 from flowln/metacache_fix	2022-08-11 07:32:43 +02:00
Robb	cebac3c10e	Make new title strings translatable ... Signed-off-by: Robb <computerguy440+gh@gmail.com>	2022-08-10 12:07:24 -05:00
timoreo	a5da3db966	Merge pull request #1018 from Scrumplex/fix-infinite-auth-loop	2022-08-10 18:14:26 +02:00
Robb	cd30f75173	fix: Make world safety nag title text match the action being performed instead of always saying 'Copy World' ... Signed-off-by: Robb <computerguy440+gh@gmail.com>	2022-08-09 16:01:21 -05:00
Mitchell Skaggs	94df4ceb36	Fix use of Qt 5.14 enum ... Signed-off-by: Mitchell Skaggs <skaggsm333@gmail.com>	2022-08-09 00:17:53 -05:00
Mitchell Skaggs	a14476c5fb	Replace local 8-bit decoding with UTF-8 decoding ... Handles incomplete byte sequences using `QTextDecoder` Signed-off-by: Mitchell Skaggs <skaggsm333@gmail.com>	2022-08-08 23:54:01 -05: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
Sefa Eyeoglu	68f3f98bc3	feat: detect GameMode and MangoHud's presence ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-08-08 21:16:37 +02:00
Sefa Eyeoglu	f873cd5b1a	refactor: store current capabilities ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-08-08 21:16:37 +02:00
flow	7b27f200b1	fix: don't mutate QHash while iterating over it ... Even though it was using a QMutableHashIterator, sometimes it didn't work quite well, so this is a bit better. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-05 16:30:12 -03:00
flow	f4b207220c	fix: add some more nullptr checks / protection ... die sigsegv 🔫 Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-05 15:10:44 -03:00
flow	d835e1d14e	refactor: simplify smart pointers more ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-05 11:38:46 -03:00
flow	75f92de8f8	Merge pull request #1017 from flowln/kill_orphan_metadata ... Remove orphaned metadata to avoid problems with auto-updating instances	2022-08-04 12:57:20 -07: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
Sefa Eyeoglu	355762aa30	fix: emit abort in LaunchController ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-08-04 10:07:36 +02:00
Sefa Eyeoglu	be4fb65470	fix: Add root path detection on OpenBSD ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-08-03 21:14:32 +02:00
Sefa Eyeoglu	4ed296bad4	fix: allow user to interrupt launch after 3 tries ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-08-03 20:38:40 +02:00
Gingeh	a8aa862919	Move large condition into a new lambda ... Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>	2022-08-03 16:39:30 +10: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
Gingeh	f33b31e048	Check for running instance when re-opening the mod folder page and when selecting mods ... Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>	2022-08-02 14:14:45 +10:00
Gingeh	0d10ebb7ca	Update launcher/ui/pages/instance/ModFolderPage.h ... Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>	2022-08-02 12:50:25 +10:00
flow	4a8abc948e	fix: prevent segfault due to callbacks into deleted objects ... Since network requests are, for the most part, asynchronous, there's a chance a request only comes through after the request sender has already been deleted. This adds a global (read static) hash table relating models for the mod downloader to their status (true = alive, false = destroyed). It is a bit of a hack, but I couldn't come up with a better way of doing this. To reproduce the issue before this commit: scroll really quickly through CF mods, to trigger network requests for their versions and description. Then, in the middle of it close the mod downloader. Sometimes this will create a crash. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 18:34:15 -03:00
Gingeh	77b640b76b	Disable "Check for Updates" and "Download Mods" while the game is running ... Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>	2022-08-01 20:56:05 +10:00
Gingeh	a8dfe98b1a	Disable "Check for Updates" if all mods are removed ... Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>	2022-08-01 20:56:05 +10:00
flow	cee41b87f7	fix(ui): force redraw of mod list when (de)selecting a mod ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:31 -03:00
flow	7a95314e42	feat(ui): remember mod download dialog's geometry ... Makes it consistent with other modal dialogs. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:31 -03:00
flow	6aaf1f4f21	feat: lazy-load CF mod descriptions ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:30 -03:00
flow	368a0ddd44	feat: add mod descriptions to CF mods ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:30 -03:00
flow	0808a10b7b	feat: cache mod versions ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:30 -03:00
flow	6f052baa94	refactor: use function cb instead of class cb in getVersions ... I've discovered even more functional programming! :^) Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:30 -03:00
flow	5bc67d3f6b	feat: cache extra mod info (like links and body) ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:30 -03:00
flow	74c6c5cfbc	refactor: use function cb instead of class cb in getModInfo ... I've discovered functional programming :^) This makes this route more fit for general use. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:30 -03:00
flow	158b7fd166	feat+refactor: clean up ProgressWidget and add progress indicatior to ... mod downloader Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:30 -03:00
flow	c3f647dc96	feat: add (semi) instant searching in mod downloader ... It has a delay of 350ms from the last typed character to search, in order to cache small changes while typing. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:30 -03:00
flow	5936c7b65c	change: preserve search term across different mod providers ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:29 -03:00
flow	a8bcd85c93	feat+refactor: add shortcuts to mod downloader and clean up ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:29 -03:00
flow	127b558f95	change: change button names to be more user-friendly ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:29 -03:00
flow	6e9a27f40f	feat: display the 'body' of a MR mod on the mod downloader ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:29 -03:00
flow	4a13dbe3bb	feat: create delegate for project item views ... This allows us to define custom painting for list view items. In particular, this is applied to the mod downloader, in order to allow displaying both the mod name and mod description, and settings their effects (like bold or underline) independent of each other. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:29 -03:00
flow	0f61f5ba03	fix(ui): missing tr() in mod download dialog's title ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-08-01 07:33:29 -03:00
kumquat-ir	9c105914f0	use BlockedModsDialog for ftb packs as well ... Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>	2022-07-31 15:05:47 -04:00
kumquat-ir	579582740e	Merge remote-tracking branch 'origin/develop' into download-all-blocked ... Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>	2022-07-31 14:54:50 -04:00
Ryan Cao	b15544c163	Trash instances instead of deleting (when possible) (#549) ... Squashed because of :pofat: commit history	2022-07-30 14:42:33 -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
timoreo	74120fe1f3	Merge pull request #699 from Scrumplex/resolve-ftb-mods-cf	2022-07-28 09:43:39 +02:00
DavidoTek	b4e8abd0ad	feat: win32 enable dark titlebar for dark theme ... Signed-off-by: DavidoTek <54072917+DavidoTek@users.noreply.github.com>	2022-07-26 23:25:17 +02:00
flow	336f1f4f50	Merge pull request #974 from flowln/accounts_qt6 ... Fix adding multiple accounts in Qt6	2022-07-26 16:08:05 -03:00
flow	1ce0f0e7a5	fix: progress dialog going away even if the task was not aborted ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-26 20:33:33 +02:00
flow	fbf1901d86	refactor: shuffle some things around to improve readability ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-26 20:33:33 +02:00
flow	0382f33c46	fix(ui): pump events to show "Copying modpack files..." text ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-26 20:33:33 +02:00
flow	13372f3f99	chore: clean up FTBPackInstallTask a bit and connect missing signals ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-26 20:33:33 +02:00
flow	e741cb7f0a	fix: add abort handlign in Flame's FileResolvingTask ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-26 20:33:33 +02:00
Sefa Eyeoglu	fb289c6b17	chore: add license headers ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-07-26 20:33:29 +02:00
Sefa Eyeoglu	75a7ea55d4	feat: implement mod resolving for FTB ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-07-26 20:33:10 +02:00
Sefa Eyeoglu	86573a5ccd	Merge pull request #961 from flowln/fix_resource_filter	2022-07-26 20:14:18 +02:00
flow	6fe55a79f1	fix: use const qualifier for operator==() and allow other comparisons ... This fixes an implicit behavior changed by C++17. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-26 15:11:56 -03: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
LennyMcLennington	65a945f968	Merge pull request #956 from flowln/jar_mods_aa ... Fix segmentation fault when using jar mods	2022-07-25 06:57:40 +01:00
flow	a9e8ed5087	fix: pump events and do a queued start for concurrent tasks ... Heavy workloads can consume a ton of time doing their stuff, and starve the event loop out of events. This adds an event processing call after every concurrent task has been completed, to decrease the event loop stravation on such loads. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-24 17:46:54 -03:00
flow	00520b6a0e	feat: add hashing tasks to the sequential task in ModUpdateDialog ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-24 17:46:54 -03:00
flow	e6f2a3893a	refactor+feat: improve code separation in ensure metadata ... ... and avoid calculating the same hash multiple times Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-24 17:46:54 -03:00
flow	631a93bcd8	refactor: add a HashUtils place for hashing stuff ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-24 17:46:54 -03:00
flow	b1763353ea	feat: do incremental calculation of CF's hash ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-24 17:46:53 -03:00
flow	15ec1abb6a	feat: use QIODevice for calcuating the JAR hash on Modrinth ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-24 17:46:53 -03:00
flow	cfda8dbb2b	refactor: use QIODevice instead of a whole QByteArray for hash calc. ... This allows Qt to do its thing and optimize the data gathering from the JAR. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-24 17:46:53 -03:00
flow	3aa2003951	fix: filter in external resource pages not working ... For some reason, using setFilterFixedString() doesn't seem to update the QRegularExpression object with a new value, instead leaving it empty. It updates QRegExp just fine, so maybe that's an Qt bug? o.O Anyway, using regex in the filter is kinda cool actually :D Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-23 23:50:56 -03:00
flow	0e473f4570	Merge pull request #951 from flowln/performace_tab_fix ... Hide the entire performance tab on the instance settings in non-Linux OSes	2022-07-23 18:31:04 -03:00
flow	1157436a24	fix: sigsegv when trying to use jar mods ... Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-23 14:24:24 -03:00
flow	813dfbd2d3	fix: hide the entire performance tab on instance settings in non-Linux ... "just woke up after a major release has just been made" coding style Signed-off-by: flow <flowlnlnln@gmail.com>	2022-07-23 13:29:39 -03:00
Sefa Eyeoglu	ba7dfb360c	fix: actually substitute variables in pre/post launch ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-07-23 17:51:58 +02:00
timoreo	6aad750fe0	Merge pull request #893 from Scrumplex/refactor-env-handling	2022-07-23 14:08:10 +02:00
Sefa Eyeoglu	c65f5f7728	Merge pull request #877 from Scrumplex/refactor-offline-accounts	2022-07-23 13:54:36 +02:00
timoreo	74b62727af	Merge pull request #947 from flowln/unicode_uhh	2022-07-23 13:38:48 +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