723 Commits

Author	SHA1	Message	Date
Trial97	45463dcd75	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip	2024-06-04 11:04:02 +03:00
Trial97	f4f0a61bf2	fix vanilla technic modpacks ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-31 16:15:12 +03:00
Alexandru Ionut Tripon	2145f9f0ac	Merge pull request #1847 from Trial97/move_export2 ... Improvements to modlist export	2024-05-31 09:58:32 +03:00
Trial97	a7a1b28765	improve invalid path name ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-30 13:49:23 +03:00
Trial97	e94243f99b	fix blocked mods api ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-30 09:56:55 +03:00
Trial97	5a598db608	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods	2024-05-18 17:40:54 +03:00
Trial97	5bd28e2cc8	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2024-05-18 17:11:41 +03:00
Trial97	ba947993c2	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip	2024-05-18 12:47:01 +03:00
Tayou	acd23ff163	Merge pull request #2402 from Trial97/refactor_auth ... Improve Microsoft login	2024-05-18 11:07:16 +02:00
Alexandru Ionut Tripon	eb0d0450e3	Merge pull request #2382 from Trial97/neoforge_technic ... Add neoforge support for technic packs and atlauncher packs	2024-05-18 10:40:45 +03:00
Trial97	3336f8107c	Removed AuthRequest and NetAction ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-14 00:21:45 +03:00
Trial97	a95c1768a7	Add neoforge support for technic packs and atlauncher packs ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-05-08 14:16:12 +03:00
Trial97	30ce8ecb5f	Fixed imports ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-04-30 23:20:24 +03:00
Trial97	5400c24c73	Ensure valid file names for resource names ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-04-30 23:04:50 +03:00
Trial97	e068120375	Fix invalid characters filename download on windows ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-04-30 22:56:40 +03:00
Trial97	a5b059ebad	Fixed curseforge export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-04-29 00:27:15 +03:00
Trial97	e07e182e95	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2024-04-24 23:51:43 +03:00
Trial97	3a4f82ffd1	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-04-24 00:21:39 +03:00
Trial97	d88fb266a5	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2	2024-04-20 17:42:58 +03:00
Trial97	8121a6536b	Fixed pack update ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-04-12 23:45:31 +03:00
Trial97	a0eba1ace6	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2024-03-31 21:15:49 +03:00
Trial97	28cfd31269	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-29 10:30:42 +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
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
Trial97	3c12e27226	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters	2024-03-23 23:53:25 +02:00
Trial97	05487152fe	Fixed curesforge export ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-03-17 20:53:26 +02:00
chouzz	92113e233a	Add totalTimePlayed for FTBApp import ... Signed-off-by: chouzz <zhouhua852@gmail.com>	2024-03-09 19:36:40 +08: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
DioEgizio	99cbb5d0b2	Merge pull request #2110 from Trial97/fix_curseforge	2024-02-18 12:42:09 +01: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	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	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	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
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
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
lumiscosity	c29af83dc3	fix styling ... Signed-off-by: lumiscosity <averyrudelphe@gmail.com>	2023-12-23 14:16:29 +01:00
lumiscosity	358cf5b348	add archived project warning ... Signed-off-by: lumiscosity <averyrudelphe@gmail.com>	2023-12-22 22:04:33 +01: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
Sefa Eyeoglu	f8a6a099c7	Merge pull request #1732 from Trial97/update_file2	2023-12-11 11:08:07 +01:00
Trial97	657416fe30	Removed header ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2023-12-03 21:29:02 +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	3234bb5a8c	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve	2023-11-23 17:05:37 +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	80383d237a	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods	2023-11-23 13:38:11 +02:00