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

5010 Commits

Author SHA1 Message Date
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 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
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
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
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 d483b613b1 Merge pull request #1578 from TheKodeToad/antialiasing 2023-09-04 17:05:29 +02:00
Sefa Eyeoglu 546d49e183 Merge pull request #1530 from Trial97/metadata_delete 2023-09-04 17:02:52 +02:00
TheKodeToad 94c1cd6bcf CurseForge shader downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-04 14:15:37 +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
TheKodeToad 179abfa03e Resource provider column 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-01 22:05:44 +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 ad16d61208 Resource metadata writing 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-01 17:42:05 +01: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
TheKodeToad 6aecbfc38f Fix crashes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-01 12:50:20 +01:00
TheKodeToad ee48766996 More generalistaion for ResourceFolderModels 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-01 00:27:05 +01: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
TheKodeToad 93876e27f8 Generalise resource metadata 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-31 17:54:22 +01:00
TheKodeToad 25ce11d85d Merge pull request #1539 from Trial97/refactor_modpack_ux 
Improvements to modpack UX
 2023-08-31 14:58:54 +01:00
TheKodeToad befa3baa6a Merge branch 'develop' into feat/launcher-updater 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-30 11:47:33 +01: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
TheKodeToad 8c30cb3706 Fix CI 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-29 13:27:06 +01:00