ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity
9,236 Commits 4 Branches 5 Tags 40 MiB
develop
Commit Graph

4391 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
fc445078cd
Merge pull request #2415 from Trial97/configure_timeout 
Add config for transfer timeout
 2024-06-30 22:26:19 +03:00
Alexandru Ionut Tripon
7ff173d72a
Merge pull request #2173 from Trial97/dependency_removal 
Remove dependencies if review mods is rejected
 2024-06-30 22:21:38 +03:00
Alexandru Ionut Tripon
aa24d70a24
Merge pull request #2590 from Trial97/env_dir 
control Prism data directory via env variable
 2024-06-30 20:45:22 +03:00
Alexandru Ionut Tripon
80243ab554
Merge pull request #2588 from Ryex/fix/updater-support-linux-nonportable 
Fix linux non portable update
 2024-06-30 07:54:05 +03:00
Alexandru Ionut Tripon
5d9f4f9ee7
Merge pull request #2589 from Trial97/portabledatadir2 
make sure updater take into consideration UserData
 2024-06-30 07:53:54 +03:00
Rachel Powers
8488d11c69
review suggestions + spelling 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:10 -07:00
Trial97
492c78a570
format the code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 20:34:10 -07:00
Rachel Powers
c4cc1cfe4f
Warn about known conflicting modloaders 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:10 -07:00
Rachel Powers
4ed92a95c2
fix segfaults consistently set component problems 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:09 -07:00
Rachel Powers
a85d6cb1f2
move resolution into update actions in task. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:09 -07:00
Trial97
474effe7c7
clang-format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 20:34:09 -07:00
Rachel Powers
cf319649f9
fix qt5 lwjgl recommend + spelling 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:09 -07:00
Rachel Powers
a94a081b9c
add better profile logging properly resolve important dependencies 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:08 -07:00
Rachel Powers
ce280c2d04
fix misepellings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:08 -07:00
Rachel Powers
a791e22853
fix(instance components): resolve instance componants when changing minecraft version 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:08 -07:00
Rachel Powers
44bf0315ad
feat(components) recomend the correct lwjgl version for the minecraft version 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:33:51 -07:00
Trial97
25bae20db4
trim input from import page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 00:17:25 +03:00
Trial97
7a0b299be9
control Prism data directory via env variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 18:08:28 +03:00
Rachel Powers
ae3e4ed528
fix Build Artifact Checks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 04:29:19 -07:00
Rachel Powers
b4f5c3d241
Update launcher/updater/prismupdater/PrismUpdater.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 04:21:13 -07:00
Rachel Powers
9d1fffff27
reject zsync file as valid build artifact 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 04:21:13 -07:00
Rachel Powers
41bcfb3c07
Fix #2586 
non portable linux update technically works even if not genraly a good idea.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 04:21:06 -07:00
Alexandru Ionut Tripon
e6234b5086
Merge pull request #2504 from Trial97/auth3 
update login flow
 2024-06-29 14:09:49 +03:00
Trial97
eab53c6e42
make sure updater take into consideration UserData 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 14:02:09 +03:00
Trial97
f1a4a1e8ee
increase 'or' font size for login dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 08:41:35 +03:00
Alexandru Ionut Tripon
196b2b5a3e
Merge pull request #2580 from Trial97/silent_background_update_check 
do not display message that no update is avvailable if the check was …
 2024-06-28 23:27:00 +03:00
Trial97
ebad11d34f
made sure const method is respected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 22:04:11 +03:00
Trial97
06add2b0a8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:55:16 +03:00
Trial97
9d903175ab
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:52 +03:00
Trial97
cf220356b1
fixed panic with recursive eventloop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:28 +03:00
Trial97
715c99636d
fix offline mode for meta 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:28 +03:00
Trial97
0a95b57c0a
moved QEventLoops inside functions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:28 +03:00
Trial97
06e1cab41f
force online in case the offline load failed 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:28 +03:00
Trial97
2af6902b42
validate metadata on launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:26 +03:00
Trial97
4f8b20437f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-28 20:49:37 +03:00
Trial97
515baffb8e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 2024-06-28 20:48:28 +03:00
Trial97
4ad19cded5
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:45:54 +03:00
Trial97
0b79abcdcd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:45:30 +03:00
Trial97
90e756c041
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods 2024-06-28 20:41:48 +03:00
Trial97
ddf1ea014c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-06-28 20:39:37 +03:00
Alexandru Ionut Tripon
4aa2e5b85d
Merge pull request #2571 from Trial97/account_refresh 
refresh account if it should refresh on instance launch
 2024-06-28 20:38:05 +03:00
