Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-11 20:57:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,915 Commits 9 Branches 38 Tags
f1671e3ded2a68f1311e709ad7d17d2a6281e9e7
Commit Graph

8915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Edgars Cirulis
3076e5b961 remove useless BUILD.md orphaned file 
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 2024-07-09 22:21:13 +03:00
Edgars Cirulis
e5b1fa1e3a readme: build instructions 
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 2024-07-09 22:15:52 +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
ca2dda5547 Merge pull request #2626 from Trial97/remove_poly 
remove some poly mentions from the code
 2024-07-08 21:46:39 +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
Alexandru Ionut Tripon
08cab11cfe Merge pull request #2554 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-07-07 08:01:42 +03:00
github-actions[bot]
e49e2622fc chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8?narHash=sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw%3D' (2024-06-01)
  → 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7?narHash=sha256-pQMhCCHyQGRzdfAkdJ4cIWiw%2BJNuWsTX7f0ZYSyz0VY%3D' (2024-07-03)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3f84a279f1a6290ce154c5531378acc827836fbb?narHash=sha256-u1fA0DYQYdeG%2B5kDm1bOoGcHtX0rtC7qs2YA2N1X%2B%2BI%3D' (2024-06-13)
  → 'github:NixOS/nixpkgs/9f4128e00b0ae8ec65918efeba59db998750ead6?narHash=sha256-rwz8NJZV%2B387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ%3D' (2024-07-03)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/cc4d466cb1254af050ff7bdf47f6d404a7c646d1?narHash=sha256-7XfBuLULizXjXfBYy/VV%2BSpYMHreNRHk9nKMsm1bgb4%3D' (2024-06-06)
  → 'github:cachix/pre-commit-hooks.nix/0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07?narHash=sha256-F1h%2BXIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4%3D' (2024-06-24)
 2024-07-07 00:21:50 +00: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
Tayou
330c95e55b Merge pull request #2612 from Trial97/lib_doc 
add docs to Library.cpp
 2024-07-06 14:21:28 +02:00
Trial97
a6ae078e7e add docs to Library.cpp 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-06 09:30:26 +03:00