3293 Commits

Author SHA1 Message Date
Trial97
8897f16d1d
simplify microsoft login
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-07 10:52:52 +02:00
Trial97
c78d35d699
added additional minecraft java path for windows
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-07 10:20:53 +02:00
Trial97
5d5adbd7da
add update menu conditionaly
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-07 09:48:07 +02:00
Trial97
6506e93e4a
Removed some buttons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-07 09:44:27 +02:00
Trial97
011e87b421
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-06 23:38:14 +02:00
TheKodeToad
baa988ec81
Merge pull request #1739 from Trial97/mod_icons
fixed squished mod icons
2023-11-06 20:49:05 +00:00
Alexandru Ionut Tripon
8eac0d34bd
Merge pull request #1796 from Trial97/dep_global_toggle
Added Global Dependenicies toggle
2023-11-06 20:48:51 +00:00
Alexandru Ionut Tripon
0b1dcb3ea7
Merge pull request #1760 from LocalSpook/sorting
Localize sorting options for resource and shader packs
2023-11-06 20:45:52 +00:00
Alexandru Ionut Tripon
3d529b0c3e
Merge pull request #1772 from Trial97/pixmap_crash
Fix crash with mod icon caching
2023-11-06 20:44:27 +00:00
Trial97
ca226d2ab5
Fixed comparation warning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-06 11:24:19 +02:00
Trial97
670e91cb60
Increased the step to around 10MB
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-06 11:08:18 +02:00
Trial97
cc291219f9
apply suggested changes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-06 10:51:34 +02:00
Sefa Eyeoglu
0eda2447dc
Merge pull request #1797 from Trial97/fix_mangohub
[Linux] Fix loading MangoHud
2023-11-06 08:14:55 +01:00
Trial97
867e6223ce
Fixed mangoHub loading
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-05 23:48:26 +02:00
Alexandru Ionut Tripon
3e7f9083ca
Update launcher/ui/pages/instance/ModFolderPage.cpp
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-11-05 23:41:54 +02:00
TheKodeToad
bd9d5e0990
Reword
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-11-05 20:31:48 +00:00
Trial97
9a8667e99c
Added Global Dependenicies toggle
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-05 22:22:49 +02:00
Trial97
710a48fcaf
changed type form double long to long long
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-05 21:41:10 +02:00
Edgars Cīrulis
d2a85cb580 visual: Fix spacing.
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
2023-11-05 17:43:12 +00:00
Alex
cf4144cb50 Fixed link to Fulmine's website
Signed-off-by: Alex <akim8@emich.edu>
2023-11-05 00:46:05 -04:00
Trial97
a4978946d5
disabled lax deps
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-04 00:07:51 +02:00
TheKodeToad
b446bdf4a9
Merge pull request #1783 from Trial97/visual_bug
Fixed visual bug with Modlist export
2023-11-03 15:20:57 +00:00
Alexandru Ionut Tripon
1bd69ecbb2
Update launcher/ui/pages/global/AccountListPage.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-11-03 11:42:40 +02:00
Trial97
b18082376d
Fixed visual bug with Modlist export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-03 11:04:13 +02:00
Trial97
127a31ba3a
Added warning for remove account
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-03 10:31:40 +02:00
Trial97
4081c51573
made dependency check more lax
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-02 23:52:12 +02:00
Trial97
220a1de99a
made sure that we do not relay for undefined behavior
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-02 22:41:56 +02:00
Trial97
2349f29be0
jsut a overflow protection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-02 01:26:04 +02:00
Alexandru Ionut Tripon
f8bb1a872a
Merge pull request #1766 from TheKodeToad/groups-fix
Fix group issues
2023-11-01 15:26:41 +00:00
Tayou
86e2f6c58c
Merge pull request #1685 from Trial97/java
Autodetect Java bundled with official launcher
2023-10-31 18:03:41 +01:00
Trial97
2863a691ef
moved refresh out of the loop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-31 08:45:08 +02:00
Alexandru Ionut Tripon
60fd7f0ae6
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-10-31 08:43:26 +02:00
Trial97
7166d68736
fixed account refresh after sleep
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-31 00:45:18 +02:00
Trial97
e42a2404a9
added more microsoft error codes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-30 22:55:23 +02:00
Trial97
1490193402
added button to disable dependencies on the mod review
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-30 22:14:26 +02:00
TheKodeToad
2526275c5e
Better check
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-10-30 09:51:37 +00:00
TheKodeToad
5a54d80c6e
Fix group issues
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-10-30 09:26:38 +00:00
LocalSpook
0de4d8902e Remove top-level const qualifiers in function declarations
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
2023-10-28 22:12:09 -07:00
LocalSpook
54305397e4 Localize sorting options for resource and shader packs
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
2023-10-28 12:50:40 -07:00
Tayou
69c2720872
Merge pull request #1691 from Trial97/no_color
Add no_color env variable
2023-10-28 18:02:53 +02:00
Tayou
df2a92d5f4
Merge pull request #1742 from TayouVR/fix-resourcepack-crash
fix switch/case fallthrough in resource parse tasks
2023-10-28 12:44:40 +02:00
LocalSpook
9d972ccc63 Localize account type in account list
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
2023-10-26 13:32:33 -07:00
Sefa Eyeoglu
3719ea21b0
Merge pull request #1355 from TheKodeToad/env-vars
Custom environment variables
2023-10-26 22:10:26 +02:00
TheKodeToad
bd11b93a0c
Use hidden tab bar like other pages
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-10-26 21:01:24 +01:00
Trial97
12d567a9b8
made env vars behave like the rest of the settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-26 22:51:38 +03:00
Trial97
dba54332fb
fixed some asan stuf
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-26 18:31:52 +03:00
Trial97
04acd27dab
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-10-26 13:45:47 +03:00
txtsd
38d77b58cd
Merge pull request #1748 from LocalSpook/using 2023-10-25 16:08:42 +00:00
Trial97
d4d345ee7d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps 2023-10-24 23:40:36 +03:00
Tayou
a161f5cfe2
Merge pull request #1747 from Trial97/fix_initial_java
fix: java memory not set on initial setup
2023-10-24 19:04:56 +02:00