fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,925 Commits 1 Branch 0 Tags
a4e65305139dc5cdc7ad246b3203175a21262050
Commit Graph

6925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cullvox a4e6530513 added tests, fixed issues with overriding/format 
In the documentation it states that child values can override the parent
values. Originally this code did not support that but now it does. Also
added in testing inspired by the previous tests.

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-12 21:34:42 -04:00
cullvox df88ccd419 clean up and add review suggestions, links open 
Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-11 15:49:01 -04:00
cullvox b16085f66c attempt to fix clang-format and ubuntu build. 
Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-11 02:05:05 -04:00
cullvox fbe4043651 fix formatting and add more proper errors. 
Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-11 01:34:53 -04:00
cullvox 58bd6d929f added formatting with colors. 
This is somewhat dirty implementation and I will clean it up soon.
Using the HTML rich text features of Qt, made it much easier to
understand what was needed.

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-10 23:37:26 -04: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
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
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 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
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 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
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
seth 584e800279 fix: remove -Wextra-semi 
this flag is unavailable on gcc versions < 8. we could detect the
version of the compiler here, but i don't think we lose much in this
flags removal and this is a simpler option

Signed-off-by: seth <getchoo@tuta.io>
 2023-08-30 11:14:49 -04:00
TheKodeToad f23a8e4b4b Enable antialiasing for mod and pack icons 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-29 23:34:19 +01:00
Sefa Eyeoglu b83fdbd1b7 Merge pull request #1575 from TheKodeToad/more-pack-export-fixes 2023-08-28 22:18:58 +02:00
TheKodeToad 0e67686295 Hide index folder in pack export dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:25:07 +01:00
TheKodeToad e98bca4749 Fix cancelling pack save 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:09:40 +01:00
Sefa Eyeoglu bdc2fca711 refactor(nix): don't instantiate nixpkgs 
See https://zimbatm.com/notes/1000-instances-of-nixpkgs

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-28 15:18:10 +02:00
Sefa Eyeoglu fbf6833124 Merge pull request #1519 from TheKodeToad/better-export-pack 2023-08-28 10:29:32 +02:00
Sefa Eyeoglu e4e4c4a430 Merge pull request #1573 from PrismLauncher/renovate/lock-file-maintenance 2023-08-28 10:14:45 +02:00
Sefa Eyeoglu 97d932db62 Revert "chore(deps): enable nix lockfile maintenance for renovate" 
This reverts commit 5d14724e66.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-28 10:14:21 +02:00
renovate[bot] 66cbbfec0c chore(deps): lock file maintenance 2023-08-28 00:23:14 +00:00
TheKodeToad 9110fbf282 Merge pull request #1560 from Trial97/curse_multiple_loaders2 
Add suport for flame multiple loaders
 2023-08-27 18:21:14 +01:00
TheKodeToad e3b04d10cf Merge pull request #1536 from Trial97/time3 
Allow showing playtime in hours
 2023-08-27 18:14:04 +01:00
Trial97 8c607ae734 removed extra if 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 20:02:12 +03:00
Trial97 c5aac24a93 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse_multiple_loaders2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 15:53:35 +03:00
Trial97 4036cecfc0 Added progress widget to some modpack providers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 15:04:42 +03:00
Sefa Eyeoglu df14f88307 Merge pull request #1532 from Trial97/curseforge-url-handle 2023-08-27 12:26:57 +02:00
seth 29736b3b1f Merge pull request #1570 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-08-27 01:47:58 -04:00
github-actions[bot] 9735e46a7e chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ca3c9ac9f4cdd4bea19f592b32bb59b74ab7d783' (2023-08-19)
  → 'github:nixos/nixpkgs/c66ccfa00c643751da2fd9290e096ceaa30493fc' (2023-08-26)
 2023-08-27 00:17:22 +00:00
Trial97 288d0d1fd4 Added back api loader filtering if just one is selected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-26 22:26:01 +03:00
Trial97 abfd1a4205 minor dependency crash fix 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-25 18:35:25 +03:00
Sefa Eyeoglu 094cee8ec6 Merge pull request #1561 from Scrumplex/nix-miscs 2023-08-25 10:08:53 +02:00