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

5877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
e4449a0ba3
Initialized variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-03 09:09:07 +03:00
Trial97
42dc3ed03f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert 2023-05-03 00:56:26 +03:00
Trial97
f6ed2036b3
Removed comment 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-03 00:55:18 +03:00
Trial97
f8bf71e152
Moved the selected resources to one list 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-03 00:49:54 +03:00
Sefa Eyeoglu
64ba5e4ed1
Merge pull request #833 from Ryex/advanced_copy_instance 2023-05-02 12:11:41 +02:00
Rachel Powers
d80dee2a54 refactor: pass instance ptr to resource models. use it to find instance root. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-29 19:55:37 -07:00
Rachel Powers
788fa40c2a refactor: Move ini to use QSettings && drop get/setList functions 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-29 19:55:24 -07:00
Sefa Eyeoglu
ae75585b52
Merge pull request #1040 from Scrumplex/remove-modpacksch 
Remove FTB modpack support
 2023-04-29 08:04:53 +02:00
Sefa Eyeoglu
ff07714e8c
chore: remove FTB modpack support 
We have been contacted by Feed the Beast to drop support for the FTB
modpack browser from Prism Launcher.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-04-28 11:35:20 +02:00
Sefa Eyeoglu
f54fc16718
Merge pull request #1025 from japa4551/lastLaunchTimeDate 2023-04-27 10:09:53 +02:00
Trial97
61a2355618
Removed formated but not used files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-27 01:41:26 +03:00
Trial97
248920a221
Removed extra code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-27 01:33:46 +03:00
Japa
7298f9c273
Fixed typo 
Signed-off-by: Japa <japa4551@protonmail.com>
 2023-04-26 16:06:17 -03:00
Trial97
f738d7566e
Fixed code qulity 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 22:27:33 +03:00
Japa
672f5cf160
Update launcher/minecraft/MinecraftInstance.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Japa <japa4551@protonmail.com>
 2023-04-21 19:46:33 -03:00
Trial97
460e83207f
Fixed removeIf for Qt version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 01:18:27 +03:00
Trial97
75116364c6
Small Cleanup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 00:55:11 +03:00
Trial97
f7931c2ee2
Better version handling 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 00:47:51 +03:00
Trial97
10aac4fe17
Fixed assert 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 21:03:01 +03:00
Japa
92cda68480
Update launcher/minecraft/MinecraftInstance.cpp 
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Signed-off-by: Japa <japa4551@protonmail.com>
 2023-04-21 11:18:17 -03:00
Japa
f41426f394
Instance Description displays the last launch date 
Initial Draft using the Standard C++ Library, still requires testing.

Signed-off-by: Japa <japa4551@protonmail.com>
 2023-04-21 00:30:38 -03:00
DioEgizio
8dc3267925
Merge pull request #994 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x 2023-04-18 18:54:11 +02:00
Sefa Eyeoglu
1b05303250
Merge pull request #946 from Ryex/subfolder-watch 2023-04-14 17:10:25 +02:00
renovate[bot]
51095c5a27
chore(deps): update hendrikmuhs/ccache-action action to v1.2.9 2023-04-14 06:31:06 +00:00
Rachel Powers
a02f67ed0e refactor: rename watch_subdirectories -> watch_recurisve (prevent confusion of behavior) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-12 11:30:02 -07:00
DioEgizio
95842ee25f
Merge pull request #983 from DioEgizio/update-qt650-win 2023-04-08 22:14:26 +02:00
DioEgizio
371c839573 chore: update Qt to 6.5.0 on Windows 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-04-08 19:38:46 +02:00
DioEgizio
1b8b044b52
Merge pull request #982 from Scrumplex/fix-theming-style 2023-04-08 19:26:43 +02:00
Sefa Eyeoglu
a988111507
fix: do not apply system theme on launch 
Closes PrismLauncher/PrismLauncher#490

Regression introduced by PrismLauncher/PrismLauncher#249

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-04-08 18:48:05 +02:00
Rachel Powers
c56db0408b fix: load setting state with page. don't translate "..." 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-08 07:26:56 -07:00
Rachel Powers
2321d9c065 fix: canonical*File*Path() 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-07 18:36:35 -07:00
flow
ed085630db
Merge pull request #968 from Scrumplex/nix/sync-2023-04-02 2023-04-07 06:51:14 -07:00
flow
74d5c7c1a4
Merge pull request #972 from DioEgizio/update-qt650 2023-04-07 06:50:02 -07:00
Rachel Powers
0ce3049579 fix: sysinfo libs needed too 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 18:48:28 -07:00
Rachel Powers
de20258aa7 fix: filelink needs network for local socket 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 18:30:28 -07:00
Rachel Powers
41c5e523b2 fix: add back QT::Widgets link 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 18:09:01 -07:00
Rachel Powers
197be9cfd0 fix: remove fixed datastream version 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 18:00:56 -07:00
Rachel Powers
5b50b806ec refactor: remove data duplication in statis FS Names 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 17:14:06 -07:00
Rachel Powers
62c59820cf fix: harden watchPath. NO DUPLICATES! >:( 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 15:26:26 -07:00
DioEgizio
0cf1fc72a3 chore: update to qt 6.5.0 on macos 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-04-03 18:01:23 +02:00
Rachel Powers
5ce7874280 fix: no loops in watch paths! >:( 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-02 18:55:21 -07:00
Rachel Powers
ba2b5c3a65
fix: Apply suggestions from code review 
-expand columspan on new UI element
-improve tooltip

Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-02 16:39:13 -07:00
Sefa Eyeoglu
0a9081cb87
Merge pull request #965 from getchoo/update-manoghud-detection 2023-04-02 17:55:19 +02:00
flow
eea1e3b800
Merge pull request #967 from PrismLauncher/renovate/flatpak-flatpak-github-actions-6.x 2023-04-02 08:03:02 -07:00
Sefa Eyeoglu
70364884a9
feat(nix): add support for GameMode 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-04-02 11:35:35 +02:00
Sefa Eyeoglu
ea7f03770c
refactor(nix): use qtWrapperArgs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-04-02 11:33:04 +02:00
txtsd
bc1a7d2890
Merge pull request #966 from getchoo/use-ninja 
use ninja in nix builds
 2023-04-02 14:06:35 +05:30
renovate[bot]
732bc53692
chore(deps): update flatpak/flatpak-github-actions action to v6 2023-04-02 03:14:42 +00:00
seth
4055e34320
chore: use system architecture to detect vulkan layers 
Signed-off-by: seth <getchoo@tuta.io>
 2023-04-01 13:09:09 -04:00
seth
81b1406290
feat(nix): use ninja for builds 
Signed-off-by: seth <getchoo@tuta.io>
 2023-04-01 13:06:53 -04:00