Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-13 04:47:15 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,353 Commits 10 Branches 38 Tags
Commit Graph

9353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
379f1a70e9
Leave headers alone 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 22:37:57 +02:00
Trial97
b3fc07d444
Added extra java search paths 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 21:47:59 +02:00
Trial97
3d29da916d
Made Java path configurable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 20:15:19 +02:00
Trial97
ba990e075b
Added JavaPath function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 19:45:46 +02:00
TheKodeToad
7cac8ad2b4
Use QTextFragment for inserting log lines 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-06 20:42:18 +00:00
Sefa Eyeoglu
6935c0dc3b
Merge pull request #2089 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-02-04 10:01:20 +01:00
github-actions[bot]
15670cc27b chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/07f6395285469419cf9d078f59b5b49993198c00' (2024-01-11)
  → 'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f' (2024-02-01)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/4fddc9be4eaf195d631333908f2a454b03628ee5' (2024-01-25)
  → 'github:nixos/nixpkgs/79a13f1437e149dc7be2d1290c74d378dad60814' (2024-02-03)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/f56597d53fd174f796b5a7d3ee0b494f9e2285cc' (2024-01-20)
  → 'github:cachix/pre-commit-hooks.nix/7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf' (2024-01-28)
 2024-02-04 00:19:10 +00:00
Trial97
82b15268bc
preparing java autodownload 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-03 00:11:05 +02:00
Trial97
0384e652fb
Finished up the download dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-02 22:42:42 +02:00
Trial97
3c58fb0677
Moving files around 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-02 15:51:32 +02:00
Tayou
5d223f6f93
Merge pull request #2050 from TheKodeToad/default-game-dir 
Use `minecraft` instead of `.minecraft` for better accessibility
 2024-02-01 18:16:14 +01:00
Trial97
6c5bb3817b
Cleaned some code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-31 18:07:28 +02:00
Trial97
5afe75e821
Fixed some codeql warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-30 12:37:34 +02:00
seth
b0a473a5ce
Merge pull request #2073 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-01-27 23:34:12 -05:00
github-actions[bot]
901cc4e4dd chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/e5d1c87f5813afde2dda384ac807c57a105721cc' (2024-01-19)
  → 'github:nixos/nixpkgs/4fddc9be4eaf195d631333908f2a454b03628ee5' (2024-01-25)
 2024-01-28 00:19:08 +00:00
Trial97
7317105e4d
Code spaghetti and more chaos 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-27 22:47:28 +02:00
Trial97
b54410b48c
Added gameVersion for curseforge mod packs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-26 19:10:39 +02:00
Trial97
ad98f600d5
corecly display core mods tab 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-26 18:36:31 +02:00
Alexandru Ionut Tripon
cff2f4b6ff
Merge pull request #2070 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x 
chore(deps): update hendrikmuhs/ccache-action action to v1.2.12
 2024-01-26 09:57:49 +02:00
renovate[bot]
ab4974629c
chore(deps): update hendrikmuhs/ccache-action action to v1.2.12 2024-01-26 07:12:13 +00:00
TheKodeToad
82d0f204e2
De-OOP ProviderCapabilities 
There was no reason for it to be a class, and imo it created quite a code-smell needing to initialise it everywhere.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-26 03:06:05 +00:00
TheKodeToad
97ee0a19b5
Refactor updating mechanisms to work with all resources 
Summary:
- It compiles
- I need to go to bed

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-26 02:53:57 +00:00
Trial97
4cd236ed80
missing header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-26 00:31:43 +02:00
Trial97
81282bf7e0
Autodetect Java? 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-26 00:22:05 +02:00
Trial97
f36be3f0e3
Cleanup downloaders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-25 22:58:12 +02:00
Trial97
e897032383
Added java metadata 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-25 22:22:21 +02:00
TheKodeToad
2c18d0f1a5
Store current version in packwiz metadata (temporarily using x-prismlauncher-version-number) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-25 15:41:34 +00:00
Trial97
25bca28707
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-01-24 18:26:48 +02:00
Trial97
a0e7729aa6
Started workin on stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-24 18:26:43 +02:00
Alexandru Ionut Tripon
1c3d63981b
Merge pull request #2063 from DioEgizio/no-alpha-mr 
fix: remove alpha notice on modrinth packs
 2024-01-24 18:13:15 +02:00
