Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-11 20:57:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,835 Commits 9 Branches 38 Tags
879495942a382b2a68ea112fd992f4fbad796e16
Commit Graph

1190 Commits

Author SHA1 Message Date
Sticks
b0ee4f6e58 fix: remove qWarning for unknown state 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sticks <sticks@teamhydra.dev>
(cherry picked from commit d4e1851e67)
 2025-04-01 15:10:15 +00:00
Sticks
25ce20a877 fix: Grammar correction in failed message for update dialogues 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sticks <sticks@teamhydra.dev>
(cherry picked from commit ea5458ed22)
 2025-04-01 15:10:15 +00:00
sticks
2952b1d6b6 feat: add updater dialogues 
Signed-off-by: sticks <tanner@teamhydra.dev>
(cherry picked from commit 998bc660fa)
 2025-04-01 15:10:15 +00:00
Trial97
07604c9271 fix account help link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a4472406b9)
 2025-03-24 16:58:49 +00:00
Trial97
97180324ee make sure if user changes java path also disable java management 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-17 16:14:15 +02:00
Trial97
62ed3f8406 fix modrinth link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3ee73916ca)
 2025-01-17 01:42:14 +00:00
Trial97
a739db8bdb propagate load component error 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 6ebfcb91cf)
 2025-01-08 22:22:36 +00:00
Kenneth Chew
1d29f63bec Fix tab order in launcher settings 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit c3712ba648)
 2024-12-14 16:32:21 +00:00
Trial97
af74d5f410 Make FTB Import note italic to match others 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a09af619ce)
 2024-12-02 14:17:44 +00:00
Trial97
4c4017d7ca remove task parent from constuctor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-15 09:35:36 +02:00
TheKodeToad
eefeb5799d Add scrollbar to Settings -> Launcher -> Features 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 71e55f8829)
 2024-11-15 05:40:31 +00:00
Trial97
63a6f823fd add qassert 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 94f65f8727)
 2024-10-28 20:59:25 +00:00
Trial97
db32b2ad99 remove message box 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9cdda4377b)
 2024-10-28 20:59:25 +00:00
Trial97
c3cf5d31da replace currentData with itemData on QComboBox::currentIndexChanged slots 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 0cafac84ac)
 2024-10-28 20:59:25 +00:00
Trial97
1e696328bb fix #3001 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit b593ff09e9)
 2024-10-28 20:59:25 +00:00
Trial97
1d9c97803a rename snake_case to camelCase 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 44894a29b1)
 2024-10-28 20:59:25 +00:00
Trial97
3d55236fdf add extra protection against empty download link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 8daa1219a5)
 2024-10-28 20:59:25 +00:00
Trial97
130714a9ab translate standard buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bd82737efb)
 2024-10-28 20:34:51 +00:00
Trial97
9560447c92 swap search with filter button for modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 61448a61ea)
 2024-10-28 13:04:39 +00:00
Rachel Powers
729cec5f45 fix don't hang the ui for a full version load 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit 7bd04ae928)
 2024-10-24 10:24:53 +00:00
Trial97
b983ae0fb0 fix small leak 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 836aebc0d9)
 2024-10-22 14:41:34 +00: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
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