Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-11 20:57:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,555 Commits 9 Branches 38 Tags
e2b346fc53bc326a5e67a74ab67bc5447044afa0
Commit Graph

2050 Commits

Author SHA1 Message Date
timoreo
62f19a6ac9 Merge pull request #2863 from Trial97/fix_resource_search_equal 2024-10-01 11:41:11 +02:00
timoreo
c57e26cf57 Merge pull request #2874 from Trial97/modpack_equal 2024-10-01 11:40:42 +02:00
Trial97
946e791d39 sync modpack search field 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:53:27 +03:00
Trial97
5ea2dece54 fix search term not remaining the same between providers on resource download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:52:07 +03:00
Trial97
0eefa52dbc fix some transtaions warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:51:06 +03:00
seth
38fa2e0cd4 style: format with clang-format 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:32:55 -04:00
Cart
6475dc5786 Lots of J's for Java needed to be uppercased 2024-09-26 01:58:21 -04: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
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
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
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
2fd8685894 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into java_dir 2024-09-16 20:08:20 +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
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
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
1db122f1a2 fix typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 21:37:50 +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
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: 7fbf0d3bf3

Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
 2024-09-09 16:24:40 +02:00
QazCetelic
7fbf0d3bf3 Sort files chronologically in descending order 
Signed-off-by: Qaz <dev@malplena.net>
 2024-09-09 15:40:31 +02:00
Trial97
2622d3daa9 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_mc_launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-09 08:11:11 +03:00
TheKodeToad
01015a7345 Merge pull request #2547 from Ryex/fix/component-version-resolusion 
Component version resolusion on Minecraft version change
 2024-09-08 23:44:07 +01:00
Trial97
14fb54afd9 Fix launch when no java is loaded 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-08 09:10:29 +03:00
Alexandru Ionut Tripon
685519d12f Merge pull request #2758 from Edgars-Cirulis/improvements/instanceview-navigation 
Improve left and right cursor navigation in Instances
 2024-08-26 23:55:03 +03:00
Edgars Cirulis
630df29010 feat: Improve left and right cursor navigation in Instances 
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 2024-08-26 22:45:01 +03:00
Trial97
034e2a44ad update thresholds each time java result changes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-26 17:43:49 +03:00
Trial97
d55ebefac3 fix java 64 bit condition 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-25 21:42:40 +03:00
TheKodeToad
23c69e7f94 Merge pull request #2018 from Trial97/coremods 
Ensure that core mods tab is visible on correct versions
 2024-08-25 13:01:27 +01:00
TheKodeToad
cbdacf81ee Fix system theme detection 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-08-24 22:50:51 +01:00
Trial97
575cdb043b Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-23 08:29:43 +03:00
Trial97
92495494ca Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-23 08:16:59 +03:00
Trial97
0b05c7cb07 fix bug with buton not updating corectly for java dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-22 18:59:09 +03:00
Trial97
aa3a4585ee Add icons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-22 18:58:04 +03:00
TheKodeToad
2ad34c724e Make log colours themeable 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-08-21 22:19:50 +01:00
Trial97
26ae608685 fix initial java dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-21 15:01:42 +03:00
Trial97
002fc71b8d allways load java list on autodetect 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-20 01:18:37 +03:00
Trial97
ca298d1ed5 add automatic java switch on minecraft version switch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-20 01:08:03 +03:00
Trial97
7a66276838 fix conflicts 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-20 01:07:23 +03:00
Trial97
4d24213aa3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-08-20 00:02:14 +03:00
Trial97
23c06f23c3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion 2024-08-19 22:35:11 +03:00
Trial97
38b5ee198a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-08-18 22:39:46 +03:00