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
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
ZhiYi
5d803ccc86 MultiProfile Login issue workaround for now 
Signed-off-by: ZhiYi <RobertBernard.c01@gmail.com>
 2024-09-14 17:48:37 +08:00
ZhiYi
2113df5d8d MultiProfile Login issue workaround for now 2024-09-14 17:44:20 +08: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: 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
Evan Goode
c68ed2049b Only prompt for authlib-injector on non-legacy 2024-08-29 19:37:39 -04: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
Trial97
465c9498d4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-25 09:50:41 +03: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
TheKodeToad
cbdacf81ee
Fix system theme detection 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-08-24 22:50:51 +01:00
TheKodeToad
d2304b6698
Improve Java checking speed by using startsWith for gentoo paths 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-08-24 22:13:18 +01:00
Trial97
2a86ceb5d6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-08-23 08:34:15 +03: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
Alexandru Ionut Tripon
e4be8f97cd
Merge pull request #2740 from TheKodeToad/themeable-logs 
Allow themes to modify log colours
 2024-08-23 08:12:34 +03:00
TheKodeToad
89ed85182c
Fix invalid Java path message 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-08-22 19:07:15 +01:00
Trial97
5f64d7dc47
update adoptium icon 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-22 20:38:08 +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
7d9e47ac18
Change major java column name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-22 18:58:38 +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
da7cc529f0
Enable auto-detect java if java path is not set 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-21 14:54:47 +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
Trial97
6bd8b72f68
fix meta not validating for specific versions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-18 22:38:45 +03:00
Alexandru Ionut Tripon
efac063797
Merge pull request #2729 from Trial97/currentTextChanged 
replaced currentTextChanged with currentIndexChanged
 2024-08-18 19:00:29 +03:00
TheKodeToad
e9791d6bc1
Merge pull request #2633 from Trial97/refactor_minecraft_update 
refactor MinecraftUpdate Task
 2024-08-18 11:44:44 +01:00
Evan Goode
5f747af9db Enable OnlineFixes by default 2024-08-18 00:11:41 -04:00
Trial97
b5bbe93775 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-17 00:20:40 +03:00
Trial97
b0cd412926 use index instead of currentIndex function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-16 15:41:31 +03:00
Trial97
e6bc61d6d0 add overload for qt5 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-16 14:44:57 +03:00
Trial97
6de026bfcf replaced currentTextChanged with currentIndexChanged 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-16 14:34:28 +03:00
Alexandru Ionut Tripon
6b07e8e72d
Merge pull request #2718 from cthbleachbit/develop 
mangohud support: MangoHud::getLibraryString should return absolute path
 2024-08-12 11:26:30 +03:00
Alexandru Ionut Tripon
d2daacf736
Merge pull request #2716 from Trial97/quickPlaySingleplayer 
add setting for quickplay singleplayer
 2024-08-12 11:25:25 +03:00
Evan Goode
5be25307bb
Merge pull request #22 from unmojang/evan-goode/nix-sync 
nix: sync changes from nixpkgs
 2024-08-11 22:49:56 -04:00
Evan Goode
5e93cff2d0 clang-format 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-08-11 22:06:38 -04:00
Tianhao Chai
c2192cfa98
mangohud support: getLibraryString should return absolute path when possible 
Some distros ship MangoHub vulkan layer json with bare shared object name
instead of an absolute path. This breaks environment config as
`MinecraftInstance::createLaunchEnvironment()` seems to require absolute
path of `libMangoHud.so`.

Since we already have `MangoHud::findLibrary()` lying around, use that to
figure out where `libMangoHud.so` really is. In case of a platform that
doesn't support `dlopen()`, fallback to old behavior and return the path
verbatim as it is recorded in vk layer json.

Signed-off-by: Tianhao Chai <cth451@gmail.com>
 2024-08-09 14:11:44 -04:00
Trial97
dcca175b36
snake_case to m_camelCase 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-09 11:06:31 +03:00
Trial97
a9c7e95c66
fix widebar action removal 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-08 19:39:32 +03:00
Trial97
c9809fff6d
add setting for quickplay singleplayer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-08 16:53:26 +03:00
Kationor
659fa7fbfb
fix/windows: Check registry for per-user java installations 
Signed-off-by: Kationor <n96211028@gmail.com>
 2024-08-07 18:00:42 +02:00