Trial97
55f740453c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2024-06-28 20:34:59 +03:00
Trial97
72dd3dfba5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:30:05 +03:00
Trial97
1021222c95
create mod meta information when importing modrinth pack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:28:52 +03:00
Alexandru Ionut Tripon
2cd0223cff
Merge pull request #2578 from Trial97/clang-format 
chore:increment clang-tools version
 2024-06-28 19:33:18 +03:00
Trial97
09d258670a
create mod meta information when importing curseforge pack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 19:26:11 +03:00
Evan Goode
6bf88b7bfc Don't use archive.org for CurseForge launcher 2024-06-28 12:16:13 -04:00
Trial97
2c02d02214
do not display message that no update is avvailable if the check was done in the background 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 14:11:27 +03:00
Trial97
147741e616
increment clang-tools version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 12:48:52 +03:00
seth
66e6fc04d3
Merge pull request #2520 from Trial97/metadata 2024-06-28 04:57:39 +00:00
Trial97
9d7c36c2fc
made identty certain if the login ended 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-27 15:35:44 +03:00
Alexandru Ionut Tripon
5928bc30e1
Merge pull request #2572 from Trial97/sdkman_macos 
fix sdkman on macos
 2024-06-27 13:20:10 +03:00
Alexandru Ionut Tripon
68292aff6c
Merge pull request #2574 from ajerick/develop 
fix non-persistent user icon selection in NewInstanceDialog.cpp
 2024-06-27 08:38:46 +03:00
seth
3f3351f89e
Merge pull request #1892 from Trial97/change_version 
Added mod reinstall dialog
 2024-06-27 02:12:00 +00:00
Aiden J Erickson
37388e1d48
fix non-persistent user icon selection in NewInstanceDialog.cpp 
Signed-off-by: Aiden J Erickson <aiden.j.erickson@gmail.com>
 2024-06-26 20:54:04 -04:00
Trial97
3b473b24d8
fix sdkman on macos 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-26 10:16:27 +03:00
Trial97
b1a86bec34
refresh account if it should refresh on instance launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-26 09:51:12 +03:00
Alexandru Ionut Tripon
3aaa36a2bc
Merge pull request #2566 from Trial97/mod_warning 
add warnning when user closes the resource download dialog with selec…
 2024-06-26 08:17:16 +03:00
