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

2715 Commits

Author SHA1 Message Date
Rachel Powers
5740ee0444
fix(windows console): properly bind windows console 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 13:38:47 -07:00
Sefa Eyeoglu
566425166b
Merge pull request #1449 from Trial97/tehnic 
Reintroduce parsing of INI files
 2023-07-30 09:47:40 +02:00
Ash
d133b40b25
Merge branch 'PrismLauncher:develop' into develop 2023-07-28 21:22:35 +00:00
Trial97
c3eb17db74
removed unneded if condition 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 13:22:04 +03:00
Trial97
4789708cc2
added missing ) 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 13:16:57 +03:00
Alexandru Ionut Tripon
83fce74bb1
Update launcher/ui/dialogs/NewInstanceDialog.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-28 13:11:56 +03:00
Trial97
fcac98b367
removed comment 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 10:05:22 +03:00
Trial97
97ff7afbe7
keep the icon suffix 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 08:37:45 +03:00
Trial97
7e58b965b7
refactor icon list 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 01:20:05 +03:00
Trial97
1ca7e5efe9
added license header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 01:20:05 +03:00
Trial97
d460986de0
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 01:20:05 +03:00
Sefa Eyeoglu
bdec11c501
Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2 2023-07-27 09:40:31 +02:00
Sefa Eyeoglu
b1aa9e5846
refactor: introduce internal Launcher_ENABLE_UPDATER variable 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-27 09:37:56 +02:00
seth
51bfda937d
chore: don't include sparkle when not enabled 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-27 02:19:21 -04:00
LostLuma
4a9ea832ff
Ignore cache files entirely, also apply to modpack export 
Signed-off-by: LostLuma <lilly@lostluma.net>
 2023-07-27 01:42:14 +02:00
seth
48e5040196
feat: disable sparkle when update url is empty 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 19:01:39 -04:00
Trial97
62aa7a52c4
fiexed conflicts 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-27 00:07:38 +03:00
Trial97
3c472fd7e0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2 2023-07-27 00:05:59 +03:00
Trial97
1e82cb6a7c
fix: add support for QByteArray inifile 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-26 23:56:01 +03:00
Alexandru Ionut Tripon
31b62203a7
Update launcher/ui/MainWindow.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-26 23:44:35 +03:00
seth
af59c41713
fix: typo in task.h 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 16:20:30 -04:00
Trial97
e6b4fc9182
removed quilt warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-26 21:36:40 +03:00
TheKodeToad
719d87de3b
Update MainWindow.ui 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-26 17:21:12 +01:00
TheKodeToad
816acc9c76 Open catpak folder action 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-26 17:19:39 +01:00
LostLuma
a9fefb2eeb
Address review comments 
Signed-off-by: LostLuma <lilly@lostluma.net>
 2023-07-26 15:22:22 +02:00
TheKodeToad
ce2d2c9f32
Merge pull request #1427 from tjw123hh/develop 
Add some missing strings to translations
 2023-07-26 13:41:54 +01:00
LostLuma
361583edfc
Ignore cache files when exporting instances 
Signed-off-by: LostLuma <lilly@lostluma.net>
 2023-07-26 04:23:01 +02:00
tjw123hh
280f041acb Delete some incorrect notr="true" tags 
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
 2023-07-25 17:35:31 +08:00
Sefa Eyeoglu
4f00012268
Merge pull request #1426 from TheKodeToad/token-censor-fix 2023-07-24 20:41:23 +02:00
TheKodeToad
f505d43fc0 Fix token "0" being replaced 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-24 13:43:26 +01:00
tjw123hh
6a01c277e8 Delete some incorrect tags 2023-07-24 20:41:22 +08:00
TheKodeToad
57430fd189
Merge branch 'develop' into better-launch 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-22 11:26:02 +01:00
TheKodeToad
6ffcfcd7e9
Merge pull request #1402 from Trial97/flame_import 
feat:made flame instace creation use metadata for recommended version
 2023-07-22 11:14:12 +01:00
TheKodeToad
516ddb22ae More catpack changes :3 
This is just embarrasing

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-22 11:05:58 +01:00
Trial97
0b74b3833a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import 2023-07-21 19:30:06 +03:00
Trial97
ef21879df4
replaced require with ensure for jvmArgs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-21 19:30:00 +03:00
TheKodeToad
1a7c5693cc Remove redundant methods 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-21 13:01:01 +01:00
TheKodeToad
f8b935ab37 Merge remote-tracking branch 'upstream/develop' into icon-indexing 2023-07-21 12:48:05 +01:00
TheKodeToad
8705e88e91
Fix build on Windows 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-21 11:19:55 +01:00
TheKodeToad
0be4db30eb
Merge branch 'PrismLauncher:develop' into better-component-installation 2023-07-21 11:02:57 +01:00
TheKodeToad
5088d33fd2 Finish things :P 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-20 14:17:01 +01:00
TheKodeToad
39f7bea53e
Revert accidental change in MainWindow 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-20 14:13:29 +01:00
TheKodeToad
842f08dcfc (UX) Add open folder button next to combo boxes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-20 11:54:15 +01:00
Trial97
f8d9cd9a03
use range for 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-19 23:08:16 +03:00
TheKodeToad
960093700a Better theme reset 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-19 20:57:08 +01:00
TheKodeToad
54d393632d Automatically create theme folders, and add an action to open them 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-19 16:29:52 +01:00
TheKodeToad
c633c6d083 Colors->Widgets 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-19 14:19:28 +01:00
TheKodeToad
96ebdfc9a8 Sorting and invalid reset 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-19 14:12:39 +01:00
TheKodeToad
f55120654a
Merge branch 'PrismLauncher:develop' into icon-indexing 2023-07-19 12:51:26 +01:00
TheKodeToad
44ca7c7d22 Licenses 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-19 12:29:51 +01:00