CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,571 Commits 10 Branches 30 Tags
f9ebcb5d2ec6e0df15017fef06d753873ad73bb4
Commit Graph

6571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
6fc745e98c Merge branch 'catpacks' of github.com:Trial97/PrismLauncher into catpacks 2023-07-02 13:34:41 +03:00
Trial97
7579fff532 Added more options for variants planing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 13:34:04 +03:00
Trial97
7ac2a23bc8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 2023-07-02 13:14:19 +03:00
Trial97
6c4cf085e0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 12:50:45 +03:00
Sefa Eyeoglu
b51f1f1d41 Merge pull request #1298 from TurboWafflz/develop 2023-07-02 09:52:59 +02:00
Finian Wright
3fe518ff2b Fix compiling on OpenBSD 
Signed-off-by: Finian Wright <turbowafflz@gmail.com>
 2023-07-02 00:36:21 -04:00
seth
c523765c19 Merge pull request #1292 from Trial97/export5 
Removed logs from instance export
 2023-07-01 04:14:35 +00:00
Trial97
18e628e873 removed extra condition 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-30 12:10:00 +03:00
Trial97
81207c6502 Made sure the logs are ignored when collecting files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-30 10:52:10 +03:00
Trial97
87efa700ab Removed logs from instance export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-30 00:01:36 +03:00
Trial97
25ffc4c4b0 Refactor ImgurUpload 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-29 17:58:09 +03:00
Tayou
8211befc29 removed magic 5, removed unnecessary QPainter function calls 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 23:24:57 +02:00
Tayou
1dc7f80034 4 clang-tidy changes, update copyright info 
while already at it I updated all my emails to use one from my domain
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 23:08:04 +02:00
Tayou
534d156b12 format VisualGroup.cpp file 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 20:06:17 +02:00
Tayou
54d88e4dbf use QString.isEmpty() 
oops
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 20:05:28 +02:00
Trial97
1c3402d081 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 2023-06-28 20:23:35 +03:00
Tayou
6b3b119db0 give ungrouped instances a group header 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 18:50:44 +02:00
Tayou
66461ac500 some positioning adjustments, deleted the line 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 18:42:49 +02:00
Tayou
7033e28572 update instance group header to more modern style 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 18:00:40 +02:00
Trial97
0008b22d8b Renamed function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-28 18:41:47 +03:00
Trial97
8f9bd9617f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into scale_cat 2023-06-28 18:29:04 +03:00
Trial97
0f64ee6a5f Added warnings for running instances 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-28 18:28:25 +03:00
Trial97
c23bf2fd22 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings 2023-06-28 17:46:01 +03:00
Sefa Eyeoglu
faec21d572 Merge pull request #1266 from TheKodeToad/smol-tweaks 2023-06-28 08:47:53 +02:00
seth
213f03351f Merge pull request #1280 from Trial97/shortcut 
Fixed illegal characters in shortcuts name
 2023-06-27 20:01:48 +00:00
Rachel Powers
00be211169 Update launcher/FileSystem.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-27 13:01:28 -07:00
seth
90fc720190 Merge pull request #1281 from Trial97/screenshot 
Added more information to the screenshot upload warning
 2023-06-27 20:01:18 +00:00
Rachel Powers
23b3711f96 fix(filesystem): track failed copies and clones 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-27 12:41:36 -07:00
Rachel Powers
6aa30d334c Merge pull request #1 from Trial97/refactor/net-split-headers-to-proxy-class 
Simplify Upload and Download
 2023-06-27 12:08:41 -07:00
Trial97
54cb077b40 Added more information to the screenshot upload warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 19:31:36 +03:00
Trial97
92847b9774 omit icon remove on macos 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 19:15:20 +03:00
Trial97
6e5716f097 Fixed illegal characters in shortcuts name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 19:05:32 +03:00
Trial97
45c39d078f More clenup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 09:23:24 +03:00
Trial97
385babb458 Simplify Upload and Download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 08:51:17 +03:00
TheKodeToad
904b128afe Merge pull request #1277 from Trial97/remove_mojang 
Removed unused files
 2023-06-26 23:09:27 +01:00
Trial97
dffffc784e Removed unused files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-26 22:33:10 +03:00
Sefa Eyeoglu
40fb387185 fix(actions): set all build platforms to official 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 11:58:47 +02:00
Sefa Eyeoglu
63acf0a7b4 fix: set default platform to "unknown" 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 11:55:48 +02:00
Sefa Eyeoglu
fce000206f feat: print build platform in application log 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 11:55:23 +02:00
Sefa Eyeoglu
f5e4171df4 feat: print build platform in log 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 11:54:22 +02:00
Sefa Eyeoglu
0aaec9ae4f chore: remove obsolete macOS warning 
We don't support that macOS version. This check also never worked, as we
never set the platform to that value.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 11:53:48 +02:00
Sefa Eyeoglu
d25452a64e Merge pull request #1274 from TheKodeToad/java-signature 2023-06-26 11:19:53 +02:00
Sefa Eyeoglu
41d0f74750 Merge pull request #1275 from Scrumplex/git-blame-ignore 2023-06-26 10:56:26 +02:00
Alexandru Ionut Tripon
22bb260ae3 Update launcher/ui/dialogs/ExportToModListDialog.cpp 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-06-26 11:45:26 +03:00
Alexandru Ionut Tripon
d82ae31fc1 Update launcher/ui/dialogs/ExportToModListDialog.cpp 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-06-26 11:45:05 +03:00
Alexandru Ionut Tripon
cf5c01a5b1 Update launcher/ui/dialogs/ExportToModListDialog.cpp 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-06-26 11:44:55 +03:00
Alexandru Ionut Tripon
f2015eee80 Update launcher/ui/MainWindow.ui 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-06-26 11:44:47 +03:00
Sefa Eyeoglu
f8f1c3cf23 chore: add Git Blame ignore file 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 09:08:03 +02:00
Sefa Eyeoglu
ed4dce2fb6 fix: install logo to multimc theme in genicons.sh 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 08:59:48 +02:00
Sefa Eyeoglu
4d49486cc9 Merge pull request #1065 from leo78913/gamescope-close-button 2023-06-26 08:45:28 +02:00