Edgars Cirulis
ba7391308e
Restore connect line for device authorization in MSADeviceCodeStep 
Parent PRs: https://github.com/PrismLauncher/PrismLauncher/pull/2617

Fixes https://github.com/PrismLauncher/PrismLauncher/issues/2705

Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 2024-08-05 22:12:18 +03:00
Trial97
fe23e76714
fix codeql 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-05 12:04:08 +03:00
Trial97
af65eb17cf
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-05 11:54:58 +03:00
Alexandru Ionut Tripon
9d684dcb82
Merge pull request #2617 from Trial97/clean_net 
remove duplicate code from net folder
 2024-08-05 10:56:40 +03:00
Alexandru Ionut Tripon
e4967f8d08
Merge pull request #2694 from Trial97/zip_folder_permissions 
ensure minimal folder permissions when extracting files
 2024-08-05 10:56:06 +03:00
Alexandru Ionut Tripon
5702b8e3c2
Merge pull request #2692 from srcres258/pr 
Fix a typo in comment
 2024-08-05 10:55:24 +03:00
Trial97
ca5df3ea60
ensure minimal folder permissions when extracting files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-30 01:32:46 +03:00
src_resources
61e62dce1b
Fix a typo in comment 
Signed-off-by: src_resources <src.res.211@gmail.com>
 2024-07-29 21:07:28 +08:00
Evan Goode
f0140ee56b Allow using custom authlib-injector JAR 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-07-28 23:57:14 -04:00
Evan Goode
e1041ddc61 Add tests for MANIFEST.MF parser 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-07-27 01:00:42 -04:00
Evan Goode
c7de09bcc6 Implement MANIFEST.MF parser 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-07-27 00:49:51 -04:00
Trial97
d5c5f5d4fc
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-24 11:47:45 +03:00
Trial97
2c0b17d107
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-24 11:40:23 +03:00
Trial97
0ac62f9ddf
Recommend java major 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-23 01:41:41 +03:00
Trial97
4928706d8c
Merge branch 'clean_net' of github.com:Trial97/PrismLauncher into clean_net 2024-07-22 22:06:27 +03:00
Trial97
63a380a039
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-22 22:06:09 +03:00
Alexandru Ionut Tripon
33bf370d17
Update launcher/net/RawHeaderProxy.h 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-07-22 21:51:20 +03:00
Trial97
5d3549a5e9
Add tooltips and fix archive download task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-22 09:18:20 +03:00
Trial97
29a6db171f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-22 08:57:31 +03:00
Trial97
91d03b34ac
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-07-21 02:24:30 +03:00
Edgars Cirulis
fc2d013402
ui: swap timeoutSecondsLabel and numberOfManualRetriesLabel order 
fixes: 7a200a337f
conflicted with 6078a771c1

Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 2024-07-20 01:55:23 +03:00
Trial97
c666d060fc
fix merge issue 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-19 17:10:04 +03:00
Trial97
cae1fbc171
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-19 15:59:43 +03:00
Alexandru Ionut Tripon
0041d2a126
Merge pull request #2440 from Trial97/fix_retry_dialog 
update retry netjob dialog
 2024-07-19 15:47:12 +03:00
Alexandru Ionut Tripon
69c55d90ce
Merge pull request #2558 from Trial97/update_filters 
Resolve issue with multiple loaders during mod update
 2024-07-19 15:46:15 +03:00
Alexandru Ionut Tripon
ddcaf25149
Merge pull request #2650 from Trial97/help-pages 
fix a few missing help pages
 2024-07-19 15:45:57 +03:00
Ben Westover
fb10cb5fdf
Fix a few typos 
As part of packaging Prism Launcher for Debian, I have run a package linter
called lintian which found a few spelling errors throughout the source.

I am not a fan of contributions that only fix cosmetics like spelling errors,
but Debian encourages forwarding this stuff upstream instead of letting it get
fixed naturally over time.

Signed-off-by: Ben Westover <me@benthetechguy.net>
 2024-07-18 22:08:18 -04:00
Tayou
dcc58c8b75
Merge pull request #2655 from Ryex/fix/json-parsing-validator-buffer-reset 
fix(net/validators): ensure buffers are cleared and reset;
 2024-07-18 09:11:29 +02:00
