Commit Graph

573 Commits

Author SHA1 Message Date
2145f9f0ac Merge pull request #1847 from Trial97/move_export2
Improvements to modlist export
2024-05-31 09:58:32 +03:00
abb628edb3 remove OverrideJava
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-20 18:23:43 +03:00
c9c67ef79e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version 2024-05-18 15:27:02 +03:00
d77d1f3be3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods 2024-05-18 14:44:33 +03:00
7a5348a179 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14:31 +03:00
51f4ede797 Fixing CI format issues
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
2024-05-01 00:11:53 -04:00
b9c010ffb2 Added patch to all setHtml calls
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
2024-04-30 23:43:36 -04:00
60bd8104c4 Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-26 01:53:51 +01:00
9ce10231ed Remove redundant event handler
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-26 01:44:43 +01:00
803e26a401 Make actions more consistent
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-26 01:40:18 +01: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
f6572c1244 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2024-03-27 18:55:34 +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
27780cc7ae Add update UI for all resource types
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-03-06 14:56:04 +00: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
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
c0fb053ccc Added warning for x86 java
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-09 23:14:49 +02:00
3c58fb0677 Moving files around
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-02 15:51:32 +02:00
7317105e4d Code spaghetti and more chaos
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-27 22:47:28 +02:00
ad98f600d5 corecly display core mods tab
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-26 18:36:31 +02:00
97ee0a19b5 Refactor updating mechanisms to work with all resources
Summary:
- It compiles
- I need to go to bed

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-26 02:53:57 +00:00
e897032383 Added java metadata
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-25 22:22:21 +02:00
25bca28707 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-01-24 18:26:48 +02:00
35b5c8097c Merge branch 'develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-23 23:20:40 +00:00
0b3e91ac62 Merge pull request #1954 from Scrumplex/fix/open-paths-immediately 2024-01-17 15:18:46 +01:00
67d088dc53 fix: simplify openPath calls
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-01-14 11:36:17 +01:00
d94e641900 Load versions on first edit
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-07 22:00:31 +02:00
219e2862f9 Fixed openAL placeholder
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-05 23:02:42 +02:00
05e4533096 Add online mode fix for legacy versions; minor refactors in legacy
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-02 18:11:54 +00:00
56397446db Update ModFolderPage.cpp
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-16 12:53:59 +01:00
0ccdcd23e3 fix: open paths directly
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-12-14 13:02:29 +01:00
4498d32cc0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-12-13 14:37:02 +02:00
d10b075677 Sort mods before export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-12-13 14:36:58 +02:00
79218cf13b Merge pull request #1738 from Trial97/some_removals 2023-12-11 11:08:26 +01:00
6f6b6312a5 Moved the button up
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-27 09:39:31 +02:00
1a0fd5f993 Added mod reinstall dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-25 00:18:10 +02:00
ff5a968de0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2 2023-11-23 23:57:20 +02:00
1650237c8f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into some_removals 2023-11-23 23:37:13 +02:00
2318a83881 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2023-11-23 16:33:57 +02:00
afcdb7595c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-23 16:01:54 +02:00
a966289944 Merge pull request #1852 from Trial97/war_ning 2023-11-23 11:01:53 +01:00
d8c5ed55c2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2 2023-11-23 12:00:18 +02:00
6169af70db Added back the FIXME comment
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 11:59:35 +02:00
6b3b54f061 format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 10:48:11 +02:00
d5d8b7be8d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-23 10:45:35 +02:00
673f82e884 Merge branch 'war_ning' of github.com:Trial97/PrismLauncher into war_ning 2023-11-23 10:45:06 +02:00