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

8720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97 ebde563648 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-09-26 20:16:46 +03:00
Trial97 4ee6a6711d Added version check for neoforge filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 23:04:21 +03:00
Trial97 86b47b3421 Do not display invalid shaders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 22:33:36 +03:00
Trial97 7c636d4608 Removed mojang 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 17:44:04 +03:00
TheKodeToad 0406e168e7 Merge pull request #1655 from 0xallie/minecraft-wiki-migration 
Update links to Minecraft Wiki
 2023-09-25 15:26:37 +01:00
alexia 1684cff7ac Update links to Minecraft Wiki 
Minecraft Wiki has officially moved from Fandom to their own wiki.
I updated some links I found in comments.

Signed-off-by: alexia <me@alexia.lol>
 2023-09-25 15:49:12 +02:00
Sefa Eyeoglu ad9fb7349f Merge pull request #1647 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-09-24 09:02:43 +02:00
bolli24 14af7044be Update launcher/ui/dialogs/ModUpdateDialog.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: bolli24 <9805065+bolli24@users.noreply.github.com>
 2023-09-24 03:01:47 +02:00
github-actions[bot] fa65ac3ff7 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nix-filter':
    'github:numtide/nix-filter/ac030bd9ba98e318e1f4c4328d60766ade8ebe8b' (2023-09-04)
  → 'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/46688f8eb5cd6f1298d873d4d2b9cf245e09e88e' (2023-09-15)
  → 'github:nixos/nixpkgs/e12483116b3b51a185a33a272bf351e357ba9a99' (2023-09-21)
 2023-09-24 00:18:03 +00:00
bolli24 f3c089792a Skip folders when updating mods. 
Previously the mod updater would fail, reporting "The mod updater was aborted!", when trying to update a folder.

Signed-off-by: bolli24 <4827765-bolli24@users.noreply.gitlab.com>
 2023-09-22 21:36:19 +02:00
Alexandru Ionut Tripon 81a3ba18bc Update launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-09-20 18:45:23 +03:00
Sefa Eyeoglu 98bc102f5b Merge pull request #1618 from getchoo/cool-nix-stuff 
filter source in flake & add controller support
 2023-09-20 07:47:22 +02:00
seth 97da8892b9 chore(nix): add meta.mainProgram attribute 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-19 16:41:40 -04:00
seth 97ced1f459 fix(nix): include libusb1 as a runtime dependency 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-19 16:41:37 -04:00
Trial97 a49851cb40 updated blocked mods with empty hash 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-19 15:48:12 +03:00
Sefa Eyeoglu d72c3aba80 Merge pull request #1632 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-09-17 09:30:30 +02:00
github-actions[bot] 9afe80b0e0 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/b200e0df08f80c32974a6108ce431d8a8a5e6547' (2023-09-07)
  → 'github:nixos/nixpkgs/46688f8eb5cd6f1298d873d4d2b9cf245e09e88e' (2023-09-15)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa' (2023-08-17)
  → 'github:cachix/pre-commit-hooks.nix/4f883a76282bc28eb952570afc3d8a1bf6f481d7' (2023-09-10)
 2023-09-17 00:18:04 +00:00
Sefa Eyeoglu 00af385619 Merge pull request #1572 from Trial97/catpacks2 2023-09-16 18:22:13 +02:00
Sefa Eyeoglu bf6dc10f35 Merge pull request #1605 from TheKodeToad/flame-shaders 2023-09-16 18:20:45 +02:00
Trial97 0e41ceffc4 removed missed header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-16 19:18:58 +03:00
Trial97 01e98a6ce8 simplify the raw json parsing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Fixed Tests

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-16 19:12:09 +03:00
cullvox 4053229544 DCO Remediation Commit for cullvox <cullvox@outlook.com> 
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: c81689d393

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-15 20:55:34 -04:00
cullvox 07645984b5 Merge branch 'components-resource-pack-fix' of https://github.com/cadenmiller/PrismLauncher into components-resource-pack-fix 2023-09-15 20:41:27 -04:00
cullvox c81689d393 fixes html elide issue with InfoFrame 2023-09-15 20:41:21 -04:00
cullvox e96d0b6caf DCO Remediation Commit for cullvox <cullvox@outlook.com> 
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: ee7016fa54

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-13 14:31:04 -04:00
cullvox ee7016fa54 use clang-format 
Signed-off-by: cullvox <cullvox@outlook.com
 2023-09-13 14:28:56 -04:00
cullvox e1dda6c005 DCO Remediation Commit for cullvox <cullvox@outlook.com> 
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: ddf0c28b1b

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-12 21:50:33 -04:00
cullvox ddf0c28b1b clang-format fixes 2023-09-12 21:45:29 -04:00
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
seth 4cb424470b Merge pull request #1619 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-09-10 15:57:03 -04:00
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