Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,607 Commits 9 Branches 38 Tags
73d33f93b30f658f9671358ac52bf4e03afeaefd
Commit Graph

923 Commits

Author SHA1 Message Date
Trial97
562c301326 skip QSaveFile temprary files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-22 01:22:31 +03:00
Alexandru Ionut Tripon
9a161a0335 Merge pull request #2930 from Trial97/fixes 
Fix tests segfault
 2024-10-19 22:32:51 +03:00
Trial97
2030041fcc Fix tests segfault 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 21:42:14 +03:00
Trial97
7519c63f2e Replace http with https on skins 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 01:11:27 +03:00
Rachel Powers
09c9da268f fix: prevent inf recursion when mod icon load fails; cut max pixmapcache to 1/4 previous value 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-11 13:26:20 -07:00
TheKodeToad
98adcc60a3 Use UTF-8 to decode logs on Java 18 or newer 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-09 17:15:53 +01:00
TheKodeToad
909114bf2a Change LaunchTask to only accept MinecraftInstance 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-09 15:07:09 +01: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
53c3d99bdd Merge pull request #2828 from Trial97/cmake_fields 
Allow configuring more URLs through CMake
 2024-09-17 08:44:24 +03:00
Trial97
3ca67cc388 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-09-16 20:08:43 +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
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
ca6b62c773 move some URLs in cmake 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 15:51:51 +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
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
22ebf7e961 fix download java abort being stuck 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-14 00:13:16 +03:00
Trial97
e18e9b0509 fix server launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 22:57:08 +03:00
Trial97
e34ebc1a0d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-09-13 21:14:48 +03: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
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
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
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
TheKodeToad
e9791d6bc1 Merge pull request #2633 from Trial97/refactor_minecraft_update 
refactor MinecraftUpdate Task
 2024-08-18 11:44:44 +01: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
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
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
c9809fff6d add setting for quickplay singleplayer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-08 16:53:26 +03: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
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
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
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
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
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