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

9236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Evan Goode
ff31e88cf8 nix: sync changes from nixpkgs 
Brings in changes from the Prism Launcher derivation(s) in nixpkgs, notably
from https://github.com/NixOS/nixpkgs/pull/321851 and
https://github.com/NixOS/nixpkgs/pull/303880

Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-07-21 15:47:38 -04:00
Evan Goode
17da1f266c Oops, guess it's easier to not rename the qrc file 2024-07-20 21:15:02 -04:00
Evan Goode
9cbdd1bb47 Oops, guess it's easier to not rename the qrc file 2024-07-20 21:14:37 -04:00
Evan Goode
d080962acf Use fjordlauncher icns and qrc icons 2024-07-20 20:37:43 -04:00
Trial97
91d03b34ac
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-07-21 02:24:30 +03:00
Alexandru Ionut Tripon
6352362907
Merge pull request #2662 from Edgars-Cirulis/ui 
ui: swap timeoutSecondsLabel and numberOfManualRetriesLabel order
 2024-07-20 11:39:51 +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
Alexandru Ionut Tripon
fcdedc795c
Merge pull request #2660 from benthetechguy/typo 
Fix a few typos
 2024-07-19 08:50:11 +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
Alexandru Ionut Tripon
d7579319e0
Merge pull request #2653 from UnownPlain/patch-1 
Fix dead link to Modrinth authentication docs
 2024-07-18 08:40:59 +03: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
Sefa Eyeoglu
84263cd94c
Merge pull request #2644 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-07-14 09:31:41 +02:00
github-actions[bot]
303f3303f6 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9f4128e00b0ae8ec65918efeba59db998750ead6?narHash=sha256-rwz8NJZV%2B387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ%3D' (2024-07-03)
  → 'github:NixOS/nixpkgs/7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9?narHash=sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y%3D' (2024-07-12)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07?narHash=sha256-F1h%2BXIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4%3D' (2024-06-24)
  → 'github:cachix/pre-commit-hooks.nix/8d6a17d0cdf411c55f12602624df6368ad86fac1?narHash=sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY%3D' (2024-07-09)
 2024-07-14 00:22:27 +00:00
Alexandru Ionut Tripon
2df5d4012c
Merge pull request #2635 from Izder456/develop 
FIX launcher/java/JavaUtils.cpp to properly autodetect JVM paths on …
 2024-07-13 11:16:35 +03:00
Edgars Cirulis
d3ca8864c2
chore: update Qt to 6.7.2 
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 2024-07-12 23:54:22 +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