Commit Graph

2436 Commits

Author SHA1 Message Date
e07e182e95 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-04-24 23:51:43 +03:00
e33ddbadd2 Merge branch 'filters' of github.com:Trial97/PrismLauncher into filters 2024-04-24 23:51:33 +03:00
c902da4461 Fix image width in project description
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-24 22:02:55 +03:00
3a4f82ffd1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-24 00:21:39 +03:00
89230c4f8a Moved the export modlist out of the sub-menu
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-20 18:01:25 +03:00
d88fb266a5 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2024-04-20 17:42:58 +03:00
77aead6470 Rename object name "userInterfaceTab" from "generalTab"
The "User Interface" tab was innacurately named "General" which I just
went in and fixed.

This also renamed the object for respective vertical spacers.

Signed-off-by: SolidStateDj <solidstatedj@proton.me>
2024-04-16 16:01:34 -04:00
a877f9146d Change of parameters
To help deal with adjustments

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
2024-04-07 16:53:53 -04:00
f91f97e56d Renaming and removing redundancies
old's do not make sense here

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
2024-04-07 16:49:39 -04:00
9cc58fe62c Fixed crash on invalid curseforge link on import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-07 21:25:08 +03:00
1c3c9d2457 Added the new ftb settings path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-07 13:48:34 +03:00
186a6d0c52 Make filters vertical
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-01 17:00:10 +01:00
71904b52c1 Make option groups plural
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-01 15:31:18 +01:00
71998cb7d9 Rework filter widget
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-01 15:22:27 +01:00
a0eba1ace6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-31 21:15:49 +03:00
1930689a27 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into dependency_removal
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-29 10:12:02 +02:00
2012b2c243 Merge pull request #1977 from Trial97/resource_clear
Force clear the resource selection
2024-03-28 14:49:03 +02:00
6b967d3f76 Merge pull request #1822 from Trial97/new_cats
Add random and slideshow modes to Catpacks
2024-03-28 14:48:18 +02:00
0f178270be Merge pull request #1786 from Trial97/deps_improve
Make dependency checking more lax
2024-03-27 20:42:26 +01:00
f6572c1244 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2024-03-27 18:55:34 +02:00
5d72ee1c4f Merge pull request #1837 from Trial97/import_ok 2024-03-27 10:50:58 +01:00
3c12e27226 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-23 23:53:25 +02:00
c0754b80a2 Add resize to last column
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-22 22:17:58 +02:00
1a6dfd04d6 Made tar.gz parser
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-21 19:46:57 +02:00
1c809f0fb1 Added more logs for auto java install
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-20 17:39:10 +02:00
703470e57d Hopefully fix codeql
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-20 08:24:40 +02:00
5f8269f5e1 Small class rename
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-20 00:29:46 +02:00
09c2c6793b Improve UI
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-20 00:15:02 +02:00
1322277ae6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-03-17 20:57:53 +02:00
9120848278 Made java downloader as a build option
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-06 19:33:14 +02:00
a0311780c1 Merge pull request #1866 from Trial97/supported_files
Added all supported files filter
2024-03-06 17:21:56 +02:00
27780cc7ae Add update UI for all resource types
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-03-06 14:56:04 +00:00
4101fbb634 Allow multiline description
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-03-01 01:05:03 +00:00
41d52dc347 Remove dependencies if review mods is rejected
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-29 00:06:28 +02:00
27e76d0dcb Removed static path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-27 17:11:19 +02:00
24fd07861b format code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-26 22:25:14 +02:00
da96172b0b Apply suggestions from code review
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-02-26 22:00:40 +02:00
344398f238 Updated ftb app import instance detection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-26 21:20:14 +02:00
1cdb9bd5af Merge pull request #2141 from crpz1/welcome_label_consistency 2024-02-22 12:36:00 +01:00
9aa81cf005 Use empty list label code for welcome screen
Signed-off-by: crpz1 <8588315+crpz1@users.noreply.github.com>
2024-02-20 00:21:37 +11:00
1c96ae5807 Fixed java refresh button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 22:32:54 +02:00
889f604a41 Removed JavaExtraSearchPaths
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 21:38:31 +02:00
a288779790 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-02-18 16:49:35 +02:00
038d3e4596 Fixed asan complains
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 16:49:10 +02:00
44327980db feat: add "use zink" button
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-02-18 13:30:55 +01:00
b4f3a969b3 Updated strings that are displayed to user
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 14:30:38 +02:00
4aafa98852 Improved the message boxes for java wizzard
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 12:58:34 +02:00
2f489d1aec Added auto java options to the java wizzard page
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 11:34:54 +02:00
4c76f7afe0 Made auto java checkbox dependent
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 09:46:44 +02:00
a7dad96a70 Added refresh button on managed java list
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 09:32:31 +02:00