4036 Commits

Author	SHA1	Message	Date
Trial97	1b2e9b95e2	add prefix to non-standard packwiz fields ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-25 21:17:44 +03:00
seth	3e60713257	Merge pull request #2838 from Trial97/view_log ... Always display Minecraft log tab	2024-09-24 20:00:54 -04:00
seth	48904c0d66	Merge pull request #2806 from Trial97/technic_client ... Add Technic client ID	2024-09-24 19:55:21 -04:00
Alexandru Ionut Tripon	4a40b53e5f	Merge pull request #2845 from Trial97/typo ... fix updater typo	2024-09-22 19:09:40 +03:00
Trial97	9567d763c1	fix java archive typo ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-21 22:17:44 +03:00
Trial97	3e1cf6b2a7	fix updater typo ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-20 16:58:22 +03:00
Trial97	1243328876	fix folder duplication for modrinth ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-20 16:53:36 +03:00
Trial97	77463c6d33	display minecraft log before instance run ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-18 21:17:15 +03:00
timoreo	dc67807894	Merge pull request #2825 from Trial97/skin_fix	2024-09-17 08:50:19 +02:00
Alexandru Ionut Tripon	926a6bc72a	Merge pull request #2583 from Trial97/metadata2 ... Generate updater metadata for mods added/updated using modpack updater/installer	2024-09-17 08:45:09 +03:00
Alexandru Ionut Tripon	d06f0529a0	Merge pull request #2830 from Trial97/login_wizard_retry ... Show login dialog again if account login fails	2024-09-17 08:44:41 +03:00
Alexandru Ionut Tripon	53c3d99bdd	Merge pull request #2828 from Trial97/cmake_fields ... Allow configuring more URLs through CMake	2024-09-17 08:44:24 +03:00
Alexandru Ionut Tripon	c57b1d4227	Merge pull request #2820 from Trial97/mac_java ... Add extra step to macos java install	2024-09-17 08:44:09 +03:00
Trial97	3ca67cc388	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2	2024-09-16 20:08:43 +03:00
Trial97	2fd8685894	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into java_dir	2024-09-16 20:08:20 +03:00
Trial97	0af639c20b	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login	2024-09-16 20:07:18 +03:00
Trial97	7438c71fdd	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into login_wizard_retry	2024-09-16 20:06:50 +03:00
Trial97	b4ecb38ae5	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cmake_fields	2024-09-16 20:06:18 +03:00
Trial97	f36cfaf878	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_fix	2024-09-16 20:05:44 +03:00
Trial97	aab82705cd	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mac_java	2024-09-16 20:05:18 +03:00
Trial97	e53a5b3eca	replace TRANSLATIONS_BASE_URL with TRANSLATION_FILES_URL ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-16 17:51:35 +03:00
seth	7eac06cad9	Merge pull request #2829 from Trial97/ask_retry2 ... disable retry for translation files	2024-09-16 10:15:21 -04:00
Alexandru Ionut Tripon	8d14060ad1	Apply suggestions from code review ... Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-09-16 16:46:01 +03:00
seth	8faebe320e	Merge pull request #2807 from Trial97/fix_server_launch ... fix server launch	2024-09-16 09:42:54 -04:00
Trial97	580fc32518	split the auth loading screen ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-16 16:41:16 +03:00
Alexandru Ionut Tripon	db3c7d01fd	Apply suggestions from code review ... Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-09-16 16:36:05 +03:00
Trial97	75756b49c3	reshow login dialog in case account login fails ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-16 16:15:36 +03:00
Trial97	81f30f0360	disable retry for translation files ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-16 15:53:54 +03:00
Trial97	ca6b62c773	move some URLs in cmake ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-16 15:51:51 +03:00
Trial97	d2f0d1d8d5	Wrap FS::write in try catch ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-16 12:42:09 +03:00
Trial97	d38e7fa142	Add more null protection for skin management ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-16 12:41:33 +03:00
QazCetelic	1c6bd74ed8	Disable folder action instead of hiding it and add additional information in the tooltip. ... Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>	2024-09-14 22:04:18 +02:00
Trial97	0afdce8a31	Add extra step to macos java install ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-14 21:18:20 +03:00
Alexandru Ionut Tripon	6492ad7076	Merge pull request #2813 from Trial97/fix_java_autodetect ... fix java autodetect when instance settings are open	2024-09-14 20:19:15 +03:00
Alexandru Ionut Tripon	ad786fb983	Merge pull request #2811 from Trial97/fix_java_abort ... fix download java abort being stuck	2024-09-14 20:19:02 +03:00
Trial97	312009513d	add open java folder action ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-14 19:35:43 +03:00
Trial97	5073fc19d4	fix java autodetect when instance settings are open ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-14 00:36:31 +03:00
Alexandru Ionut Tripon	e59f90eca8	Update launcher/ui/pages/global/APIPage.cpp ... Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-09-14 00:19:48 +03:00
Trial97	22ebf7e961	fix download java abort being stuck ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-14 00:13:16 +03:00
Trial97	6706317f20	fix java crash on refresh ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-13 23:26:04 +03:00
Trial97	e18e9b0509	fix server launch ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-13 22:57:08 +03:00
Trial97	40b10ecf30	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_concurrent_task	2024-09-13 21:38:29 +03:00
Trial97	1db122f1a2	fix typo ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-13 21:37:50 +03:00
Trial97	e34ebc1a0d	Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2	2024-09-13 21:14:48 +03:00
Alexandru Ionut Tripon	d20f24d96f	Apply suggestions from code review ... Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>	2024-09-13 21:13:21 +03:00
Trial97	973b43ca7a	Add techinc client ID ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-13 20:01:45 +03:00
Trial97	c85294af9d	Improve wizzard page ... Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>	2024-09-13 19:33:24 +03:00
Alexandru Ionut Tripon	fa68428a90	Merge pull request #2795 from Trial97/fix_mc_launch ... Fix launch when no java is loaded	2024-09-10 18:57:09 +03:00
Alexandru Ionut Tripon	b17a688237	Merge pull request #2771 from Kurumi78/develop ... Add webp to validIconExtensions	2024-09-10 12:27:02 +03:00
QazCetelic	e2ef280da9	DCO Remediation Commit for QazCetelic <qaz.cetelic@protonmail.com> ... I, QazCetelic <qaz.cetelic@protonmail.com>, hereby add my Signed-off-by to this commit: 7fbf0d3bf3c3821916119a5303d6bc302f954580 Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>	2024-09-09 16:24:40 +02:00