CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,264 Commits 10 Branches 30 Tags 34 MiB
1b2654bfa6
Commit Graph

7264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tayou
66461ac500
some positioning adjustments, deleted the line 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 18:42:49 +02:00
Rachel Powers
46e840fdf1
fix: add thread sleep to wait for resources - add detail text from logs 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-28 09:18:07 -07: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
Trial97
3ad559ab22
Added version type to review message dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-28 17:43:09 +03:00
Trial97
5f1074471d
Corected variable name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-28 13:35:42 +03:00
Trial97
c04cee7ff7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-28 13:21:00 +03:00
Rachel Powers
4123343130
no need for pre release tag 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-28 00:25:09 -07:00
Sefa Eyeoglu
faec21d572
Merge pull request #1266 from TheKodeToad/smol-tweaks 2023-06-28 08:47:53 +02:00
Rachel Powers
cb35fb8d0e
add optional pre-release tag 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-27 20:37:42 -07: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
Rachel Powers
6f7454243e
fix: prep for changes in #1276 
- sign updater

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-26 23:25:07 -07: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
Rachel Powers
c0f0462550
fix(updater): logs/ folder 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-26 01:41:51 -07:00
Rachel Powers
1f70589deb
feat(updater): tie in part 2, let there be UI! 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-26 01:22:33 -07: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
Rachel Powers
b7dd32274c
Proper capture on windows 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 22:30:20 -07:00
Rachel Powers
d8e0b14dc4
feat(updater): tie in updater part 1 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 21:37:47 -07:00
TheKodeToad
8bebd7f042 Generate special signature ✨ composed of multiple elements instead of relying on timestamp for Java version cache invalidation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-26 01:30:47 +01:00
Rachel Powers
90da57a806
Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/launcher-updater 2023-06-25 16:13:51 -07:00
Rachel Powers
b142407b21
fix: ensure finished signal is emited 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 16:13:26 -07:00
Rachel Powers
10266f65e4
fix: include ^<optional^> updater doesn't need to know about mods 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 16:10:06 -07:00
seth
c49ee87857
fix(net): fix emit signals in download & upload task 
Signed-off-by: seth <getchoo@tuta.io>
 2023-06-25 18:56:54 -04:00
Rachel Powers
5b04a17730
Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/launcher-updater 2023-06-25 14:43:45 -07:00