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,646 Commits 9 Branches 38 Tags
1129b4160c0be6ec5bb9d7411d56a98a316e0f15
Commit Graph

2078 Commits

Author SHA1 Message Date
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
Trial97
42a6bd1151 change ZekeZ name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c4cd7cf6c1)
 2024-10-27 19:31:56 +00:00
Trial97
f06505b138 change contributors name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f373a5cea0)
 2024-10-27 19:31:56 +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
51a71d0471 skip QSaveFile temprary files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 562c301326)
 2024-10-22 14:41:34 +00:00
Alexandru Ionut Tripon
6da14d66bb Update launcher/ui/dialogs/skins/SkinManageDialog.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 69028969f1)
 2024-10-21 21:14:30 +00:00
Trial97
199c5497d3 do not try to import skin if path is empty 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9a5b773e69)
 2024-10-21 21:14:30 +00:00
ZekeZ
3ac080806d Merge pull request #2831 from Trial97/fix_login 
split the auth loading screen
 2024-10-21 00:14:36 +10:00
Trial97
2030041fcc Fix tests segfault 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 21:42:14 +03:00
Rachel Powers
a108b5b420 fix: ensure all connections to the ProgressDialogs's Task the dialog made are dissconnected 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-14 00:45:45 -07:00
Mia Moir
3a1c06de02 fix: Tab order on custom command inputs 
The tab order on the custom command UI in the instance settings is off, it goes 0 -> 2 -> 1, This re-orders the ui file to fix the order the inputs are in.

Signed-off-by: Mia Moir <63592337+archessmn@users.noreply.github.com>
 2024-10-12 23:47:58 +01: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
62f19a6ac9 Merge pull request #2863 from Trial97/fix_resource_search_equal 2024-10-01 11:41:11 +02: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
5ea2dece54 fix search term not remaining the same between providers on resource download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:52:07 +03:00
Trial97
0eefa52dbc fix some transtaions warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:51:06 +03:00
Trial97
b676a67b3c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login 2024-10-01 08:49:03 +03:00
seth
38fa2e0cd4 style: format with clang-format 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:32:55 -04: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
timoreo
dc67807894 Merge pull request #2825 from Trial97/skin_fix 2024-09-17 08:50:19 +02:00
Alexandru Ionut Tripon
d06f0529a0 Merge pull request #2830 from Trial97/login_wizard_retry 
Show login dialog again if account login fails
 2024-09-17 08:44:41 +03:00
Alexandru Ionut Tripon
c57b1d4227 Merge pull request #2820 from Trial97/mac_java 
Add extra step to macos java install
 2024-09-17 08:44:09 +03:00
Trial97
2fd8685894 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into java_dir 2024-09-16 20:08:20 +03:00
Trial97
580fc32518 split the auth loading screen 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 16:41:16 +03:00
Trial97
75756b49c3 reshow login dialog in case account login fails 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 16:15:36 +03:00
Trial97
d2f0d1d8d5 Wrap FS::write in try catch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 12:42:09 +03:00
Trial97
d38e7fa142 Add more null protection for skin management 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 12:41:33 +03:00
QazCetelic
1c6bd74ed8 Disable folder action instead of hiding it and add additional information in the tooltip. 
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
 2024-09-14 22:04:18 +02:00
Trial97
0afdce8a31 Add extra step to macos java install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-14 21:18:20 +03:00
Trial97
312009513d add open java folder action 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-14 19:35:43 +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