4036 Commits

Author	SHA1	Message	Date
Trial97	81874f22f7	Fixed tar extract ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-29 00:10:59 +02:00
Alexandru Ionut Tripon	2012b2c243	Merge pull request #1977 from Trial97/resource_clear ... Force clear the resource selection	2024-03-28 14:49:03 +02:00
Alexandru Ionut Tripon	b3abc052b5	Merge pull request #1529 from Trial97/portabledatadir ... Added UserData as another posible path for portable builds	2024-03-28 14:48:34 +02:00
Alexandru Ionut Tripon	6b967d3f76	Merge pull request #1822 from Trial97/new_cats ... Add random and slideshow modes to Catpacks	2024-03-28 14:48:18 +02:00
timoreo	e4742fdb3d	Merge pull request #2221 from Trial97/fix_curseforge3 ... Set Forge version correctly when exporting to CurseForge	2024-03-28 09:41:11 +01:00
Tayou	0f178270be	Merge pull request #1786 from Trial97/deps_improve ... Make dependency checking more lax	2024-03-27 20:42:26 +01:00
Tayou	0e5727315b	Merge pull request #2243 from Trial97/quick-play2 ... Allow joining servers to work on 1.20 take 2	2024-03-27 18:20:22 +01:00
Trial97	f6572c1244	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader	2024-03-27 18:55:34 +02:00
Alexandru Ionut Tripon	e212c019a0	Merge pull request #2209 from chouzz/add-totalPlayTime-ftb-import ... Add totalTimePlayed for FTBApp import	2024-03-27 16:20:21 +02:00
Alexandru Ionut Tripon	5117b21262	Merge pull request #1769 from Trial97/error_codes ... added more microsoft error codes	2024-03-27 16:19:31 +02:00
Sefa Eyeoglu	5d72ee1c4f	Merge pull request #1837 from Trial97/import_ok	2024-03-27 10:50:58 +01:00
Trial97	765bdf67c9	Changed the trait name ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-27 00:56:12 +02:00
Trial97	23bdccc91d	Merge branch 'develop' of github.com:Trial97/PrismLauncher into quick-play	2024-03-26 23:58:56 +02:00
Trial97	3c12e27226	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2024-03-23 23:53:25 +02:00
Trial97	c0754b80a2	Add resize to last column ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-22 22:17:58 +02:00
Trial97	0b87e4c03b	Fiexed codeql warning ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-22 12:29:15 +02:00
Trial97	a7029a9e53	Fixed qMin ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-21 20:01:40 +02:00
Trial97	3046822272	Fixed buid ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-21 19:53:52 +02:00
Trial97	1a6dfd04d6	Made tar.gz parser ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-21 19:46:57 +02:00
Trial97	ab7fc2e46c	Fixed archive java download ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-21 00:42:04 +02:00
Alexandru Ionut Tripon	93f19bda6e	Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp ... Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-03-21 00:07:06 +02:00
Trial97	1c809f0fb1	Added more logs for auto java install ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-20 17:39:10 +02:00
Trial97	703470e57d	Hopefully fix codeql ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-20 08:24:40 +02:00
Trial97	5f8269f5e1	Small class rename ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-20 00:29:46 +02:00
Trial97	09c2c6793b	Improve UI ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-20 00:15:02 +02:00
TheKodeToad	d72bd70c05	Use UTF-8 for ZIP creation ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-03-19 20:34:55 +00:00
Trial97	ef4e5eb3cf	fixed java build option ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-18 19:15:36 +02:00
Trial97	1322277ae6	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader	2024-03-17 20:57:53 +02:00
Trial97	05487152fe	Fixed curesforge export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-17 20:53:26 +02:00
AtomHare	853e4a13ab	fix: Compressing typo ... Signed-off-by: AtomHare <29772841+AtomHare@users.noreply.github.com>	2024-03-16 12:44:55 +01:00
chouzz	92113e233a	Add totalTimePlayed for FTBApp import ... Signed-off-by: chouzz <zhouhua852@gmail.com>	2024-03-09 19:36:40 +08:00
Trial97	9120848278	Made java downloader as a build option ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-06 19:33:14 +02:00
Alexandru Ionut Tripon	a0311780c1	Merge pull request #1866 from Trial97/supported_files ... Added all supported files filter	2024-03-06 17:21:56 +02:00
Tayou	1627f3c63b	Merge pull request #2178 from TheKodeToad/mrpack-fixes ... (More) mrpack fixes	2024-03-03 16:30:40 +01:00
TheKodeToad	4101fbb634	Allow multiline description ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-03-01 01:05:03 +00:00
TheKodeToad	138df66355	Fix server side mods being marked as unsupported on client ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-03-01 00:03:20 +00:00
Trial97	41d52dc347	Remove dependencies if review mods is rejected ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-29 00:06:28 +02:00
Trial97	27e76d0dcb	Removed static path ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-27 17:11:19 +02:00
Trial97	24fd07861b	format code ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-26 22:25:14 +02:00
Alexandru Ionut Tripon	da96172b0b	Apply suggestions from code review ... Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-02-26 22:00:40 +02:00
Trial97	344398f238	Updated ftb app import instance detection ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-26 21:20:14 +02:00
TheKodeToad	c0eb80947d	Fix build on Windows and formatting ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-02-24 21:50:51 +00:00
TheKodeToad	fccf857d8e	Fix a mistake ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-02-24 19:16:39 +00:00
TheKodeToad	bd0cd82826	Add upper-bound for randomisation ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-02-24 18:41:45 +00:00
TheKodeToad	df60f5cc96	Add error when staging folder could not be created ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-02-24 18:41:35 +00:00
TheKodeToad	9574ebe480	Delete staging on abort ... Previously instances would get "stuck" in the folder Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-02-24 18:41:35 +00:00
TheKodeToad	6a9f5540d3	Re-randomise key until it does not collide ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-02-24 13:38:19 +00:00
Trial97	726b0ffb3b	Reduced temporary instance folder name ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-22 19:40:24 +02:00
Sefa Eyeoglu	1cdb9bd5af	Merge pull request #2141 from crpz1/welcome_label_consistency	2024-02-22 12:36:00 +01:00
crpz1	9aa81cf005	Use empty list label code for welcome screen ... Signed-off-by: crpz1 <8588315+crpz1@users.noreply.github.com>	2024-02-20 00:21:37 +11:00
Trial97	1c96ae5807	Fixed java refresh button ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-18 22:32:54 +02:00
Trial97	889f604a41	Removed JavaExtraSearchPaths ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-18 21:38:31 +02:00
Trial97	a288779790	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader	2024-02-18 16:49:35 +02:00
Trial97	038d3e4596	Fixed asan complains ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-18 16:49:10 +02:00
DioEgizio	44327980db	feat: add "use zink" button ... Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2024-02-18 13:30:55 +01:00
Trial97	b4f3a969b3	Updated strings that are displayed to user ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-18 14:30:38 +02:00
DioEgizio	99cbb5d0b2	Merge pull request #2110 from Trial97/fix_curseforge	2024-02-18 12:42:09 +01:00
Trial97	4aafa98852	Improved the message boxes for java wizzard ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-18 12:58:34 +02:00
Trial97	2f489d1aec	Added auto java options to the java wizzard page ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-18 11:34:54 +02:00
Trial97	4c76f7afe0	Made auto java checkbox dependent ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-18 09:46:44 +02:00
Trial97	a7dad96a70	Added refresh button on managed java list ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-18 09:32:31 +02:00
Trial97	5232b3cd89	Added some logs and fixed natives extraction ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-17 12:17:00 +02:00
Trial97	ea2adf909d	Added progeess dialog to autodownload java ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-17 11:14:32 +02:00
Trial97	2941307581	Added basic java auto-detect and auto-download ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-16 23:42:39 +02:00
Echo J	01180c20e1	Use absolute path to load MangoHUD library ... This should finally fix the Arch Linux Java symbol issue with MangoHUD enabled: https://bugs.archlinux.org/task/77183 Signed-off-by: Echo J <tcg96nougat@gmail.com>	2024-02-14 10:11:49 +02:00
Sefa Eyeoglu	e738b78044	Merge pull request #2112 from TheKodeToad/log-performance	2024-02-13 09:15:47 +01:00
TheKodeToad	8cf2a04f31	Fix formatting issues ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-02-12 15:24:56 +00:00
TheKodeToad	7f4c74ffbe	Fix immediate free in Exception.h ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-02-11 22:16:03 +00:00
Trial97	fdaaee64d1	Fixed curseforge neoforge export for 1.20.1 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-11 21:49:28 +02:00
TheKodeToad	ff989b4305	Fix ResourceModel error display ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-02-11 15:43:36 +00:00
TheKodeToad	ded77e6183	Fix NetJob use-after-free ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-02-11 15:43:36 +00:00
Alexandru Ionut Tripon	29bf6cc68c	Update launcher/modplatform/flame/FlameInstanceCreationTask.cpp ... Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-02-10 23:15:26 +02:00
Trial97	830ce246e1	Fixed curseforge neoforge import for 1.20.1 versions ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-10 13:48:02 +02:00
Trial97	f3600972a0	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-10 11:09:45 +02:00
Trial97	031a9f4738	Replaced QFile::remove with FS::deletePath ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-10 11:03:51 +02:00
Trial97	5099061a5c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-10 11:02:29 +02:00
Trial97	c0fb053ccc	Added warning for x86 java ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-09 23:14:49 +02:00
Trial97	27d662e642	Added management for downloaded javas from prism ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-09 22:47:39 +02:00
Trial97	0a3303bcbd	Added button to add extra java path to the Java Wizzard ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-09 21:07:12 +02:00
Trial97	379f1a70e9	Leave headers alone ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-08 22:37:57 +02:00
Trial97	b3fc07d444	Added extra java search paths ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-08 21:47:59 +02:00
Trial97	3d29da916d	Made Java path configurable ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-08 20:15:19 +02:00
Trial97	ba990e075b	Added JavaPath function ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-08 19:45:46 +02:00
TheKodeToad	7cac8ad2b4	Use QTextFragment for inserting log lines ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-02-06 20:42:18 +00:00
Trial97	82b15268bc	preparing java autodownload ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-03 00:11:05 +02:00
Trial97	0384e652fb	Finished up the download dialog ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-02 22:42:42 +02:00
Trial97	3c58fb0677	Moving files around ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-02-02 15:51:32 +02:00
Tayou	5d223f6f93	Merge pull request #2050 from TheKodeToad/default-game-dir ... Use `minecraft` instead of `.minecraft` for better accessibility	2024-02-01 18:16:14 +01:00
Trial97	6c5bb3817b	Cleaned some code ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-31 18:07:28 +02:00
Trial97	5afe75e821	Fixed some codeql warnings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-30 12:37:34 +02:00
Trial97	7317105e4d	Code spaghetti and more chaos ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-27 22:47:28 +02:00
Trial97	b54410b48c	Added gameVersion for curseforge mod packs ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-26 19:10:39 +02:00
Trial97	ad98f600d5	corecly display core mods tab ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-26 18:36:31 +02:00
Trial97	4cd236ed80	missing header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-26 00:31:43 +02:00
Trial97	81282bf7e0	Autodetect Java? ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-26 00:22:05 +02:00
Trial97	f36be3f0e3	Cleanup downloaders ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-25 22:58:12 +02:00
Trial97	e897032383	Added java metadata ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-25 22:22:21 +02:00
Trial97	25bca28707	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader	2024-01-24 18:26:48 +02:00
Trial97	a0e7729aa6	Started workin on stuff ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-24 18:26:43 +02:00
DioEgizio	8de1060bfb	fix: remove alpha notice on modrinth packs ... with the modrinth app being released for quite a while now it's weird to still have this (tbh they've never been truly alpha) Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>	2024-01-24 16:43:38 +01:00
Trial97	6b637a8797	Display minecraft version if not mentioned for modrinth packs ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-22 22:32:42 +02:00
Trial97	9bbeb5ef3a	Made updater interval configurable ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-22 21:26:46 +02:00
Trial97	12bf913764	Fixed open path a second time ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-22 20:36:57 +02:00
Trial97	f77749e448	Resized Refresh theme button ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-21 21:24:47 +02:00
Alexandru Ionut Tripon	e4306d5cb6	Update launcher/ui/themes/CatPack.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-01-21 08:52:49 +02:00
TheKodeToad	f54ac25614	Use minecraft instead of .minecraft for better accessibility ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-01-21 02:28:55 +00:00
erik.lundstedt	30913fdb2b	fix a minor spelling misstake in Mod.cpp ... closes https://github.com/PrismLauncher/PrismLauncher/issues/2047 Signed-off-by: erik.lundstedt <erik@lundstedt.it>	2024-01-21 00:31:00 +01:00
Trial97	0303b1cc7f	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats	2024-01-20 00:27:30 +02:00
Alexandru Ionut Tripon	4cda04271f	Merge pull request #1913 from Trial97/dialog ... Fixed askIfShouldUpdate dialog on mac	2024-01-18 22:02:04 +02:00
Sefa Eyeoglu	bc75bcdcca	Merge pull request #1768 from Trial97/toggle_deps2	2024-01-18 18:18:31 +01:00
Sefa Eyeoglu	a62eaba702	Merge pull request #1825 from Trial97/ftb_import	2024-01-18 18:18:17 +01:00
Sefa Eyeoglu	0b3e91ac62	Merge pull request #1954 from Scrumplex/fix/open-paths-immediately	2024-01-17 15:18:46 +01:00
Sefa Eyeoglu	67d088dc53	fix: simplify openPath calls ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2024-01-14 11:36:17 +01:00
Alexandru Ionut Tripon	dbdec15ddb	Merge pull request #1771 from Trial97/account ... Try refreshing account on launch if needed	2024-01-10 16:07:09 +02:00
Trial97	a7d293b3f2	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-10 09:17:52 +02:00
Trial97	a0ebd0714d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats	2024-01-10 09:09:19 +02:00
Trial97	57913f1943	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo	2024-01-07 22:31:25 +02:00
Trial97	d94e641900	Load versions on first edit ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-07 22:00:31 +02:00
Tayou	35ad4448d9	Merge pull request #2012 from Trial97/openal_settings ... Fixed openAL placeholder	2024-01-07 00:21:21 +01:00
TheKodeToad	f285c3fe13	Merge pull request #1972 from lumiscosity/feature/cat_opacity ... Add a cat opacity option	2024-01-06 19:42:17 +00:00
Trial97	219e2862f9	Fixed openAL placeholder ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-01-05 23:02:42 +02:00
TheKodeToad	d56d21f928	Merge pull request #1983 from tildejustin/develop ... remove legacy processArguments code	2024-01-05 12:26:58 +00:00
Alexandru Ionut Tripon	b76c413936	Merge pull request #1 from theMackabu/refresh_cats ... add: refresh on load	2024-01-03 22:56:43 +02:00
Trial97	048d34dc9d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats	2024-01-03 22:53:36 +02:00
Alexandru Ionut Tripon	57a589367f	Merge pull request #1979 from lumiscosity/feature/mod_page_improvements ... Mod downloader page improvements	2024-01-03 22:43:18 +02:00
Sefa Eyeoglu	9523a2d77b	Merge pull request #1999 from TheKodeToad/more-legacy-fixes	2024-01-03 18:16:41 +01:00
Sefa Eyeoglu	e5b608447a	chore: improve param name ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2024-01-03 18:15:03 +01:00
TheKodeToad	05e4533096	Add online mode fix for legacy versions; minor refactors in legacy ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-01-02 18:11:54 +00:00
TheKodeToad	1130fe8510	Happy new year :D ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2024-01-02 18:04:42 +00:00
timoreo	0ce0769842	Merge pull request #1978 from Trial97/double_links	2023-12-28 19:48:34 +01:00
tildejustin	eca5d88576	remove legacy processArguments code ... Signed-off-by: tildejustin <spacepepper3.14@gmail.com>	2023-12-24 22:20:06 -05:00
Sajjaad Farzad	b0a4af7412	Merge branch 'PrismLauncher:develop' into refresh_cats	2023-12-24 16:03:13 -08:00
lumiscosity	c29af83dc3	fix styling ... Signed-off-by: lumiscosity <averyrudelphe@gmail.com>	2023-12-23 14:16:29 +01:00
lumiscosity	1e48bf838d	move simplify call to drawing ... Signed-off-by: lumiscosity <averyrudelphe@gmail.com>	2023-12-23 12:05:07 +01:00
lumiscosity	1bf386603d	Strip newlines in mod descriptions ... Mirrors Modrinth page behaviour. Signed-off-by: lumiscosity <averyrudelphe@gmail.com>	2023-12-23 11:27:19 +01:00
Trial97	9a33bdcf50	Fixed openURL cast for resource ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-12-23 01:02:04 +02:00
Trial97	526e580fbb	Force clear the resource selection ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-12-23 00:33:38 +02:00
Trial97	13d29ac6f4	Updated the size sort code ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-12-22 23:35:48 +02:00
lumiscosity	358cf5b348	add archived project warning ... Signed-off-by: lumiscosity <averyrudelphe@gmail.com>	2023-12-22 22:04:33 +01:00
lumiscosity	43306350e0	Add cat opacity ... Signed-off-by: lumiscosity <averyrudelphe@gmail.com>	2023-12-22 15:02:41 +01:00
Sefa Eyeoglu	a1e3901b3f	fix: don't log katabasis by default ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-12-17 12:39:17 +01:00
Sefa Eyeoglu	a8220cd296	chore: remove unused methods ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-12-16 13:12:12 +01:00
Sefa Eyeoglu	213963257c	chore: remove maybe_unused ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-12-16 13:11:24 +01:00
lumiscosity	eb8e150fa8	one more ... Signed-off-by: lumiscosity <averyrudelphe@gmail.com>	2023-12-16 13:00:22 +01:00
lumiscosity	56397446db	Update ModFolderPage.cpp ... Signed-off-by: lumiscosity <averyrudelphe@gmail.com>	2023-12-16 12:53:59 +01:00
lumiscosity	8cbdecc454	Update GetModDependenciesTask.cpp ... Signed-off-by: lumiscosity <averyrudelphe@gmail.com>	2023-12-16 12:52:59 +01:00
Sefa Eyeoglu	0ccdcd23e3	fix: open paths directly ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-12-14 13:02:29 +01:00
Trial97	f33110ee0c	Renamed function ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-12-14 00:19:22 +02:00
Trial97	9580f16c33	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-12-14 00:16:29 +02:00
Trial97	400b518bc2	Removed auto reauthenticate ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-12-14 00:02:15 +02:00
Trial97	6a61900328	Fixed curseforge version filter ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-12-13 17:48:11 +02:00
Trial97	763eab6b96	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2023-12-13 14:48:31 +02:00
Trial97	4498d32cc0	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2	2023-12-13 14:37:02 +02:00
Trial97	d10b075677	Sort mods before export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-12-13 14:36:58 +02:00
theMackabu	648aa18e6f	add: refresh on load ... Signed-off-by: theMackabu <theMackabu@gmail.com>	2023-12-12 14:26:45 -08:00
theMackabu	201c9783d5	clang-format: fix formatting ... Signed-off-by: theMackabu <theMackabu@gmail.com>	2023-12-12 13:31:18 -08:00
theMackabu	836f74cd46	#1945 resolve issue on windows ... Signed-off-by: theMackabu <theMackabu@gmail.com>	2023-12-12 13:26:44 -08:00
theMackabu	3567369d44	#1945 resolve minimized windows pull from dock ... Signed-off-by: theMackabu <theMackabu@gmail.com>	2023-12-12 13:26:44 -08:00
timoreo	4612607803	Merge pull request #1712 from Trial97/current_time	2023-12-11 15:40:06 +01:00
Sefa Eyeoglu	79218cf13b	Merge pull request #1738 from Trial97/some_removals	2023-12-11 11:08:26 +01:00
Sefa Eyeoglu	f8a6a099c7	Merge pull request #1732 from Trial97/update_file2	2023-12-11 11:08:07 +01:00
Sefa Eyeoglu	9467b11897	Merge pull request #1694 from Trial97/concurrent	2023-12-11 11:07:03 +01:00
Sefa Eyeoglu	bcaeab1ddc	Merge pull request #1857 from Trial97/copy_time	2023-12-11 10:58:21 +01:00
TheKodeToad	4db00897c6	Merge pull request #1922 from IceCryptonym/togglable-status-bar ... Add togglable status bar	2023-12-07 20:37:36 +00:00
Tayou	877eb4172a	add line back to group separator ... Signed-off-by: Tayou <git@tayou.org>	2023-12-07 17:26:47 +01:00
Archy	faedd0fd65	Add togglable status bar ... Signed-off-by: Archy <59789660+IceCryptonym@users.noreply.github.com>	2023-12-06 23:40:22 +10:00
Trial97	657416fe30	Removed header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-12-03 21:29:02 +02:00
Trial97	577c737d68	Fixed askIfShouldUpdate dialog on mac ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-12-03 20:00:50 +02:00
Sefa Eyeoglu	4c59a1ba1b	Merge pull request #1882 from bit69tream/notify-user-if-tmp-is-noexec	2023-11-28 21:57:23 +01:00
Trial97	463ff4c6ae	Removed assert permanantly ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-27 11:30:07 +02:00
Trial97	6f6b6312a5	Moved the button up ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-27 09:39:31 +02:00
Trial97	2d91bd09d4	Fixed crash on abort function not initialized ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-26 23:49:56 +02:00
Trial97	f4e098f7f5	Formated file ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-25 09:36:55 +02:00
Trial97	1a0fd5f993	Added mod reinstall dialog ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-25 00:18:10 +02:00
Trial97	20e0cb43b9	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent	2023-11-23 23:58:47 +02:00
Trial97	2db5677281	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2023-11-23 23:57:44 +02:00
Trial97	ff5a968de0	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2	2023-11-23 23:57:20 +02:00
Trial97	1650237c8f	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into some_removals	2023-11-23 23:37:13 +02:00
Trial97	e0d776e551	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod	2023-11-23 23:29:10 +02:00
Trial97	403a7f5d46	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps2	2023-11-23 23:21:11 +02:00
Trial97	af628be648	Merge branch 'error_codes' of github.com:Trial97/PrismLauncher into error_codes	2023-11-23 23:20:27 +02:00
Trial97	3c75d761a2	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into error_codes	2023-11-23 23:11:11 +02:00
Trial97	b47ec7f2dc	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size	2023-11-23 17:14:50 +02:00
Trial97	3234bb5a8c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve	2023-11-23 17:05:37 +02:00
Trial97	bb9df1684b	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into new_cats	2023-11-23 16:58:42 +02:00
Trial97	0d44c0df1d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats	2023-11-23 16:50:53 +02:00
Trial97	c5cdebb42f	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into ftb_import	2023-11-23 16:43:33 +02:00
Trial97	2318a83881	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader	2023-11-23 16:33:57 +02:00
Trial97	be67067fa2	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo	2023-11-23 16:23:56 +02:00
Trial97	9c13504b06	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_ok	2023-11-23 16:13:09 +02:00
Trial97	afcdb7595c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2	2023-11-23 16:01:54 +02:00
Trial97	f71e622f71	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into copy_time	2023-11-23 15:51:54 +02:00
Trial97	4f49a56e4d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files	2023-11-23 15:40:31 +02:00
Trial97	85e875fe08	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day	2023-11-23 15:32:48 +02:00
Trial97	944ed48a61	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into time4	2023-11-23 14:58:05 +02:00
Trial97	e503d44c54	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time	2023-11-23 14:47:47 +02:00
Trial97	908072710a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-23 14:34:56 +02:00
bit6tream	d414599974	(#1693) Use a better approach to detect a noexec mount option ... Signed-off-by: bit6tream <megapixel483@gmail.com>	2023-11-23 15:23:03 +03:00
Trial97	e43a557a0b	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress	2023-11-23 14:08:49 +02:00
Trial97	7d4778ffd6	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into portabledatadir	2023-11-23 13:54:36 +02:00
Trial97	80383d237a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods	2023-11-23 13:38:11 +02:00
Trial97	1095d0698a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into waitprofiler	2023-11-23 13:25:12 +02:00
Trial97	c2fc2d330b	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip	2023-11-23 12:57:31 +02:00
Trial97	f16f0ed93e	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry	2023-11-23 12:47:52 +02:00
Trial97	9345416361	Fixed localization stuff ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-23 12:36:40 +02:00
Trial97	2268e46b91	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into account	2023-11-23 12:22:41 +02:00
Trial97	ceb88a170e	Extracted reauthenticateCurrentAccount as a separate function ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-23 12:22:31 +02:00
Sefa Eyeoglu	a2aa303770	Merge pull request #1843 from Trial97/fix_not_found_dep	2023-11-23 11:02:16 +01:00
Sefa Eyeoglu	a966289944	Merge pull request #1852 from Trial97/war_ning	2023-11-23 11:01:53 +01:00
Sefa Eyeoglu	7c9c3d2c5f	Merge pull request #1815 from Trial97/fix_mangohub	2023-11-23 11:00:57 +01:00
Trial97	d8c5ed55c2	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2	2023-11-23 12:00:18 +02:00
Trial97	6169af70db	Added back the FIXME comment ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-23 11:59:35 +02:00
Sefa Eyeoglu	2b17a61d38	Merge pull request #1589 from Trial97/instance_reload ... Fully reload the instance list once the folder is changed	2023-11-23 10:48:01 +01:00
Sefa Eyeoglu	d60d089cbc	Merge pull request #1751 from LocalSpook/account_type	2023-11-23 10:27:06 +01:00
Alexandru Ionut Tripon	5d6334ef95	Merge pull request #1762 from LocalSpook/const-in-declarations ... Remove top-level `const` qualifiers in function declarations	2023-11-23 08:53:01 +00:00
Trial97	6b3b54f061	format ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-23 10:48:11 +02:00
Trial97	e11b7e3770	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2023-11-23 10:46:27 +02:00
Trial97	670a0c1442	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size	2023-11-23 10:46:03 +02:00
Trial97	d5d8b7be8d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2	2023-11-23 10:45:35 +02:00
Trial97	673f82e884	Merge branch 'war_ning' of github.com:Trial97/PrismLauncher into war_ning	2023-11-23 10:45:06 +02:00
Trial97	f18f7147b5	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into war_ning	2023-11-23 10:44:49 +02:00
Trial97	721a08462c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into copy_time	2023-11-23 10:44:26 +02:00
Trial97	f0cff15d56	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files	2023-11-23 10:43:43 +02:00
Trial97	a1ac3ef7ae	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day	2023-11-23 10:43:15 +02:00
Trial97	a7be21733f	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector	2023-11-23 10:41:55 +02:00
Trial97	66decbb180	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time	2023-11-23 10:41:06 +02:00
Trial97	4ef626dab3	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into time4	2023-11-23 10:40:30 +02:00
Sefa Eyeoglu	48e9753fb5	Merge pull request #1880 from Trial97/link	2023-11-23 09:07:34 +01:00
Sefa Eyeoglu	b42434bcb6	Merge remote-tracking branch 'upstream/develop' into const-in-declarations	2023-11-23 09:06:23 +01:00
Sefa Eyeoglu	364fb9808e	Merge pull request #1347 from HyperSoop/reduce-min-memory	2023-11-23 08:58:58 +01:00
Trial97	e3af4f9a78	Fixed playtime recording ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-22 20:34:12 +02:00
Trial97	85b4e1f24f	Made column hidden by default ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-22 19:23:24 +02:00
Trial97	140a55810d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2023-11-22 14:20:30 +02:00
bit6tream	681e76c551	(#1693) Notify user if /tmp directory has noexec mount option ... Minecraft versions starting from 1.19 would not start at all if /tmp is mounted as `noexec`. Signed-off-by: bit6tream <megapixel483@gmail.com>	2023-11-22 01:48:31 +03:00
Trial97	196d24330a	Fixed open link on settings page ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-21 17:47:59 +02:00
Trial97	54c308e5b5	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-19 21:15:12 +02:00
Tayou	24f2102596	Merge pull request #1869 from Trial97/icons_folder ... Added more open folder actions	2023-11-19 15:06:30 +01:00
Trial97	26931475ae	made folder size reflect the number of elements ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-19 15:58:30 +02:00
Trial97	80c85aef99	fixed const stuff ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-19 15:37:18 +02:00
Alexandru Ionut Tripon	76216335b1	Update launcher/ui/pages/modplatform/ImportPage.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-19 15:26:47 +02:00
Trial97	a8aa214c0e	changed prism aniversary ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-19 09:01:59 +02:00
Trial97	e99926ea94	Added more open folder actions ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-19 02:40:25 +02:00
Trial97	f7e478c755	Added all supported files filter ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-19 02:02:02 +02:00
Trial97	1a06a1424b	Added custom env vars to pre/post launch commands ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-18 10:53:38 +02:00
Trial97	9f39e45b28	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time	2023-11-18 10:45:24 +02:00
Trial97	4e3132e8b2	reseted the setting ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-17 22:40:36 +02:00
Trial97	6b777653a5	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-17 22:38:17 +02:00
Trial97	2bfb5fc138	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-17 22:26:17 +02:00
Trial97	53c6493b9a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2	2023-11-17 21:56:23 +02:00
TheKodeToad	7ef2bda269	Improve description ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-11-17 19:49:48 +00:00
Alexandru Ionut Tripon	1150249cec	Merge pull request #1746 from Trial97/toggle_deps ... separated dependecy check from mod update	2023-11-17 19:42:22 +00:00
Trial97	a531f32b69	fixed settings saving ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-16 13:26:29 +02:00
Trial97	215465e833	added subdirectories to iteration ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-15 14:11:34 +02:00
Trial97	4d93f4adb1	Fixed folder size ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-15 12:10:47 +02:00
Trial97	890965746f	Added warning on mods update while running ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-15 11:07:46 +02:00
Trial97	361329d5d1	Made resource columns resizable ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-14 23:21:53 +02:00
Trial97	bedb4da869	Added filename to the modlist export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-14 19:37:23 +02:00
Trial97	6804e2ba59	moved export to list to the mods page ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-14 18:40:45 +02:00
Trial97	99fbcbee4c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2	2023-11-14 18:12:48 +02:00
Trial97	c05c001ab2	Remove the dep if it fails for any reason ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-13 23:49:49 +02:00
Alexandru Ionut Tripon	a3445cbbdd	Merge pull request #1704 from Leafeling/develop ... Add game category to generated Linux shortcuts	2023-11-13 07:32:33 +00:00
Trial97	0e57eeca69	Added missing variable from lambda capture ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-13 09:28:59 +02:00
Alexandru Ionut Tripon	32a8d9b9c6	Update launcher/ui/pages/instance/ModFolderPage.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-13 09:23:56 +02:00
Trial97	17916dbd24	Fixed inconsistent Ok in instance import ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-12 20:27:55 +02:00
Tayou	a991d48c76	Merge pull request #1798 from Trial97/java ... [Windows] Autodetect Java from the Microsoft Store version of the official launcher	2023-11-12 15:39:17 +01:00
Trial97	50a4d61ded	Fixed demo mode ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-10 23:26:41 +02:00
Trial97	926942a973	Fixed modrinth sort swap ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-10 20:00:35 +02:00
Trial97	463608b289	fixed shader packs detection ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-10 19:37:11 +02:00
Trial97	5e2eb7bbbb	Added button to select the FTBApp instances directory ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-09 23:30:30 +02:00
Trial97	b4bfc03e8b	Added button to refresh themes and catpacks ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-09 21:48:46 +02:00
Trial97	7532a41043	Improvements to catpack ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-09 21:38:38 +02:00
TheKodeToad	0f68a2dd61	Only open/close groups on left button ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-11-09 16:40:23 +00:00
Desoroxxx	6093399f5c	Update LauncherPage.ui ... Signed-off-by: Desoroxxx <desoroxxx@gmail.com>	2023-11-08 17:32:30 +01:00
Trial97	ae62e48c7c	Moved some buttons around ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-08 12:25:56 +02:00
Trial97	a7bfe385ea	Renamed Remove Metadata button ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-08 12:10:39 +02:00
Trial97	e4fecd1f97	Made sure mangoHub libs are present ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-08 11:55:38 +02:00
Alexandru Ionut Tripon	7313630615	Update launcher/java/JavaUtils.cpp ... Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-08 09:01:31 +02:00
Alexandru Ionut Tripon	9d653f172a	Update launcher/ui/dialogs/MSALoginDialog.cpp ... Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-08 08:56:48 +02:00
Trial97	4dc9e65875	Formated the suggestion ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-07 20:41:45 +02:00
Alexandru Ionut Tripon	54187a505f	Update launcher/ui/dialogs/MSALoginDialog.cpp ... Co-authored-by: Tayou <git@tayou.org> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-07 20:39:12 +02:00
Hazel Hofmann	1dea83580e	DCO Remediation Commit for Hazel Hofmann <hazel@theopensource.company> ... I, Hazel Hofmann <hazel@theopensource.company>, hereby add my Signed-off-by to this commit: 9ada8d906d Signed-off-by: Hazel Hofmann <hazel@theopensource.company>	2023-11-07 15:05:56 +01:00
Hazel Hofmann	9ada8d906d	Use same categories as main desktop entry	2023-11-07 14:54:04 +01:00
Trial97	8897f16d1d	simplify microsoft login ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-07 10:52:52 +02:00
Trial97	c78d35d699	added additional minecraft java path for windows ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-07 10:20:53 +02:00
Trial97	5d5adbd7da	add update menu conditionaly ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-07 09:48:07 +02:00
Trial97	6506e93e4a	Removed some buttons ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-07 09:44:27 +02:00
Trial97	011e87b421	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-06 23:38:14 +02:00
Trial97	7a0b2a316a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-06 23:19:58 +02:00
TheKodeToad	baa988ec81	Merge pull request #1739 from Trial97/mod_icons ... fixed squished mod icons	2023-11-06 20:49:05 +00:00
Alexandru Ionut Tripon	8eac0d34bd	Merge pull request #1796 from Trial97/dep_global_toggle ... Added Global Dependenicies toggle	2023-11-06 20:48:51 +00:00
Alexandru Ionut Tripon	0b1dcb3ea7	Merge pull request #1760 from LocalSpook/sorting ... Localize sorting options for resource and shader packs	2023-11-06 20:45:52 +00:00
Alexandru Ionut Tripon	3d529b0c3e	Merge pull request #1772 from Trial97/pixmap_crash ... Fix crash with mod icon caching	2023-11-06 20:44:27 +00:00
Trial97	ca226d2ab5	Fixed comparation warning ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-06 11:24:19 +02:00
Trial97	670e91cb60	Increased the step to around 10MB ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-06 11:08:18 +02:00
Trial97	cc291219f9	apply suggested changes ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-06 10:51:34 +02:00
Sefa Eyeoglu	0eda2447dc	Merge pull request #1797 from Trial97/fix_mangohub ... [Linux] Fix loading MangoHud	2023-11-06 08:14:55 +01:00
Trial97	867e6223ce	Fixed mangoHub loading ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-05 23:48:26 +02:00
Alexandru Ionut Tripon	3e7f9083ca	Update launcher/ui/pages/instance/ModFolderPage.cpp ... Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-05 23:41:54 +02:00
TheKodeToad	bd9d5e0990	Reword ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-11-05 20:31:48 +00:00
Trial97	9a8667e99c	Added Global Dependenicies toggle ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-05 22:22:49 +02:00
Trial97	710a48fcaf	changed type form double long to long long ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-05 21:41:10 +02:00
Edgars Cīrulis	d2a85cb580	visual: Fix spacing. ... Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>	2023-11-05 17:43:12 +00:00
Trial97	1d67fc6646	added special case for windows ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-05 17:35:49 +02:00
Alex	cf4144cb50	Fixed link to Fulmine's website ... Signed-off-by: Alex <akim8@emich.edu>	2023-11-05 00:46:05 -04:00
Trial97	5afe6600ee	use fs::move instead of qt rename ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-04 16:49:35 +02:00
Trial97	f828ea8929	updated the texture pack tooltips ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-04 11:49:05 +02:00
Trial97	79e299123c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip	2023-11-04 00:15:09 +02:00
Trial97	a4978946d5	disabled lax deps ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-04 00:07:51 +02:00
Trial97	2b6d8b8a2d	updated tooltip messages ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-03 23:02:17 +02:00
Trial97	cbb453a0ed	minimize the permisions for extracted files ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-03 22:55:10 +02:00
TheKodeToad	b446bdf4a9	Merge pull request #1783 from Trial97/visual_bug ... Fixed visual bug with Modlist export	2023-11-03 15:20:57 +00:00
Trial97	1b2654bfa6	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip	2023-11-03 12:53:23 +02:00
Alexandru Ionut Tripon	1bd69ecbb2	Update launcher/ui/pages/global/AccountListPage.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-11-03 11:42:40 +02:00
Trial97	b18082376d	Fixed visual bug with Modlist export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-03 11:04:13 +02:00
Trial97	127a31ba3a	Added warning for remove account ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-03 10:31:40 +02:00
Trial97	4081c51573	made dependency check more lax ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-02 23:52:12 +02:00
Trial97	220a1de99a	made sure that we do not relay for undefined behavior ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-02 22:41:56 +02:00
Trial97	3cbc63bb9f	added size column ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-02 12:18:24 +02:00
Trial97	2349f29be0	jsut a overflow protection ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-11-02 01:26:04 +02:00
Alexandru Ionut Tripon	f8bb1a872a	Merge pull request #1766 from TheKodeToad/groups-fix ... Fix group issues	2023-11-01 15:26:41 +00:00
Tayou	86e2f6c58c	Merge pull request #1685 from Trial97/java ... Autodetect Java bundled with official launcher	2023-10-31 18:03:41 +01:00
Trial97	2863a691ef	moved refresh out of the loop ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-31 08:45:08 +02:00
Alexandru Ionut Tripon	60fd7f0ae6	Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp ... Co-authored-by: Tayou <git@tayou.org> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-10-31 08:43:26 +02:00
Trial97	7166d68736	fixed account refresh after sleep ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-31 00:45:18 +02:00
Trial97	e42a2404a9	added more microsoft error codes ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-30 22:55:23 +02:00
Trial97	1490193402	added button to disable dependencies on the mod review ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-30 22:14:26 +02:00
TheKodeToad	2526275c5e	Better check ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-30 09:51:37 +00:00
TheKodeToad	5a54d80c6e	Fix group issues ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-30 09:26:38 +00:00
LocalSpook	0de4d8902e	Remove top-level const qualifiers in function declarations ... Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>	2023-10-28 22:12:09 -07:00
LocalSpook	54305397e4	Localize sorting options for resource and shader packs ... Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>	2023-10-28 12:50:40 -07:00
Tayou	69c2720872	Merge pull request #1691 from Trial97/no_color ... Add no_color env variable	2023-10-28 18:02:53 +02:00
Tayou	df2a92d5f4	Merge pull request #1742 from TayouVR/fix-resourcepack-crash ... fix switch/case fallthrough in resource parse tasks	2023-10-28 12:44:40 +02:00
Trial97	33cf7066b4	formated the code ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-27 21:51:35 +03:00
Trial97	2256850cb6	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-27 00:12:50 +03:00
LocalSpook	9d972ccc63	Localize account type in account list ... Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>	2023-10-26 13:32:33 -07:00
Sefa Eyeoglu	3719ea21b0	Merge pull request #1355 from TheKodeToad/env-vars ... Custom environment variables	2023-10-26 22:10:26 +02:00
TheKodeToad	bd11b93a0c	Use hidden tab bar like other pages ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-26 21:01:24 +01:00
Trial97	12d567a9b8	made env vars behave like the rest of the settings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 22:51:38 +03:00
Trial97	60a7628dbb	delete duplicate mods ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 20:43:26 +03:00
Trial97	3d84635b24	Remove file on mod duplication ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 20:09:12 +03:00
Trial97	321bbf1fa8	fixed asan stuff ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 19:06:38 +03:00
Trial97	dba54332fb	fixed some asan stuf ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 18:31:52 +03:00
Trial97	04acd27dab	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent	2023-10-26 13:45:47 +03:00
Trial97	8b8ea2d270	ensured that the variant is allways uppercase ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 13:37:25 +03:00
Trial97	44cdf3f697	Fixed skin variant ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-26 13:33:00 +03:00
Trial97	263dc5af67	Fixed remane and delete of selected skin ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-25 19:56:26 +03:00
Trial97	a5938a7de9	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-25 19:26:05 +03:00
txtsd	38d77b58cd	Merge pull request #1748 from LocalSpook/using	2023-10-25 16:08:42 +00:00
Trial97	d4d345ee7d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps	2023-10-24 23:40:36 +03:00
Tayou	a161f5cfe2	Merge pull request #1747 from Trial97/fix_initial_java ... fix: java memory not set on initial setup	2023-10-24 19:04:56 +02:00
LocalSpook	5be80df1ee	Replace typedef with using ... Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>	2023-10-24 01:36:27 -07:00
Trial97	6a19f2dae8	fixed icon import ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-24 11:19:19 +03:00
Trial97	694840937b	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip	2023-10-24 10:32:09 +03:00
Trial97	87f2f88d4c	fix: java memory not set on initial setup ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-23 23:38:03 +03:00
Trial97	f7c9972db0	separated dependecy check from mod update ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-23 19:46:30 +03:00
Sefa Eyeoglu	b376888f43	Merge pull request #1515 from TheKodeToad/sysprops	2023-10-22 21:57:11 +02:00
Tayou	0fe3241df6	remove now unneeded Q_ASSERTs ... Signed-off-by: Tayou <git@tayou.org>	2023-10-22 21:25:06 +02:00
Tayou	7d5206818b	fix switch/case fallthrough ... Signed-off-by: Tayou <git@tayou.org>	2023-10-22 21:25:00 +02:00
Sefa Eyeoglu	db19362a97	feat: add launcher brand and version props ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-10-22 21:19:44 +02:00
Trial97	2aeb829176	removed the concurent task destructor behaivior ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-22 19:58:10 +03:00
Trial97	0ca3873f1c	small fix ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-22 17:48:19 +03:00
Trial97	a748f49362	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent	2023-10-22 11:34:55 +03:00
Trial97	932cd9e262	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-22 11:32:05 +03:00
Trial97	10ae808da9	fixed codeql ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-22 00:06:08 +03:00
Trial97	d151e97e3a	Fixed some headers ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-21 22:40:37 +03:00
Trial97	41c9ca4f8a	Added categories filter ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-21 22:15:07 +03:00
Trial97	35d62cc5f2	Updated dependencies ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-21 19:05:31 +03:00
Trial97	9aac8e389f	made release type visible ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-21 18:48:55 +03:00
Trial97	9e85297f7a	Connected filters ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-21 18:28:33 +03:00
Alexandru Ionut Tripon	2c4af7e793	Merge pull request #1290 from Trial97/refactor/NetActions ... Refactor ImgurUpload	2023-10-21 12:32:16 +01:00
Trial97	4850434c67	added releaseType? ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-21 12:16:02 +03:00
Alexandru Ionut Tripon	f0fd1bd5e5	Merge pull request #1737 from Trial97/fix_ftb_app_import_icon ... Fixed FTBApp import icon	2023-10-21 07:48:21 +01:00
Trial97	5d926582c7	added Image column size hint ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-20 19:08:56 +03:00
Trial97	7b62d14683	fixed squished mod icons ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-20 17:15:12 +03:00
Trial97	a9d7af9096	removed some unused stuff ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-20 16:44:37 +03:00
Trial97	80723eeca1	Fixed FTBApp import icon ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-20 16:41:32 +03:00
TheKodeToad	e9fd02baca	Fix code style ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-20 13:12:16 +01:00
Trial97	35a8ab2393	Removed processEvents ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-20 10:32:45 +03:00
Trial97	6883c19579	Fixed the version combobox ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-20 00:44:36 +03:00
Trial97	55946c8923	first attempt at a combobox ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-19 23:53:26 +03:00
Alexandru Ionut Tripon	7ad48d8677	Merge pull request #1692 from Trial97/msa_account ... Fix wrong account selection	2023-10-19 20:09:28 +01:00
Trial97	1ac9757a86	Added back the processEvents ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-19 21:51:51 +03:00
Tayou	b9c1dc7325	Merge pull request #1374 from Trial97/welcome_background ... Added welcome screen	2023-10-19 20:42:47 +02:00
Trial97	03a27d5b5a	Updated Managed Packs ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-19 19:47:48 +03:00
TheKodeToad	cf33927f21	Merge remote-tracking branch 'upstream/develop' into sysprops ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-19 11:28:07 +01:00
Trial97	8d4f508cc6	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent	2023-10-18 18:08:48 +03:00
Trial97	30f73a0696	Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into concurrent ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-18 18:08:31 +03:00
TheKodeToad	c638a63a03	Merge pull request #1726 from Trial97/contrib ... Added Trial97 as maintainer in about dialog	2023-10-18 09:34:12 +01:00
Sefa Eyeoglu	2081fcd3f5	Merge pull request #1722 from Scrumplex/fix/readonly-themes	2023-10-18 09:25:48 +02:00
Trial97	165d218300	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into contrib	2023-10-18 09:07:36 +03:00
Trial97	fea4c4eba8	Updated filters ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-18 09:00:45 +03:00
seth	069bc887f1	fix: don't always build updater on platforms besides mac ... Signed-off-by: seth <getchoo@tuta.io>	2023-10-17 19:12:00 -04:00
Trial97	b54376062e	Added mcVersion column ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-17 19:25:01 +03:00
Trial97	9001d9eb75	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2023-10-17 18:32:18 +03:00
Sefa Eyeoglu	d348f20dd9	fix: allow loading themes with missing resources folder ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-10-17 10:00:17 +02:00
Trial97	cc66350286	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-16 23:42:19 +03:00
Trial97	9400879242	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-16 23:32:24 +03:00
Trial97	b6f48f6fe0	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-16 23:13:53 +03:00
Trial97	869f654a10	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-16 22:46:11 +03:00
Tayou	436db23ffc	Merge pull request #1268 from Ryex/feat/launcher-updater ... Feat: Windows (And portable linux / appimage) Auto Updater	2023-10-16 19:53:50 +02:00
Alexandru Ionut Tripon	0927035a26	Merge pull request #1549 from Trial97/atlauncher_browser ... added suport for atlauncher browser download	2023-10-16 06:39:12 +01:00
Tayou	5985d8b118	Merge pull request #1383 from TheKodeToad/rename-groups ... Rename groups	2023-10-15 23:38:27 +02:00
TheKodeToad	cc990c4f94	Merge branch 'develop' into env-vars ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-15 21:57:20 +01:00
TheKodeToad	c4882e7162	Merge pull request #443 from TheKodeToad/skinfix ... Add legacy skin fix	2023-10-15 21:46:29 +01:00
Trial97	0ff98c5876	allways enable dependencies ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-15 21:22:59 +03:00
Trial97	fe14e48d72	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods	2023-10-15 21:06:40 +03:00
Trial97	9d15255e0a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into atlauncher_browser	2023-10-15 20:52:38 +03:00
Trial97	ca9b593483	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions	2023-10-15 20:44:45 +03:00
Trial97	6bbff310bc	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater	2023-10-15 17:42:39 +03:00
Trial97	52c94eb568	reset the setting if is under 0 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-15 16:47:23 +03:00
TheKodeToad	6fb7a98901	Fix small mistake 😭 ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-15 14:45:05 +01:00
Tayou	9705e6325a	Merge pull request #1673 from Trial97/win_attr ... fix folder attributes on windows copy	2023-10-15 15:15:36 +02:00
TheKodeToad	7112d04df5	Mark setting as optional ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-15 14:11:08 +01:00
Trial97	b075711be0	ensured totalTimePlayed is allways greater than 0 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-15 16:03:14 +03:00
Alexandru Ionut Tripon	2ab48a43dd	Merge pull request #1706 from Trial97/develop ... removed the better release for modrinth modpacks	2023-10-15 12:24:20 +01:00
Trial97	749975e8ef	made side and loaders visible to user ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-15 12:46:23 +03:00
Trial97	ab725eeb18	corected side and added loaders ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-15 11:52:28 +03:00
Trial97	023b3e3c39	Fixed arch build ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-14 09:41:04 +03:00
Tayou	7015b8f7b2	Merge pull request #1563 from Trial97/modrinth_pack ... Pack import fixes and improvements	2023-10-13 16:38:37 +02:00
Trial97	32eaaa25d9	removed the better release for modrinth modpacks ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-13 00:04:36 +03:00
Hazel	e66c3b9419	Add game category to generated Linux shortcuts ... Signed-off-by: Hazel <hazel@theopensource.company>	2023-10-11 23:19:14 +02:00
Trial97	5d56ac7cf2	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip	2023-10-10 21:15:31 +03:00
Trial97	5f7513d61c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-10 19:49:40 +03:00
Trial97	0b6373e4df	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-10 19:46:27 +03:00
Alexandru Ionut Tripon	ca4b58d5d7	Merge pull request #1405 from Trial97/update_file ... Allow updating managed packs from local file	2023-10-10 16:17:08 +01:00
Alexandru Ionut Tripon	4eb8db16f1	Merge pull request #1543 from Trial97/packwiz ... refactor packwiz file write	2023-10-10 16:16:57 +01:00
Alexandru Ionut Tripon	a7842ecc33	Merge pull request #1591 from Trial97/ftb_import_fix ... fix: make cached instead of file for ftb pack import	2023-10-10 16:16:40 +01:00
Alexandru Ionut Tripon	6150908025	Merge pull request #1658 from Trial97/neoforge_version ... Added version check for neoforge filter	2023-10-10 16:16:21 +01:00
Trial97	5cb6d93136	fixed updater build ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-09 22:25:45 +03:00
Trial97	7e6a08548d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater	2023-10-09 19:58:43 +03:00
Trial97	8dd640819d	removed processEvents from ConcurrentTask ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-09 01:50:14 +03:00
Trial97	47dbb09115	Improvements to concurrent task ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-07 00:21:40 +03:00
Trial97	dc74ea7382	fixed wrong account selection ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-06 19:27:26 +03:00
Trial97	8d0a53273f	Add no_color env variable ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-06 18:42:54 +03:00
Alexandru Ionut Tripon	bca5e8f395	Update launcher/minecraft/PackProfile.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-10-06 16:16:03 +03:00
TheKodeToad	d49f81d132	Drop leftover mod loader settings ... I messed up the merge. Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-10-06 11:27:04 +01:00
Trial97	82461b1113	rename for windows ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-06 08:51:45 +03:00
Trial97	4f1ee85424	check for minecraft java runtime ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-06 00:21:37 +03:00
nea	c6c17036e3	Add more Java installation dirs ... Signed-off-by: nea <nea@nea.moe>	2023-10-04 21:20:59 +02:00
Trial97	e913f61305	added a more strict condition for neoforge forge support ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-04 19:29:37 +03:00
Tayou	024c474658	Merge pull request #1678 from Trial97/release_order ... fixed quilt dependencies	2023-10-04 10:28:45 +02:00
Sefa Eyeoglu	03ad430699	Merge pull request #1537 from Trial97/warnings	2023-10-04 09:40:38 +02:00
Trial97	ac38585a2a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into release_order	2023-10-04 09:41:49 +03:00
Trial97	3cba5adb5a	updated dependency cycle ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-04 09:41:40 +03:00
Sefa Eyeoglu	d186c34385	Merge pull request #1676 from Trial97/release_order ... revert back the release order	2023-10-04 07:43:21 +02:00
Trial97	77979b4c95	revert back the release order ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-03 17:23:26 +03:00
Trial97	8069de29b2	fix folder attributes on windows copy ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-02 21:53:08 +03:00
Tayou	540fc7d2a8	Merge pull request #1670 from Trial97/seg_fault ... Don't update mods if no mod loader is installed	2023-10-02 17:05:07 +02:00
Sefa Eyeoglu	d612ab94a7	Merge pull request #1672 from Trial97/skin_refresh ... refresh default account when list changes	2023-10-02 16:06:12 +02:00
Sefa Eyeoglu	bfa9613373	Merge pull request #1657 from Trial97/shader_txt	2023-10-02 11:56:50 +02:00
Trial97	93be8b0735	refresh default account when list changes ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-02 09:13:02 +03:00
Trial97	2cea7454ef	fix: do not update mods if no mod loader is selected ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-10-01 23:04:19 +03:00
cullvox	87f34f07d7	Merge branch 'develop' into components-resource-pack-fix ... Signed-off-by: cullvox <68567525+cadenmiller@users.noreply.github.com>	2023-10-01 11:58:44 -04:00
Sefa Eyeoglu	eab1180f68	Merge pull request #1090 from Ryex/feat/acknowledge_release_type	2023-10-01 14:32:58 +02:00
Sefa Eyeoglu	e3a147f56d	Merge pull request #1656 from Trial97/remove_mojang2	2023-10-01 14:32:42 +02:00
Alexandru Ionut Tripon	317c7b5544	Update launcher/minecraft/auth/AccountList.cpp ... Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-10-01 00:32:17 +03:00
Alexandru Ionut Tripon	00bbbdc6e9	Update launcher/LaunchController.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-10-01 00:31:51 +03:00
Trial97	2e4fcd6aa3	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 23:26:15 +03:00
Trial97	09a10a916b	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 23:23:42 +03:00
Trial97	34294383eb	added version type to dep update ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 23:18:23 +03:00
Trial97	4802f6950e	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 23:06:18 +03:00
Sefa Eyeoglu	531b58093e	Merge pull request #1263 from Trial97/develop	2023-09-28 22:03:14 +02:00
Sefa Eyeoglu	2ff9ef0620	Merge pull request #1363 from Trial97/download_threads	2023-09-28 22:02:57 +02:00
Trial97	5b7c5607a9	removed flame consturctor ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 22:53:40 +03:00
Trial97	9acbf98f94	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 22:50:12 +03:00
Trial97	bef701eba8	chaged folder again ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 21:27:11 +03:00
Trial97	742384909f	updated portable update ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 21:24:31 +03:00
Trial97	606c12ffeb	more fixing ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 18:47:21 +03:00
Trial97	498c9db1ce	fixed appImageUpdate ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-28 15:14:59 +03:00
Sefa Eyeoglu	59e565ef96	Merge pull request #1643 from bolli24/develop	2023-09-27 17:34:32 +02:00
seth	f370f0d749	chore: cleanup a few more mentions of mojang accounts ... Signed-off-by: seth <getchoo@tuta.io>	2023-09-27 05:34:48 -04:00
Trial97	b8d9c3d779	format ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-26 20:19:35 +03:00
Trial97	ebde563648	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater	2023-09-26 20:16:46 +03:00
Trial97	4ee6a6711d	Added version check for neoforge filter ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-25 23:04:21 +03:00
Trial97	86b47b3421	Do not display invalid shaders ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-25 22:33:36 +03:00
Trial97	7c636d4608	Removed mojang ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-25 17:44:04 +03:00
alexia	1684cff7ac	Update links to Minecraft Wiki ... Minecraft Wiki has officially moved from Fandom to their own wiki. I updated some links I found in comments. Signed-off-by: alexia <me@alexia.lol>	2023-09-25 15:49:12 +02:00
bolli24	14af7044be	Update launcher/ui/dialogs/ModUpdateDialog.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: bolli24 <9805065+bolli24@users.noreply.github.com>	2023-09-24 03:01:47 +02:00
bolli24	f3c089792a	Skip folders when updating mods. ... Previously the mod updater would fail, reporting "The mod updater was aborted!", when trying to update a folder. Signed-off-by: bolli24 <4827765-bolli24@users.noreply.gitlab.com>	2023-09-22 21:36:19 +02:00
Alexandru Ionut Tripon	81a3ba18bc	Update launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-09-20 18:45:23 +03:00
Trial97	a49851cb40	updated blocked mods with empty hash ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-19 15:48:12 +03:00
Sefa Eyeoglu	00af385619	Merge pull request #1572 from Trial97/catpacks2	2023-09-16 18:22:13 +02:00
Sefa Eyeoglu	bf6dc10f35	Merge pull request #1605 from TheKodeToad/flame-shaders	2023-09-16 18:20:45 +02:00
Trial97	0e41ceffc4	removed missed header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-16 19:18:58 +03:00
Trial97	01e98a6ce8	simplify the raw json parsing ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com> Fixed Tests Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-16 19:12:09 +03:00
cullvox	4053229544	DCO Remediation Commit for cullvox <cullvox@outlook.com> ... I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: c81689d393 Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-15 20:55:34 -04:00
cullvox	07645984b5	Merge branch 'components-resource-pack-fix' of https://github.com/cadenmiller/PrismLauncher into components-resource-pack-fix	2023-09-15 20:41:27 -04:00
cullvox	c81689d393	fixes html elide issue with InfoFrame	2023-09-15 20:41:21 -04:00
cullvox	e96d0b6caf	DCO Remediation Commit for cullvox <cullvox@outlook.com> ... I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: ee7016fa54 Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-13 14:31:04 -04:00
cullvox	e1dda6c005	DCO Remediation Commit for cullvox <cullvox@outlook.com> ... I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: ddf0c28b1b Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-12 21:50:33 -04:00
cullvox	ddf0c28b1b	clang-format fixes	2023-09-12 21:45:29 -04:00
cullvox	a4e6530513	added tests, fixed issues with overriding/format ... In the documentation it states that child values can override the parent values. Originally this code did not support that but now it does. Also added in testing inspired by the previous tests. Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-12 21:34:42 -04:00
cullvox	df88ccd419	clean up and add review suggestions, links open ... Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-11 15:49:01 -04:00
cullvox	b16085f66c	attempt to fix clang-format and ubuntu build. ... Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-11 02:05:05 -04:00
cullvox	fbe4043651	fix formatting and add more proper errors. ... Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-11 01:34:53 -04:00
cullvox	58bd6d929f	added formatting with colors. ... This is somewhat dirty implementation and I will clean it up soon. Using the HTML rich text features of Qt, made it much easier to understand what was needed. Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-10 23:37:26 -04:00
Trial97	9445a555e4	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packwiz ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-10 16:24:59 +03:00
Trial97	47d1f23568	added side for modrinth mods ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-10 16:22:57 +03:00
cullvox	7a7c3015f4	fix not properly reading json text. ... The text now displays properly in the GUI of Prism. Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-09 20:25:49 -04:00
cullvox	1261908ef7	remove space for clang-format ... Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-09 19:55:55 -04:00
cullvox	ef1dc2afac	DCO Remediation Commit for cullvox <cullvox@outlook.com> ... I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: 05f4214cc5 Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-09 19:50:59 -04:00
cullvox	05f4214cc5	fix clang-format failing	2023-09-09 19:50:13 -04:00
cullvox	04aa0155bf	DCO Remediation Commit for cullvox <cullvox@outlook.com> ... I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: d2e662ddbb Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-09 19:45:30 -04:00
cullvox	093d09efe3	fix style, and use qWarning instead of throw. ... Signed-off-by: cullvox <cullvox@outlook.com>	2023-09-09 19:03:33 -04:00
cullvox	d2e662ddbb	added support for components in resource pack descriptions. ... Signed-off-by: Caden Miller <me@cadenmiller.dev>	2023-09-09 12:35:34 -04:00
Trial97	6ec1cf6e49	made skin upload more generic ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-08 19:50:46 +03:00
Trial97	8c8e4329d7	fix codeql ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-05 23:45:32 +03:00
Trial97	8bad255a91	added more import options ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-05 20:13:16 +03:00
Trial97	ab648e58ce	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector	2023-09-05 00:18:45 +03:00
Trial97	c86b8b0f70	added skin manage dialog ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-05 00:18:36 +03:00
Sefa Eyeoglu	d483b613b1	Merge pull request #1578 from TheKodeToad/antialiasing	2023-09-04 17:05:29 +02:00
Sefa Eyeoglu	546d49e183	Merge pull request #1530 from Trial97/metadata_delete	2023-09-04 17:02:52 +02:00
TheKodeToad	94c1cd6bcf	CurseForge shader downloading ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-09-04 14:15:37 +01:00
TheKodeToad	347228a246	Legacy settings override default -> false ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-09-02 22:29:26 +01:00
TheKodeToad	1213a5ab46	Merge remote-tracking branch 'upstream/develop' into skinfix ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-09-02 22:27:57 +01:00
Trial97	9ad029e028	added skins directory ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 23:10:33 +03:00
Trial97	abbac5c26c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 22:28:59 +03:00
Trial97	17f696bffc	small tweaks to atl icons ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 22:25:15 +03:00
Trial97	e095780cc3	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into modrinth_pack ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 21:36:28 +03:00
Trial97	609eaa67ab	refactored skin apis ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 21:23:51 +03:00
Trial97	30ff417074	fix: make cached instead of file for ftb pack import ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-09-01 16:25:49 +03:00
Trial97	c2b03d0f71	Fully reload the instance list once the folder is changed ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-31 20:35:56 +03:00
TheKodeToad	25ce11d85d	Merge pull request #1539 from Trial97/refactor_modpack_ux ... Improvements to modpack UX	2023-08-31 14:58:54 +01:00
TheKodeToad	befa3baa6a	Merge branch 'develop' into feat/launcher-updater ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-30 11:47:33 +01:00
TheKodeToad	f23a8e4b4b	Enable antialiasing for mod and pack icons ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-29 23:34:19 +01:00
TheKodeToad	8c30cb3706	Fix CI ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-29 13:27:06 +01:00
TheKodeToad	c1855c6ce3	Merge branch 'develop' into rename-groups ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-29 12:41:40 +01:00
TheKodeToad	0e67686295	Hide index folder in pack export dialog ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-28 17:25:07 +01:00
TheKodeToad	e98bca4749	Fix cancelling pack save ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-28 17:09:40 +01:00
Trial97	211865a1e1	handle gracefully the upload abort ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-28 13:31:19 +03:00
Sefa Eyeoglu	fbf6833124	Merge pull request #1519 from TheKodeToad/better-export-pack	2023-08-28 10:29:32 +02:00
Trial97	5d70f4dbca	removed if ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-28 08:50:10 +03:00
Trial97	07d8598638	added catpacks tests ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-27 23:40:32 +03:00
Trial97	79652799bd	Made text smaller ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-27 21:30:46 +03:00
Trial97	630145a1d0	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background	2023-08-27 21:03:21 +03:00
Trial97	0680d2dceb	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-27 20:41:56 +03:00
TheKodeToad	9110fbf282	Merge pull request #1560 from Trial97/curse_multiple_loaders2 ... Add suport for flame multiple loaders	2023-08-27 18:21:14 +01:00
TheKodeToad	e3b04d10cf	Merge pull request #1536 from Trial97/time3 ... Allow showing playtime in hours	2023-08-27 18:14:04 +01:00
Trial97	8c607ae734	removed extra if ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-27 20:02:12 +03:00
Trial97	c5aac24a93	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse_multiple_loaders2 ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-27 15:53:35 +03:00
Trial97	4036cecfc0	Added progress widget to some modpack providers ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-27 15:04:42 +03:00
Sefa Eyeoglu	df14f88307	Merge pull request #1532 from Trial97/curseforge-url-handle	2023-08-27 12:26:57 +02:00
TheKodeToad	479335dfe0	Rewrite optional mod dialog ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-27 00:50:33 +01:00
TheKodeToad	d1566f2610	Merge branch 'develop' into env-vars ... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-26 23:12:02 +01:00
Trial97	a2d44744fe	do not update the metadata if mod is invalid ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-26 23:36:46 +03:00
Trial97	288d0d1fd4	Added back api loader filtering if just one is selected ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-26 22:26:01 +03:00
Trial97	abfd1a4205	minor dependency crash fix ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-25 18:35:25 +03:00
Trial97	c54fecf5d9	added condition for empty loader type ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-25 09:05:04 +03:00
Trial97	172680abf8	removed aditional header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-24 13:42:36 +03:00
Trial97	5f3e9672cd	made the loaders check more generic ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-24 13:31:57 +03:00
Trial97	f897b14e3e	changed technic icon name retrival ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-24 13:05:27 +03:00
Trial97	bb4b89470d	fixed icon importing ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-24 12:46:23 +03:00
Trial97	2990c5d0c9	Added optional mods dialog ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-24 12:44:11 +03:00
Trial97	ea384d59fb	use qt separtor for file path ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-24 12:41:37 +03:00
Trial97	6c0492c0d1	return 0 for any ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 21:09:32 +03:00
Trial97	1515607060	updated getMappedModLoader ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 20:16:51 +03:00
Sefa Eyeoglu	85c23b26de	chore: reformat ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-23 13:46:23 +02:00
Trial97	6178e5a975	reverted change for optional ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 13:55:38 +03:00
Trial97	aa065f2b51	Updated dependency resolution ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 13:28:23 +03:00
Sefa Eyeoglu	2283498ccb	Merge pull request #1552 from Trial97/memory_quick_setup	2023-08-23 11:56:53 +02:00
Trial97	e6ba2f4970	Added loaders check on versions load ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 12:52:51 +03:00
Trial97	f8f9ffa118	added loaders for flame version ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 11:33:45 +03:00
Trial97	4704c522e0	moved modloaderTypes to ModPlatform ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-23 10:26:57 +03:00
TheKodeToad	f7951f6082	Merge pull request #1548 from Trial97/version_label ... Reset status label when deleting instance	2023-08-22 15:14:02 +01:00
Alexandru Ionut Tripon	eed7e996da	Update launcher/ui/widgets/JavaSettingsWidget.cpp ... Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-08-22 16:17:05 +03:00
Alexandru Ionut Tripon	06dbd381f8	Update launcher/ui/pages/instance/InstanceSettingsPage.cpp ... Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-08-22 16:16:57 +03:00
Alexandru Ionut Tripon	3574d89e0f	Update launcher/ui/pages/global/JavaPage.cpp ... Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-08-22 16:16:50 +03:00
TheKodeToad	0e96111116	Merge pull request #1556 from Trial97/metacache ... Gracefully handle invalid cache metadata	2023-08-22 14:09:44 +01:00
Trial97	09aca7a0b5	Added warning to settings page ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-22 10:52:35 +03:00
Sefa Eyeoglu	b1783d8fb1	Merge pull request #1557 from Trial97/curse_crash	2023-08-21 23:04:45 +02:00
Trial97	c3d03f0c33	added check for valid query items in curse url install ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 22:20:33 +03:00
Trial97	7acfe36a62	fixed httpmetacache load ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 21:30:44 +03:00
Trial97	bf810053b7	updated instance copy ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 17:54:16 +03:00
Trial97	45dad27a6d	fixed check ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 17:46:50 +03:00
TheKodeToad	fff378b643	Merge pull request #1553 from TheKodeToad/list-fixes ... A few boring list-related fixes	2023-08-21 15:33:16 +01:00
TheKodeToad	d7dadabfbf	List fixes ... Double-click to toggle profile components. Restore double-click to toggle resources. Fix clicking on checkbox to select account. Double-click to select account. Signed-off-by: TheKodeToad <TheKodeToad@proton.me>	2023-08-21 14:44:46 +01:00
Trial97	1eb75b6852	fixed build ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 15:34:45 +03:00
Trial97	492bf373c6	updated memory allocation on quick setup ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 15:00:11 +03:00
Trial97	02264f67f3	Fixed codeql ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 14:15:51 +03:00
Danny Dorazio	3638fc0a7d	Update “Welcome” message on account list page	2023-08-20 23:00:50 -04:00
Danny Dorazio	8092c321a9	Replace instances of “Minecraft account”	2023-08-20 23:00:25 -04:00
Trial97	8e5be6f420	added suport for atlauncher browser download ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-21 00:09:46 +03:00
Trial97	19316e22b4	fixed status label after instance remove ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-20 22:46:44 +03:00
Trial97	254444470f	renamed enum type ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-20 16:40:58 +03:00
Sefa Eyeoglu	5b4dcae7d9	Revert "feat: add toggle for quilt beacon" ... This reverts commit 89aaedc06c. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-20 13:23:11 +02:00
Sefa Eyeoglu	963627fe98	Revert "chore: better explain quilt loader beacon" ... This reverts commit a2a09ffe01. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-20 13:23:08 +02:00
TheKodeToad	ebbc8838a8	Merge pull request #1541 from Trial97/neoforge_search ... feat:neoforge can download forge mods	2023-08-19 23:10:56 +01:00
Trial97	d25e89a4c1	refactor packwiz file write ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-20 00:48:46 +03:00
TheKodeToad	f99b04bd16	Merge pull request #1320 from TheKodeToad/better-launch ... Combine launch buttons in instance window, persist profiler	2023-08-19 11:08:02 +01:00
Sefa Eyeoglu	acf586ef82	chore: add fixme about UI code in Minecraftinstance ... Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2023-08-19 10:21:46 +02:00
Trial97	0138cd65cb	feat:neoforge can download forge mods ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-19 09:00:59 +03:00
Trial97	ab6301d5a1	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop	2023-08-19 00:38:40 +03:00
Sefa Eyeoglu	3098aecf97	Merge pull request #1498 from Scrumplex/neoforge	2023-08-18 22:56:55 +02:00
Trial97	05094b7382	more fixes ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 22:24:30 +03:00
Trial97	58efd3e9e2	fixed code scaning ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 21:43:57 +03:00
Trial97	4c52b18bdd	replaced removeFirst with mid ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 20:19:51 +03:00
Trial97	44ff247f5f	feat:refactored modpack ux ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 20:03:02 +03:00
Trial97	fecc1e087a	Add Trial97 to contribuitors list ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 13:35:50 +03:00
Trial97	d3acac16e6	added -Wno-gnu-zero-variadic-macro-arguments and fixed more warnings ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-08-18 13:10:13 +03:00
Alexandru Ionut Tripon	28ffa8bf44	Update launcher/ui/pages/global/MinecraftPage.ui ... Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2023-08-18 12:57:08 +03:00