Commit Graph

3957 Commits

Author SHA1 Message Date
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 2fd8685894 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into java_dir 2024-09-16 20:08:20 +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 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
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
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
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 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: 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
Rachel Powers c2a2e95183 fix: Forge and neoforge conflict with quilt, not fabric twice
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-09-07 21:35:01 -07:00
Trial97 c5592a446a Remove all the slowdown code from CocurrentTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-06 21:47:35 +03:00
Trial97 166207753c ensure that the shortcut destination exists
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-05 09:36:45 +03:00
Kurumi78 4ea7132bdf Add webp validIconExtensions
Add webp to list of valid file extensions for Icons

Signed-off-by: Kurumi78 <30587387+Kurumi78@users.noreply.github.com>
2024-08-30 02:08:07 -05:00
timoreo 828acef7e9 Merge pull request #2760 from Trial97/mangohid
fix mangohud detection for absolute path
2024-08-29 06:24:09 +02: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
Alexandru Ionut Tripon 74acb483af Merge pull request #2757 from Trial97/hash_maybe
Add checksum validator to resource download
2024-08-26 23:54:29 +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 c64b7cd693 fix mangohud detection for absolute path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-26 09:00:46 +03:00
Trial97 430013737a add checksum validator
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-26 00:27:23 +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 ff9fa6aa4f Stop accepting malformed hashes object
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-25 11:45:45 +01:00
Alexandru Ionut Tripon 44f589817f Merge pull request #2749 from TheKodeToad/theme-bugfixes
Fix system theme detection
2024-08-25 08:58:42 +03:00
Alexandru Ionut Tripon aa206f4c89 Merge pull request #2748 from TheKodeToad/gentoo-java-perf
Improve Java checking speed by using startsWith for gentoo paths
2024-08-25 08:58:22 +03:00
Rachel Powers 5f874330d5 security(modrinth) reorder hash algo priority, prefer stronger hashes.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-08-24 20:24:35 -07:00