ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
8,581 Commits 4 Branches 5 Tags 40 MiB
43eb27b695
Commit Graph

8581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
9445a555e4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packwiz 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-10 16:24:59 +03:00
Trial97
47d1f23568
added side for modrinth mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-10 16:22:57 +03:00
cullvox
7a7c3015f4 fix not properly reading json text. 
The text now displays properly in the GUI of Prism.

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-09 20:25:49 -04:00
github-actions[bot]
82a0a5bca1 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/bfb7dfec93f3b5d7274db109f2990bc889861caf' (2023-09-02)
  → 'github:nixos/nixpkgs/b200e0df08f80c32974a6108ce431d8a8a5e6547' (2023-09-07)
 2023-09-10 00:17:57 +00:00
cullvox
1261908ef7 remove space for clang-format 
Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-09 19:55:55 -04:00
cullvox
ef1dc2afac DCO Remediation Commit for cullvox <cullvox@outlook.com> 
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: 05f4214cc5

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-09 19:50:59 -04:00
cullvox
05f4214cc5 fix clang-format failing 2023-09-09 19:50:13 -04:00
cullvox
04aa0155bf DCO Remediation Commit for cullvox <cullvox@outlook.com> 
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: d2e662ddbb

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-09 19:45:30 -04:00
cullvox
093d09efe3 fix style, and use qWarning instead of throw. 
Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-09 19:03:33 -04:00
seth
10192c540b
feat(nix): add source filtering 
this - along with garnix - should mostly eliminate unneeded (re)builds

Signed-off-by: seth <getchoo@tuta.io>
 2023-09-09 15:25:41 -04:00
seth
6aa821df9c
refactor(nix): match inputs value in flake 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-09 15:25:39 -04:00
seth
89e434bd5b
refactor(nix): don't concat final attr in fixed point 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-09 15:25:33 -04:00
cullvox
d2e662ddbb added support for components in resource pack descriptions. 
Signed-off-by: Caden Miller <me@cadenmiller.dev>
 2023-09-09 12:35:34 -04:00
Sefa Eyeoglu
78f8a31cd6
Merge pull request #1613 from PrismLauncher/renovate/actions-cache-3.x 2023-09-08 23:28:03 +02:00
renovate[bot]
e7d6be531f
chore(deps): update actions/cache action to v3.3.2 2023-09-08 17:22:12 +00:00
Trial97
6ec1cf6e49
made skin upload more generic 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-08 19:50:46 +03:00
Trial97
8c8e4329d7
fix codeql 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-05 23:45:32 +03:00
Trial97
8bad255a91
added more import options 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-05 20:13:16 +03:00
Trial97
ab648e58ce
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2023-09-05 00:18:45 +03:00
Trial97
c86b8b0f70
added skin manage dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-05 00:18:36 +03:00
Sefa Eyeoglu
ba3a1b6280
Merge pull request #1606 from PrismLauncher/renovate/actions-checkout-4.x 2023-09-04 17:11:45 +02:00
Sefa Eyeoglu
d483b613b1
Merge pull request #1578 from TheKodeToad/antialiasing 2023-09-04 17:05:29 +02:00
Sefa Eyeoglu
cf599865f6
Merge pull request #1581 from getchoo/old-gcc 2023-09-04 17:04:10 +02:00
Sefa Eyeoglu
546d49e183
Merge pull request #1530 from Trial97/metadata_delete 2023-09-04 17:02:52 +02:00
renovate[bot]
7dd2530027
chore(deps): update actions/checkout action to v4 2023-09-04 15:02:01 +00:00
Sefa Eyeoglu
e9ecdd05b9
Merge pull request #1574 from Scrumplex/refactor-flake 2023-09-04 17:02:01 +02:00
Sefa Eyeoglu
ad6f15f293
Merge pull request #1604 from PrismLauncher/renovate/cachix-install-nix-action-23.x 2023-09-04 17:01:43 +02:00
TheKodeToad
94c1cd6bcf
CurseForge shader downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-04 14:15:37 +01:00
renovate[bot]
e155844671
chore(deps): update cachix/install-nix-action action to v23 2023-09-04 10:22:11 +00:00
Sefa Eyeoglu
2918d61b16
refactor(nix): use pre-commit flake module 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-09-04 08:53:10 +02:00
seth
bbf4e3b04d
refactor(nix): use fixed points over rec 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-03 19:07:39 -04:00
Sefa Eyeoglu
caf925cbad
Merge pull request #1601 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-09-03 09:42:31 +02:00
github-actions[bot]
88f3e19f81 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01)
  → 'github:hercules-ci/flake-parts/7f53fdb7bdc5bb237da7fefef12d099e4fd611ca' (2023-09-01)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/9e1960bc196baf6881340d53dccb203a951745a2?dir=lib' (2023-08-01)
  → 'github:NixOS/nixpkgs/3e52e76b70d5508f3cec70b882a29199f4d1ee85?dir=lib' (2023-08-31)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/cddebdb60de376c1bdb7a4e6ee3d98355453fe56' (2023-08-27)
  → 'github:nixos/nixpkgs/bfb7dfec93f3b5d7274db109f2990bc889861caf' (2023-09-02)
 2023-09-03 00:17:45 +00:00
TheKodeToad
19b5a5e00b
Remove final conflict - kept by mistake 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:38:14 +01:00
TheKodeToad
347228a246
Legacy settings override default -> false 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:29:26 +01:00
TheKodeToad
1213a5ab46
Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:27:57 +01:00
Trial97
9ad029e028
added skins directory 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 23:10:33 +03:00
Trial97
abbac5c26c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 22:28:59 +03:00
Trial97
17f696bffc
small tweaks to atl icons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 22:25:15 +03:00
Trial97
e095780cc3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into modrinth_pack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 21:36:28 +03:00
Trial97
609eaa67ab
refactored skin apis 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 21:23:51 +03:00
TheKodeToad
c01e95b79c
Merge pull request #1592 from kumquat-ir/desktop-open-fix 
Fix opening files from curseforge:// and file:// links etc on linux
 2023-09-01 16:13:48 +01:00
kumquat-ir
984e870bca actually it can handle multiple files just fine 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-09-01 10:32:35 -04:00
kumquat-ir
eb66e37b83 fix opening files from curseforge: links on linux 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-09-01 10:29:56 -04:00
Trial97
30ff417074
fix: make cached instead of file for ftb pack import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 16:25:49 +03:00
Trial97
c2b03d0f71
Fully reload the instance list once the folder is changed 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-31 20:35:56 +03:00
Trial97
7e65aea2ef
format json 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-31 19:04:41 +03:00
Trial97
6cfe2dbc50
moved catpack data to testdata 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-31 17:34:05 +03:00
TheKodeToad
25ce11d85d
Merge pull request #1539 from Trial97/refactor_modpack_ux 
Improvements to modpack UX
 2023-08-31 14:58:54 +01:00
Sefa Eyeoglu
707da5a25a
fix(nix): include udev dependency 
See https://github.com/NixOS/nixpkgs/pull/252425

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-30 21:59:42 +02:00