Rachel Powers
cb65f6dfb5
fix(net/validators): ensure buffers are cleared and reset; 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-07-17 23:05:45 -07:00
UnownPlain
e6019ab396
Fix dead link to Modrinth authentication docs 
Signed-off-by: UnownPlain <38232575+UnownPlain@users.noreply.github.com>
 2024-07-17 23:04:52 -04:00
Trial97
6d425717e9
fix a few missing help pages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-16 14:42:23 +03:00
izder456
0a543cb66b FIX launcher/java/JavaUtils.cpp to properly autodetect JVM paths on OpenBSD and FreeBSD 
Signed-off-by: izder456 <izder456@disroot.org>
 2024-07-11 20:32:04 -05:00
Trial97
b989c5a36c
refactor MinecraftUpdate Task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-10 16:24:31 +03:00
Trial97
061fdc1ada
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-09 18:36:23 +03:00
Alexandru Ionut Tripon
5f345cedea
Merge pull request #2596 from TayouVR/more-system-themes 
Display all system themes in widget theme selector
 2024-07-09 12:55:22 +03:00
timoreo
39b4293a62
Merge pull request #1752 from Trial97/fix_duplicate_mod 2024-07-09 10:32:56 +02:00
timoreo
ebd7974fcc
Merge pull request #2416 from Trial97/retry_auth 2024-07-09 09:57:32 +02:00
Trial97
71c7dd1c5d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-08 21:51:34 +03:00
Alexandru Ionut Tripon
aeb7f29a5b
Update launcher/InstanceList.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-07-08 15:04:27 +03:00
Trial97
fdcd1068f3
remove some poly mentions from the code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-08 14:53:39 +03:00
Trial97
c07260e836
remove duplicate code from net folder 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-07 02:49:27 +03:00
Trial97
a6ae078e7e
add docs to Library.cpp 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-06 09:30:26 +03:00
Trial97
c886111e18
format the code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-06 09:09:54 +03:00
Trial97
a09742a406
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-06 01:07:00 +03:00
Alexandru Ionut Tripon
5973c1c45e
Merge pull request #2607 from Kationor/noupdateprompt 
Add ModpackUpdatePromptDisabled setting
 2024-07-06 00:49:06 +03:00
Alexandru Ionut Tripon
9596e6fb01
Merge pull request #2609 from Trial97/crash_hash 
fix crash with hash task
 2024-07-06 00:48:19 +03:00
Trial97
5d8d1c4b90
transform hashFile to lambda 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-04 16:47:27 +03:00
Trial97
1dd21a5e4a
fix crash with hash task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-04 16:38:40 +03:00
Kationor
83a5fe1984
Rename setting to SkipModpackUpdatePrompt 
Was ModpackUpdatePromptDisabled

Signed-off-by: Kationor <n96211028@gmail.com>
 2024-07-03 23:13:39 +02:00
timoreo
219de66783
Merge pull request #2567 from Ryex/feat/ungrouped-group-persist-state 2024-07-03 18:21:54 +02:00
Kationor
9b172278f8
Add ModpackUpdatePromptDisabled setting 
When creating an instance of a modpack that's already associated with
another instance, the user gets asked if they want to update that
instance instead. This commit introduces a setting to suppress the
prompt and directly create the new instance.

Signed-off-by: Kationor <n96211028@gmail.com>
 2024-07-03 12:43:05 +02:00
Evan Goode
a7cf31fd95 Recognize neoforge as a modloader in FTB instances 
Resolves https://github.com/unmojang/FjordLauncher/issues/17
 2024-07-02 19:18:25 -04:00
Tayou
dbcfefca1b fix system theme 
Signed-off-by: Tayou <git@tayou.org>
 2024-07-01 23:05:54 +02:00
Tayou
d70be5121c tooltips 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 23:27:45 +02:00
Tayou
4f795eb6ef format 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 22:06:01 +02:00
Trial97
0f311453e1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 22:54:23 +03:00
Tayou
7104f8909d another oop 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:52:26 +02:00
Tayou
a184b26a00 #ifdef, not #if... I'm smort 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:47:52 +02:00
Trial97
4b4da8e6f6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 22:41:49 +03:00
Tayou
f0c9b52055 oop 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:41:37 +02:00
Tayou
046e3588af more system themes initial changes 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:35:03 +02:00