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,759 Commits 9 Branches 38 Tags
fe28a051d533bd34681c6306deab5b93b13dc5e9
Commit Graph

8759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
seth
0ae421c265 chore(nix): drop flake-parts 
The primary goals here include making the flake easier to contribute to
by having it follow the standard boilerplate, while also limiting the
size of our flake.lock to lower the chance of duplicate inputs for users

Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 04:01:30 -04:00
seth
e85b364748 refactor(nix): use final in overlay 
this allows to implictly pass `prismlauncher-unwrapped`
it won't have an effect on our package set as directly inheriting from
the scope we create filters out the extra attributes usually introduced
with a scope

Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 03:49:37 -04:00
seth
271c38bc56 doc(nix): update package names and params 
Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 03:49:36 -04:00
seth
7a83d0cea0 ci(nix): drop pre-commit-hooks 
Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 03:49:36 -04:00
seth
4c81d8c53d style(nix): format with nixfmt 
Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 03:49:36 -04:00
seth
7dff77ca35 style(nix): alejandra -> nixfmt-rfc-style 
Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 03:49:36 -04:00
seth
1edfbeec8d Merge pull request #2732 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-08-20 22:36:33 -04:00
timoreo
7f594a342e Merge pull request #2735 from Trial97/force_load_java 2024-08-20 08:04:21 +02: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
Alexandru Ionut Tripon
1b756b99bb Merge pull request #2528 from Trial97/validate_metadata 
validate metadata on instance launch
 2024-08-19 22:34:13 +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
github-actions[bot]
91d6465d45 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b?narHash=sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI%3D' (2024-08-09)
  → 'github:NixOS/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9?narHash=sha256-med8%2B5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c%3D' (2024-08-14)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/c7012d0c18567c889b948781bc74a501e92275d1?narHash=sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q%3D' (2024-08-09)
  → 'github:cachix/pre-commit-hooks.nix/bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba?narHash=sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc%3D' (2024-08-16)
 2024-08-18 00:22:22 +00: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
Sefa Eyeoglu
d6a825dd47 Merge pull request #2707 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x 2024-08-12 10:40:26 +02:00
Sefa Eyeoglu
3d4be7ac8c Merge pull request #2669 from PrismLauncher/update_flake_lock_action 2024-08-12 10:40:00 +02:00
Sefa Eyeoglu
af83fc84a7 Merge pull request #2585 from PrismLauncher/renovate/determinatesystems-update-flake-lock-23.x 2024-08-12 10:39:19 +02: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
github-actions[bot]
96dad63173 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7?narHash=sha256-pQMhCCHyQGRzdfAkdJ4cIWiw%2BJNuWsTX7f0ZYSyz0VY%3D' (2024-07-03)
  → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d?narHash=sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC%2Bx4%3D' (2024-08-01)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9?narHash=sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y%3D' (2024-07-12)
  → 'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b?narHash=sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI%3D' (2024-08-09)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/8d6a17d0cdf411c55f12602624df6368ad86fac1?narHash=sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY%3D' (2024-07-09)
  → 'github:cachix/pre-commit-hooks.nix/c7012d0c18567c889b948781bc74a501e92275d1?narHash=sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q%3D' (2024-08-09)
 2024-08-11 00:22:53 +00: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
Tayou
b41e730707 Merge pull request #2714 from Kationor/fix-local-installs 
Improve Java auto-detection
 2024-08-07 18:48:24 +02: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
Sefa Eyeoglu
0215af828d Merge pull request #2667 from unmojang/evan-goode/nix-sync 2024-08-07 09:18:03 +02:00
Tayou
7a5e4a4293 Merge pull request #2706 from Edgars-Cirulis/develop 
Restore connect line for device authorization in MSADeviceCodeStep
 2024-08-05 22:08:40 +02:00
renovate[bot]
128827cef5 chore(deps): update hendrikmuhs/ccache-action action to v1.2.14 2024-08-05 20:02:40 +00: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
Alexandru Ionut Tripon
0308710211 Merge pull request #2639 from Edgars-Cirulis/qt672 
chore: update Qt to 6.7.2
 2024-08-05 14:06:52 +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
Alexandru Ionut Tripon
110efb7259 Merge pull request #2627 from Edgars-Cirulis/build-instructions 
readme: build instructions
 2024-08-05 10:54:47 +03:00
TheKodeToad
b77dc47c6c Merge pull request #1526 from Trial97/disablemods 
feat:Removed update disabled warning
 2024-08-03 15:38:46 +01: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
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