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

1227 Commits

Author SHA1 Message Date
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
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
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
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
4d49486cc9 Merge pull request #1065 from leo78913/gamescope-close-button 2023-06-26 08:45:28 +02:00
Trial97
6d0e255ca1 fix: Page container extra info set on logs page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 22:00:33 +03:00
Leo
953a2590e2 Add fixme comment for no SSD detection 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Leo <leo3758@riseup.net>
 2023-06-25 10:11:58 -03:00
Trial97
3546f57a42 Use internal markdown implementation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 15:17:09 +03:00
Trial97
8d3bc6b6b9 Added markdown QT version check 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 14:58:54 +03:00
TheKodeToad
c75ba0f855 Fix big mistake :iea: 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 12:46:07 +01:00
Trial97
84c63f4f01 Added plantxt export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 14:11:41 +03:00
TheKodeToad
603ed22015 Replace accidental usages of QAbstractButton::pressed 
This signal is not usually what you want, and creates an inconsistent experience.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 10:36:54 +01:00
Trial97
ef0752972a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export 2023-06-25 12:26:54 +03:00
Trial97
fd5b155ee7 Added error message when exporting snapshots with curseforge 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 12:24:59 +03:00
Trial97
40fbae8ff6 Fixed links tooltip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 11:36:37 +03:00
Trial97
ce4a86fbcd Made custom url function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 10:41:29 +03:00
Trial97
54d7477679 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page 2023-06-25 10:12:29 +03:00
TheKodeToad
5eb71fc6a9 Revert "feat(Mods): hide 'Provider' column when no mods have providers" 
With Ryex's change, this causes issues. Apparently you need to sign off reverts! That's just weird...

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:36:32 +01:00
TheKodeToad
8a3aba1634 Fix Open Global Settings, why not 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:30:51 +01:00
TheKodeToad
529e2054ea A few tweaks, with inspiration from Zeke :3 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:26:27 +01:00
Trial97
932531c8ba fixed authors 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 23:48:18 +03:00
Trial97
69c21454ec removed projectID 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 22:15:18 +03:00
Trial97
81c1a95166 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-24 20:04:56 +03:00
Trial97
7fdd68d768 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-24 15:58:55 +03:00
Trial97
4a84084d9d Added condition for modlist 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 15:02:00 +03:00
Trial97
25579fbedc Renamed ExportMrPackDialog to ExportPackDialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 14:54:39 +03:00
Trial97
30ef5475c7 Made sure CurseForge string is corect 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 14:50:05 +03:00
Trial97
cd1e8dc8cc Removed modlist checkbox 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 11:12:23 +03:00
Trial97
377707d3db Merge branch 'curse' of github.com:Trial97/PrismLauncher into curse 2023-06-24 11:02:40 +03:00
Trial97
7ebc8c48a8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-24 11:02:13 +03:00
Alexandru Ionut Tripon
42bc04a0d2 Update launcher/ui/MainWindow.cpp 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-06-24 11:01:23 +03:00
Rachel Powers
4322222acc Merge pull request #1255 from Trial97/export4 
Added Thumbs.db to excluded files in MrPackExport
 2023-06-23 21:40:55 -07:00
Trial97
cf94adb363 Added some warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 01:05:49 +03:00
TheKodeToad
d74a23d5b2 Update developers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-23 21:00:55 +01:00
Trial97
69c709b05a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 20:01:17 +03:00
Trial97
cb2671a02c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-23 19:35:47 +03:00
Trial97
0a56631831 Added curseforge search 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 19:35:41 +03:00
Trial97
90df092174 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-23 17:29:58 +03:00
Trial97
85bbab0e92 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-23 14:38:30 +03:00