Commit Graph

1234 Commits

Author SHA1 Message Date
Trial97
8daa1219a5 add extra protection against empty download link
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-25 01:13:05 +03:00
Rachel Powers
7bd04ae928 fix don't hang the ui for a full version load
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-10-23 16:23:10 -07:00
TheKodeToad
89a327d363 Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-23 14:19:07 +01:00
Trial97
836aebc0d9 fix small leak
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-22 13:43:16 +03:00
Trial97
2030041fcc Fix tests segfault
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-19 21:42:14 +03:00
Alexandru Ionut Tripon
78ceae9c17 Merge pull request #2887 from Trial97/filters_modpack
Add filters for modpack search
2024-10-12 00:07:14 +03:00
Trial97
d31c947b36 fix crash when no resorce version is available
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 22:02:38 +03:00
Trial97
df9f54454a removed static functions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 19:19:03 +03:00
TheKodeToad
538815e033 Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 17:16:10 +01:00
TheKodeToad
3fae659b30 Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 17:15:42 +01:00
Trial97
5bd5627a96 extended the modrinth search and applied the suggested change
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 15:06:50 +03:00
Trial97
6e5f616ced move checkMcVersions to Filter struct
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-07 00:21:28 +03:00
Trial97
859fac604b add modrinth modpack filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-04 17:06:47 +03:00
Trial97
dfe3cd849d add curseforge modpack filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-02 01:06:45 +03:00
timoreo
c57e26cf57 Merge pull request #2874 from Trial97/modpack_equal 2024-10-01 11:40:42 +02:00
Trial97
946e791d39 sync modpack search field
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-01 08:53:27 +03:00
Trial97
0eefa52dbc fix some transtaions warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-01 08:51:06 +03:00
Cart
6475dc5786 Lots of J's for Java needed to be uppercased 2024-09-26 01:58:21 -04:00
seth
3e60713257 Merge pull request #2838 from Trial97/view_log
Always display Minecraft log tab
2024-09-24 20:00:54 -04:00
seth
48904c0d66 Merge pull request #2806 from Trial97/technic_client
Add Technic client ID
2024-09-24 19:55:21 -04:00
Trial97
77463c6d33 display minecraft log before instance run
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-18 21:17:15 +03:00
Trial97
5073fc19d4 fix java autodetect when instance settings are open
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-14 00:36:31 +03:00
Alexandru Ionut Tripon
e59f90eca8 Update launcher/ui/pages/global/APIPage.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-09-14 00:19:48 +03:00
Trial97
1db122f1a2 fix typo
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-13 21:37:50 +03:00
Alexandru Ionut Tripon
d20f24d96f Apply suggestions from code review
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-09-13 21:13:21 +03:00
Trial97
973b43ca7a Add techinc client ID
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-13 20:01:45 +03:00
Alexandru Ionut Tripon
fa68428a90 Merge pull request #2795 from Trial97/fix_mc_launch
Fix launch when no java is loaded
2024-09-10 18:57:09 +03:00
QazCetelic
e2ef280da9 DCO Remediation Commit for QazCetelic <qaz.cetelic@protonmail.com>
I, QazCetelic <qaz.cetelic@protonmail.com>, hereby add my Signed-off-by to this commit: 7fbf0d3bf3

Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
2024-09-09 16:24:40 +02:00
QazCetelic
7fbf0d3bf3 Sort files chronologically in descending order
Signed-off-by: Qaz <dev@malplena.net>
2024-09-09 15:40:31 +02:00
Trial97
2622d3daa9 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_mc_launch
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-09 08:11:11 +03:00
TheKodeToad
01015a7345 Merge pull request #2547 from Ryex/fix/component-version-resolusion
Component version resolusion on Minecraft version change
2024-09-08 23:44:07 +01:00
Trial97
14fb54afd9 Fix launch when no java is loaded
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-08 09:10:29 +03:00
TheKodeToad
23c69e7f94 Merge pull request #2018 from Trial97/coremods
Ensure that core mods tab is visible on correct versions
2024-08-25 13:01:27 +01:00
Trial97
575cdb043b Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-23 08:29:43 +03:00
Trial97
92495494ca Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-23 08:16:59 +03:00
TheKodeToad
2ad34c724e Make log colours themeable
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-21 22:19:50 +01:00
Trial97
ca298d1ed5 add automatic java switch on minecraft version switch
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-20 01:08:03 +03:00
Trial97
4d24213aa3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-08-20 00:02:14 +03:00
Trial97
23c06f23c3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion 2024-08-19 22:35:11 +03:00
Trial97
38b5ee198a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-08-18 22:39:46 +03:00
Trial97
b5bbe93775 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-17 00:20:40 +03:00
Trial97
b0cd412926 use index instead of currentIndex function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-16 15:41:31 +03:00
Trial97
e6bc61d6d0 add overload for qt5
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-16 14:44:57 +03:00
Trial97
6de026bfcf replaced currentTextChanged with currentIndexChanged
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-16 14:34:28 +03:00
Trial97
a9c7e95c66 fix widebar action removal
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-08 19:39:32 +03:00
Trial97
c9809fff6d add setting for quickplay singleplayer
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-08 16:53:26 +03:00
Trial97
0ac62f9ddf Recommend java major
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-07-23 01:41:41 +03:00
Trial97
5d3549a5e9 Add tooltips and fix archive download task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-07-22 09:18:20 +03:00
Trial97
29a6db171f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-22 08:57:31 +03:00
Trial97
91d03b34ac Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-07-21 02:24:30 +03:00