DioEgizio
8de1060bfb fix: remove alpha notice on modrinth packs 
with the modrinth app being released for quite a while now it's weird to still have this (tbh they've never been truly alpha)

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-01-24 16:43:38 +01:00
seth
1075a94034
Merge pull request #2040 from getchoo/nix/filesets 
[Linux/MacOS] Replace nix-filter with lib.fileset
 2024-01-24 03:05:30 -05:00
TheKodeToad
35b5c8097c
Merge branch 'develop' into resource-meta 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-23 23:20:40 +00:00
seth
8312713dc2
refactor(nix): nix-filter -> lib.fileset 
with our own use of `map`, this is basically a drop-in replacement for
nix-filter, but already in nixpkgs!

Signed-off-by: seth <getchoo@tuta.io>
 2024-01-23 16:10:41 -05:00
Sefa Eyeoglu
7bce88e83e
Merge pull request #2060 from PrismLauncher/renovate/korthout-backport-action-2.x 2024-01-23 20:45:36 +01:00
renovate[bot]
72e6218df9
chore(deps): update korthout/backport-action action to v2.4.1 2024-01-23 19:21:30 +00:00
Sefa Eyeoglu
e60235cb88
Merge pull request #2053 from Trial97/fix_open_path_take_two 2024-01-23 09:29:57 +01:00
Sefa Eyeoglu
913f6d8563
Merge pull request #2052 from PrismLauncher/renovate/korthout-backport-action-2.x 2024-01-22 22:32:38 +01:00
Trial97
6b637a8797
Display minecraft version if not mentioned for modrinth packs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-22 22:32:42 +02:00
Trial97
9bbeb5ef3a
Made updater interval configurable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-22 21:26:46 +02:00
Trial97
12bf913764
Fixed open path a second time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-22 20:36:57 +02:00
renovate[bot]
0dc4a10f48
chore(deps): update korthout/backport-action action to v2.4.0 2024-01-22 17:26:37 +00:00
Trial97
f77749e448
Resized Refresh theme button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-21 21:24:47 +02:00
Sefa Eyeoglu
78482d0d3e
Merge pull request #2049 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-01-21 08:28:49 +01:00
Alexandru Ionut Tripon
e4306d5cb6
Update launcher/ui/themes/CatPack.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-01-21 08:52:49 +02:00
TheKodeToad
f54ac25614
Use minecraft instead of .minecraft for better accessibility 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-21 02:28:55 +00:00
github-actions[bot]
c7cd8b7877 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nix-filter':
    'github:numtide/nix-filter/c843418ecfd0344ecb85844b082ff5675e02c443' (2023-12-04)
  → 'github:numtide/nix-filter/3449dc925982ad46246cfc36469baf66e1b64f17' (2024-01-15)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/eabe8d3eface69f5bb16c18f8662a702f50c20d5' (2024-01-09)
  → 'github:nixos/nixpkgs/e5d1c87f5813afde2dda384ac807c57a105721cc' (2024-01-19)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/274ae3979a0eacae422e1bbcf63b8b7a335e1114' (2024-01-12)
  → 'github:cachix/pre-commit-hooks.nix/f56597d53fd174f796b5a7d3ee0b494f9e2285cc' (2024-01-20)
• Updated input 'pre-commit-hooks/flake-utils':
    'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
  → 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
• Updated input 'pre-commit-hooks/gitignore':
    'github:hercules-ci/gitignore.nix/a20de23b925fd8264fd7fad6454652e142fd7f73' (2022-08-14)
  → 'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5' (2023-12-29)
 2024-01-21 00:20:26 +00:00
erik.lundstedt
30913fdb2b fix a minor spelling misstake in Mod.cpp 
closes https://github.com/PrismLauncher/PrismLauncher/issues/2047

Signed-off-by: erik.lundstedt <erik@lundstedt.it>
 2024-01-21 00:31:00 +01:00
Trial97
0303b1cc7f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats 2024-01-20 00:27:30 +02:00
Alexandru Ionut Tripon
4cda04271f
Merge pull request #1913 from Trial97/dialog 
Fixed askIfShouldUpdate dialog on mac
 2024-01-18 22:02:04 +02:00