porter milton
2958691857
add ~/Library/Java/JavaVirtualMachines/* to java installation detection 
Signed-off-by: porter milton <57007161+porterporter@users.noreply.github.com>
 2024-06-25 23:16:26 +00:00
Evan Goode
d1b018e8d8 Fetch CurseForge API key from Linux app, not macOS 2024-06-25 13:05:35 -04:00
Trial97
7c38edc93d
Apply suggestion from code review 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-25 16:10:05 +03:00
Alexandru Ionut Tripon
555c4a7c59
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:33:11 +03:00
Alexandru Ionut Tripon
4e9e7212a6
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:22:30 +03:00
Alexandru Ionut Tripon
52839774e6
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:19:23 +03:00
Alexandru Ionut Tripon
1a66db78a9
Apply text change suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:17:51 +03:00
Rachel Powers
14b09549e1
feat(instanceList) persist "ungrouped" hidden state 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-25 01:55:54 -07:00
Trial97
2f88da9de2
add warnning when user closes the resource download dialog with selection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-25 09:50:33 +03:00
Alexandru Ionut Tripon
12db1efd20
Merge pull request #2561 from Trial97/fix_curseforge_logo 
fix missing curseforge logo
 2024-06-25 00:01:03 +03:00
Tayou
6b1c16b01a
Merge pull request #2562 from Trial97/fix_update_message 
fix update message
 2024-06-24 22:17:48 +02:00
Alexandru Ionut Tripon
1fcad8d427
Merge pull request #1886 from Trial97/time4 
Fixed playtime recording
 2024-06-24 23:07:41 +03:00
Trial97
096266c141
fix update message 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 21:31:26 +03:00
Trial97
73db320bff
fix missing curseforge logo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 21:13:21 +03:00
Trial97
00b83efb9a
fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 20:12:40 +03:00
Evan Goode
c3bdc0f79b
Merge pull request #15 from unmojang/evan-goode/disable-updater 
Disable updater, news
 2024-06-24 00:10:14 -04:00
Evan Goode
b8f9d18e26 Remove news toolbar 2024-06-23 23:51:52 -04:00
Evan Goode
bf997aa117
Merge pull request #14 from unmojang/evan-goode/msa 
Use Nintendo Switch client ID
 2024-06-23 23:16:59 -04:00
Evan Goode
62f87c423f Use Nintendo Switch client ID 
Reputable projects such as prismarine-auth and azalea-auth hardcode the
Nintendo Switch client ID instead of their own custom Azure application,
so we should be fine to go ahead and do the same.

Unfortunately, client IDs created for custom Azure applications, such as
Prism Launcher's client ID, will no longer work with Fjord Launcher, so
users who manually supplied a client ID will need to clear theirs.
 2024-06-23 22:57:31 -04:00
Evan Goode
810ab868b3 Fetch CurseForge API key from official files 
Instead of fetching the CurseForge API key from PolyMC's server, fetch
it from the files of the CurseForge app, mirrored by archive.org. We can
do this without downloading the entire 100MiB+ application by
range-requesting the specific DEFLATE block where the key is and
decompressing just that block.
 2024-06-23 22:35:06 -04:00
Trial97
e57c2180da
Resolve issue with multiple loaders during update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 03:06:10 +03:00
Trial97
bb48d1ec9d
made sure that the retry dialog is not displayed offline 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 00:29:21 +03:00
Trial97
c04031ff00
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 2024-06-23 23:40:12 +03:00
Evan Goode
51da756e19 Merge remote-tracking branch 'prismlauncher/release-8.x' into develop 2024-06-23 11:34:11 -04:00
seth
92b9f1a3e3
Merge pull request #2515 from Trial97/size_for_skin 
force aspect ratio for skin preview
 2024-06-22 19:21:59 -04:00
seth
e0063b1ee7
Merge pull request #2429 from Richard-Rogalski/GENTOOweloveyou 
[Linux] Auto-detect Gentoo installed JDKs
 2024-06-22 19:14:46 -04:00
Alexandru Ionut Tripon
369d7d83f5
Merge pull request #2542 from leia-uwu/perf/async-print-servers 
perf: print api servers asynchronously on instance launch
 2024-06-23 01:51:53 +03:00
Trial97
2ac89c2378
add more states for account refresh fail 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-23 01:49:37 +03:00
Trial97
b0386a4c2f
added better error handling 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-23 00:47:48 +03:00
Trial97
24aa337a64
fixed offline accounts 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-23 00:27:49 +03:00
Trial97
27ee8374e7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-22 22:54:38 +03:00
Tayou
178bd4a9c3 don't tr() file types on file save/open, etc. dialogs 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-22 17:28:59 +02:00
leia uwu
c1d0560524
perf: print api servers asynchronously on instance launch 
Doing this on the main thread can cause the launcher to freeze for up to
5 seconds when launching an instance on my system
so i moved it to a launch step where it gets all the servers info
asynchronously to print

Signed-off-by: leia uwu <leia@tutamail.com>
 2024-06-20 17:58:00 -03:00
Alexandru Ionut Tripon
8014283bf4
Merge pull request #2536 from Trial97/refactor_hash 
Refactor hash task
 2024-06-18 22:55:32 +03:00
Trial97
888b22b4c7
rename variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 22:36:39 +03:00
DioEgizio
81ea7cef5a fix: add more datapack formats and clang-format it 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit a63842c727)
 2024-06-18 18:06:49 +00:00
DioEgizio
0df7a8dd3c chore: clang-format ResourcePack.cpp 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit c07e791d7f)
 2024-06-18 18:06:49 +00:00
DioEgizio
c254a8961c fix: update datapack and resourcepack versions 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 6af52c97c2)
 2024-06-18 18:06:49 +00:00
Alexandru Ionut Tripon
5f3d3c3294
Merge pull request #2534 from DioEgizio/dataresourceupdate 
fix: update datapack and resourcepack versions
 2024-06-18 21:06:31 +03:00
DioEgizio
a63842c727 fix: add more datapack formats and clang-format it 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-18 18:05:34 +02:00
Trial97
ac8c7baff2
fix tipo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 17:49:07 +03:00
Trial97
9cbdbddb08
made hasing task async 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 17:27:17 +03:00
Trial97
766ddc80e3
refactored hassing task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 16:51:26 +03:00
Trial97
0ea9190d25 relax fat FS filename restrictions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a587de8553)
 2024-06-18 09:51:34 +00:00
Alexandru Ionut Tripon
3f68b68691
Merge pull request #2531 from Trial97/relax_fat 
relax fat FS filename restrictions
 2024-06-18 12:51:22 +03:00
DioEgizio
c07e791d7f chore: clang-format ResourcePack.cpp 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-18 10:17:48 +02:00
DioEgizio
6af52c97c2 fix: update datapack and resourcepack versions 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-18 09:47:07 +02:00
Cart
c9827f8085
Spelling mistake 
in m_column_names and translated it is Miecraft and not Minecraft

Signed-off-by: Cart <81428538+Cartrigger@users.noreply.github.com>
 2024-06-17 23:12:07 -04:00
Trial97
a587de8553
relax fat FS filename restrictions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-17 13:35:23 +03:00
Trial97
2fb3e12492
fix auto java install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 17:54:13 +03:00
Trial97
8d3e6667cd
fix java download tasks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 15:09:49 +03:00
Trial97
94fd02a34f
fix java download button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 14:26:19 +03:00
Trial97
bbf52e3549
renamed dialog and button action 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 01:59:50 +03:00
Trial97
d0584684f2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-06-16 01:17:01 +03:00
Trial97
2108ddcc1d
completly remove metadata on refresh 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 01:16:09 +03:00
Trial97
5fbbdb9707
fix merge issues 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 00:31:31 +03:00
Trial97
c01f3107a4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 00:18:11 +03:00
Trial97
f1d1c9e22c
forget sort keys 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-15 11:06:20 +03:00
Trial97
a121bfbb15
add size back to texture view 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-15 10:43:21 +03:00
Trial97
98f8bc526d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-15 10:21:53 +03:00
Trial97
d5fb9f0935
force aspect ratio for skin preview 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-15 10:21:21 +03:00
Trial97
8cdaf5d05f
fix tests 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 23:27:27 +03:00
Trial97
cfdf4a9e1f
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader 2024-06-14 22:50:20 +03:00
Trial97
1a84dc9bca
no need for extra exist check 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 22:47:42 +03:00
Trial97
b872f88617
do not double rename 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 22:46:39 +03:00
Trial97
d2510b851b
mark files as duplicate 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 22:45:15 +03:00
Trial97
2d51008304
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-06-14 21:05:11 +03:00
Alexandru Ionut Tripon
3c4eed13a3
Merge pull request #1829 from Trial97/demo 
Fixed demo mode
 2024-06-14 18:41:02 +03:00
Trial97
9d16557328
simplify constructor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 16:40:27 +03:00
Trial97
863ebe421c
randomize server port 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 16:38:41 +03:00
Trial97
52490743b4
revert desktop file creation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 14:16:23 +03:00
Trial97
164d31dcb1
fix win build take#2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 13:09:22 +03:00
Trial97
3db4f4dc2b
fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 13:00:59 +03:00
Trial97
8db0b5f421
Register mime-type on the fly 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 12:48:37 +03:00
Trial97
f60d0135f7
made login link to open browser 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 12:47:44 +03:00
Trial97
1bd4e60e99
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-14 11:23:52 +03:00
Trial97
c35461b314
remove aspect ratio 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 11:23:14 +03:00
Trial97
014721ca10
remove unused import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 11:19:54 +03:00
Trial97
712fbc3a4b
reverse login layout 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 11:15:40 +03:00
Trial97
6e8dc6ccc0
add mouse interaction on microsoft link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-13 19:20:32 +03:00
Alexandru Ionut Tripon
119295c87f Update launcher/updater/prismupdater/PrismUpdater.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit ab5f628453)
 2024-06-13 16:16:28 +00:00
Alexandru Ionut Tripon
263b167aae Update launcher/updater/prismupdater/PrismUpdater.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 051e788683)
 2024-06-13 16:16:28 +00:00
Trial97
56b64edc44 Fix portable if manifest is missing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c15f6fcd2a)
 2024-06-13 16:16:27 +00:00
Alexandru Ionut Tripon
3fc5f56ed6
Merge pull request #2405 from Trial97/fix_missing_manifest 
Fix portable if manifest is missing
 2024-06-13 19:16:12 +03:00
Trial97
e475f4ed36 fix vanilla technic modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f4f0a61bf2)
 2024-06-13 16:15:57 +00:00
Alexandru Ionut Tripon
ce5b2c54c5
Merge pull request #2439 from Trial97/fix_vanila_technic 
fix vanilla technic modpacks
 2024-06-13 19:15:43 +03:00
Trial97
7fdc65eda8
add tooltip to url button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-13 08:51:11 +03:00
Trial97
2b229d7326
increase qr code size 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-13 00:20:16 +03:00
Trial97
80ea67f7cf
finish login dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-13 00:00:08 +03:00
Trial97
cd6f061335 update imgur upload 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c1c182fd0c)
 2024-06-12 20:45:31 +00:00
Alexandru Ionut Tripon
a74bebb358
Merge pull request #2499 from Trial97/imgur3 
update imgur upload
 2024-06-12 23:45:17 +03:00
Trial97
125fb2eaf2
remove png qr code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 19:34:58 +03:00
Trial97
5f5296ef5e
update ui once again 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 19:34:19 +03:00
Trial97
bbbe7c879e
update callback 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 12:35:02 +03:00
Trial97
df142550fe
update Add account question 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 11:55:56 +03:00
Trial97
c4a65dd861
update login flow 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 00:34:39 +03:00
Trial97
c1c182fd0c
update imgur upload 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 12:38:59 +03:00
快乐的老鼠宝宝
1c1e296960
fix(SkinManageDialog.cpp): typo 
Signed-off-by: 快乐的老鼠宝宝 <laoshubaby@protonmail.com>
 2024-06-10 17:15:38 +08:00
Trial97
317b127330 add some comments 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit d1286bbe90)
 2024-06-10 09:11:36 +00:00
Trial97
354f4ef3d8 fix CI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 44a16c1ca1)
 2024-06-10 09:11:36 +00:00
Trial97
8984cd5f66 improve invalid path name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a7a1b28765)
 2024-06-10 09:11:36 +00:00
Trial97
5934849d87 removed + from bad chars in filenames 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 428889a68d)
 2024-06-10 09:11:36 +00:00
Alexandru Ionut Tripon
7d418a32e7
Merge pull request #2425 from Trial97/win_char 
improve invalid path name
 2024-06-10 12:11:21 +03:00
Alexandru Ionut Tripon
93a0277479
Merge pull request #2450 from Trial97/remove_search 
remove search button
 2024-06-10 10:56:54 +03:00
Trial97
2ffabbdc6d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 10:00:52 +03:00
Trial97
11ae169087
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:34:48 +03:00
Alexandru Ionut Tripon
95e7f36732
Merge pull request #2054 from Trial97/add_configurable_updater_interval 
Made updater interval configurable
 2024-06-10 09:22:54 +03:00
Trial97
6607c3bfa4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:04:09 +03:00
Trial97
3f0fa54fe8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into retry_auth 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:03:04 +03:00
Trial97
e63f25c9e4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:01:01 +03:00
Alexandru Ionut Tripon
dc39698c48
Merge pull request #1609 from Trial97/skin_selector 
Skin management
 2024-06-10 08:43:37 +03:00
Alexandru Ionut Tripon
12e04c412b
Merge pull request #1776 from Trial97/resource_size 
feat:added size column
 2024-06-10 08:42:29 +03:00
Trial97
62a2217291 Added the new ftb settings path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 1c3c9d2457)
 2024-06-09 21:45:37 +00:00
Trial97
1af7126582 Removed static path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 27e76d0dcb)
 2024-06-09 21:45:37 +00:00
Trial97
4d0e4f434f Updated ftb app import instance detection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 344398f238)
 2024-06-09 21:45:37 +00:00
Alexandru Ionut Tripon
154f4811c0
Merge pull request #2166 from Trial97/ftb2 
Updated ftb app import instance detection
 2024-06-10 00:45:22 +03:00
Trial97
29d32f0d9a
Update size order for folders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 00:18:21 +03:00
Trial97
242ddbb7e1
fix size column sorting 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 23:53:40 +03:00
Trial97
34e1a5e660
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2024-06-09 22:18:40 +03:00
Trial97
1e0db46728
add a more verbose error message in case user skin import fails 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 21:29:56 +03:00
Trial97
04b2ac2efa
update fail url skin messagebox 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 20:48:49 +03:00
Trial97
689b76885c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-06-09 20:13:09 +03:00
Trial97
6a99312df5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-09 19:57:16 +03:00
Trial97
ca369ac2b0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 19:52:37 +03:00
coolguy1842
616556ea7b
fix formatting 
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com>
(cherry picked from commit 71b2c4b1fd)
 2024-06-09 16:34:32 +03:00
coolguy1842
d23fa73f52
simple fix for resizing too small causing an index out of range crash 
Signed-off-by: coolguy1842 <coolguy1842.deport391@passfwd.com>
(cherry picked from commit 448ded2387)
 2024-06-09 16:34:32 +03:00
Alexandru Ionut Tripon
9560f9ed98
Merge pull request #2474 from coolguy1842/develop 
simple fix for resizing too small causing an index out of range crash
 2024-06-09 16:10:57 +03:00
Alexandru Ionut Tripon
d6a03d3f2c
Merge pull request #1554 from Trial97/instance_copy_progress 
updated instance copy
 2024-06-09 16:05:11 +03:00
Alexandru Ionut Tripon
3af4c94612
Merge pull request #2390 from Trial97/delete_tmp 
Delete instaces tmp diectory on startup
 2024-06-09 16:03:51 +03:00
Alexandru Ionut Tripon
55b6490530
Merge pull request #1617 from cullvox/components-resource-pack-fix 
added functionality for components in resource pack descriptions.
 2024-06-09 16:03:19 +03:00
Alexandru Ionut Tripon
7e5db651fd
Merge pull request #1823 from Trial97/refresh_cats 
Added button to refresh themes and catpacks
 2024-06-09 16:02:26 +03:00
Alexandru Ionut Tripon
0e996270b7
Merge pull request #2055 from Trial97/show_minecraft_version_modrinth 
Display minecraft version if not mentioned for modrinth/curse packs
 2024-06-09 15:59:24 +03:00
Fourmisain
dda7e3073d please the pre-commit check 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit 23095b70a4)
 2024-06-07 19:17:34 +00:00
Fourmisain
a800b86689 detect IBM Semeru Certified Edition on linux 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit dbe4adc034)
 2024-06-07 19:17:34 +00:00
Fourmisain
cfeb72450e fix x86 detection on 64 bit windows 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit af157c1613)
 2024-06-07 19:17:34 +00:00
Fourmisain
67e0b68cd5 add detection for IBM Semeru Java runtime 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit 08918be11e)
 2024-06-07 19:17:34 +00:00
TheKodeToad
3ef5cd20f4
Merge pull request #2428 from Fourmisain/semeru 
add detection for IBM Semeru Java runtime and fix x86 detection on 64 bit Windows
 2024-06-07 20:17:20 +01:00
Trial97
be2ecff97c fix qt5 build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 83883cadf9)
 2024-06-07 06:37:36 +00:00
Trial97
a053a4040c force initial size for the Add Instance dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f350918186)
 2024-06-07 06:37:36 +00:00
Trial97
975b0b5761 fix double borders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c9c39b8203)
 2024-06-07 06:37:36 +00:00
Trial97
446740ba4f Made Custom New Instance scrollable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f7120a4f6f)
 2024-06-07 06:37:36 +00:00
ZekeZ
39b8451130
Merge pull request #2383 from Trial97/scroll_new_instance 
Made Custom New Instance scrollable
 2024-06-07 16:37:21 +10:00
Trial97
8ff53e47e8
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader 2024-06-07 00:22:54 +03:00
Trial97
865fd91038 replace auth server ping 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit b7008d2880)
 2024-06-06 21:19:04 +00:00
Alexandru Ionut Tripon
6e5c41fc8e
Merge pull request #2471 from Trial97/replace_auth_ping 
replace auth server ping
 2024-06-07 00:18:48 +03:00
Trial97
b096ee6a0c
fix file permisions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-06 14:12:55 +03:00
coolguy1842
71b2c4b1fd fix formatting 
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com>
 2024-06-06 16:32:49 +10:00
coolguy1842
448ded2387 simple fix for resizing too small causing an index out of range crash 
Signed-off-by: coolguy1842 <coolguy1842.deport391@passfwd.com>
 2024-06-06 16:18:47 +10:00
Trial97
b7008d2880
replace auth server ping 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-06 00:09:08 +03:00
Trial97
45463dcd75
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-06-04 11:04:02 +03:00
SabrePenguin
fa2c2a7c85
Made Regex static and const, removed dist 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
f43873a8ba
Regex correction 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
6a49f513d8
Fixed more clang formatting 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
5d25e21719
Fixing CI format issues 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
da2a67227a
Added patch to all setHtml calls 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
875c6bbada
Switched </ul> to a Regex expression 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
401de52f61
Moved html patch to StringUtils 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
0c84d58915
Fix img tag allowing img.... 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
096028f1a6
Pleasing the format check 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
fa0492f606
Update launcher/Markdown.cpp 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
e201cad3f8
Formatting and fixed img_pos allowed as negative 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
1d8ee37504
Added a naive implementation of a <br> inserter 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
TheKodeToad
a70aeeea2b
Merge branch 'develop' into list-image-append-fix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-06-01 15:20:21 +01:00
Trial97
83883cadf9
fix qt5 build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 19:30:10 +03:00
Trial97
f350918186
force initial size for the Add Instance dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 19:03:40 +03:00
Trial97
c9c39b8203
fix double borders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 17:47:39 +03:00
Trial97
f7120a4f6f
Made Custom New Instance scrollable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 16:46:46 +03:00
Trial97
f4f0a61bf2
fix vanilla technic modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 16:15:12 +03:00
Trial97
817ff1ecbd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 10:20:48 +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
Alexandru Ionut Tripon
672c8c8b4c
Merge pull request #2453 from PrismLauncher/backport-2423-to-release-8.x 
[Backport release-8.x] fix incorrect launch time
 2024-05-31 09:58:11 +03:00
Trial97
905d9d2826 fix zero launch time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 1b0e8260ac)
 2024-05-31 06:17:25 +00:00
timoreo
7ab8f8ef54
Merge pull request #2423 from Trial97/fix_time3 
fix incorrect launch time
 2024-05-31 08:17:07 +02:00
Celeste Peláez
ca359330c2 Reformatted FileSystem.h 
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com>
(cherry picked from commit f5f32e2c6e)
 2024-05-31 06:12:46 +00:00
Celeste Peláez
828222eb27 Added support for bcachefs 
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com>
(cherry picked from commit a2b5ac73ff)
 2024-05-31 06:12:46 +00:00
Trial97
2635d7c3be
replaced grid with vertical layout on all add modpack pages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 09:07:51 +03:00
Trial97
d1286bbe90
add some comments 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 21:54:32 +03:00
Trial97
eaccdca02d
added error message for import skin from user 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 16:21:08 +03:00
Trial97
75fbdc2df5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-05-30 14:25:51 +03:00
Trial97
44a16c1ca1
fix CI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 14:20:35 +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
8704cd8402
remove duplicate proggress bar 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 11:49:09 +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
7fed5e9173
Capitalize the mod categories 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 08:51:36 +03:00
Trial97
5e36def18b
remove search button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 00:36:02 +03:00
Trial97
469f051e30
remove search button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 00:14:37 +03:00
Tayou
b8fe93efa3 fix & clean ResourcePage.ui 
Qt is cursed.

Signed-off-by: Tayou <git@tayou.org>
 2024-05-29 20:00:36 +02:00
Trial97
29444cfe0f
fix win combobox take#2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-29 17:19:15 +03:00
Trial97
660772d4d7
swap buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-29 01:06:11 +03:00
Trial97
b256d325f7
fix win combobox 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-29 01:03:17 +03:00
Alexandru Ionut Tripon
f332503088
Apply suggestions from code review 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-05-29 00:32:17 +03:00
Trial97
5012178a98
trigger search on filter change 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-28 14:48:03 +03:00
Trial97
3f7847ad34
made ResourcePage elements resizable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-28 14:47:44 +03:00
Trial97
4b52c72629
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-05-27 22:35:38 +03:00
Trial97
59a8b91274
add spacing to retry modal 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-26 16:28:07 +03:00
Trial97
694ea65457
disable retry dialog for logo fetching 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-26 11:13:01 +03:00
Trial97
7a200a337f
update retry netjob dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-26 11:04:41 +03:00
Celeste Peláez
f5f32e2c6e
Reformatted FileSystem.h 
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com>
 2024-05-26 01:40:31 -05:00
Celeste Peláez
a2b5ac73ff
Added support for bcachefs 
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com>
 2024-05-26 01:33:22 -05:00
Evan Goode
4f9fdcc293 pre-commit run --all-files 2024-05-23 16:49:09 -04:00
Evan Goode
513361df25 DRM: check for valid account, not just any account 2024-05-22 19:46:43 -04:00
Trial97
eacd7758e9
fix pre-commit hook 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-22 22:49:28 +03:00
Trial97
2b949a8059
improve login account checking 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-22 10:53:24 +03:00
Richard-Rogalski
399071c717 Fix Java auto-detect so it finds Gentoo installed JDKs 
Signed-off-by: Richard-Rogalski <rrogalski@tutanota.com>
 2024-05-21 11:41:47 -05:00
Fourmisain
23095b70a4
please the pre-commit check 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
 2024-05-21 13:44:00 +02:00
Fourmisain
dbe4adc034
detect IBM Semeru Certified Edition on linux 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
 2024-05-21 10:51:37 +02:00
Trial97
f6a7fc215a
update java sorting by taking into consideration release time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-21 08:33:26 +03:00
Fourmisain
af157c1613
fix x86 detection on 64 bit windows 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
 2024-05-20 23:13:44 +02:00
Fourmisain
08918be11e
add detection for IBM Semeru Java runtime 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
 2024-05-20 21:44:35 +02:00
Evan Goode
13a32a6642 Add back DRM for offline and authlib-injector accounts 2024-05-20 13:24:16 -04:00
Trial97
7a42fb284a
reverse java version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-20 18:33:40 +03:00
Trial97
0e239dfb2a
fix crash on first display with java downloader off 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-20 18:24:19 +03:00
Trial97
abb628edb3
remove OverrideJava 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-20 18:23:43 +03:00
Trial97
428889a68d
removed + from bad chars in filenames 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 19:38:06 +03:00
Trial97
1b0e8260ac
fix zero launch time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 15:36:39 +03:00
Trial97
425a6e0919
Fix code format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 10:09:34 +03:00
Trial97
d9e2badf71
Rename timeout option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 08:54:19 +03:00
Trial97
76a656a017
retry auth step on fail 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 22:44:17 +03:00
Trial97
6078a771c1
add config for transfer timeout 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 21:46:05 +03:00
Alexandru Ionut Tripon
74c2f2599f
Merge pull request #1365 from Trial97/netjob_retry 
Ask user to retry if netjob fails
 2024-05-18 17:54:12 +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
e42dfbc391
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-05-18 17:02:10 +03:00
Trial97
477d1408ad
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2024-05-18 16:53:14 +03:00
Trial97
83fdfe8091
fix regression 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 16:52:29 +03:00
Trial97
4d21f71ccf
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats 2024-05-18 16:34:21 +03:00
Trial97
31d0cad377
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo 2024-05-18 16:24:22 +03:00
Trial97
c9c67ef79e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version 2024-05-18 15:27:02 +03:00
Trial97
d77d1f3be3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods 2024-05-18 14:44:33 +03:00
Trial97
b23b53d98d
Add missing header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 14:43:58 +03:00
Trial97
7a5348a179
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14:31 +03:00
Trial97
633489884d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 13:27:31 +03:00
Alexandru Ionut Tripon
3887cfe5df
Merge pull request #1525 from Trial97/waitprofiler 
Add wait profiler
 2024-05-18 13:17:24 +03:00
Samuel Stidham
bffb2a3609 Fixed the code. 
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
(cherry picked from commit adf0cfdebf)
 2024-05-18 10:16:15 +00:00
Samuel Stidham
0d3596c864 Add extra java locations for MacOs. 
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
(cherry picked from commit 8e0af16de9)
 2024-05-18 10:16:15 +00:00
Alexandru Ionut Tripon
7b39ec5048
Merge pull request #2377 from dqfan2012/AddSdkmanToMacOs 
Adding sdkman java location to MacOs
 2024-05-18 13:15:57 +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
c8ff768d64
Merge pull request #1827 from Trial97/shader 
fixed shader packs detection
 2024-05-18 12:02:13 +03:00
Trial97
b6d87fc090
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress 2024-05-18 11:57:41 +03:00
Trial97
6aaf3a3ed4
Merge branch 'skin_selector' of github.com:Trial97/PrismLauncher into skin_selector 2024-05-18 11:57:06 +03:00
Trial97
2ac6efaa4a
Fix reggresion 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 11:56:43 +03:00