Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-11 20:57:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,031 Commits 9 Branches 38 Tags
ffdf1f746e903ebff926c8c7e3314ff651295423
Commit Graph

1234 Commits

Author SHA1 Message Date
Trial97
14b653e08d remove some unused files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-12 20:16:00 +02:00
TheKodeToad
e1896d5b6b Update launcher/ui/pages/global/MinecraftPage.h 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 13:45:49 +00:00
TheKodeToad
6e3dd04a1f Update launcher/ui/pages/global/MinecraftPage.h 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 12:09:32 +00:00
TheKodeToad
f7a401ab22 Update launcher/ui/pages/instance/InstanceSettingsPage.h 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 12:09:26 +00:00
TheKodeToad
9ed6801b15 Update launcher/ui/pages/global/JavaPage.h 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 12:09:12 +00:00
TheKodeToad
5a76d9b7e1 Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 10:58:06 +00:00
TheKodeToad
cc504f4a6c Merge remote-tracking branch 'upstream/develop' into unify-mc-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 17:02:50 +00:00
TheKodeToad
a92c68adbd Remove duplicate console section 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 16:54:45 +00:00
TheKodeToad
81769b9047 Use MinecraftInstancePtr instance of InstancePtr 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 14:34:07 +00:00
TheKodeToad
98ab686348 Merge remote-tracking branch 'upstream/develop' into unify-mc-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 13:18:19 +00:00
TheKodeToad
1b4b36df33 Unify Java page 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-26 22:25:26 +00:00
seth
1cce582d56 Merge pull request #3292 from Trial97/fix_modrinth_link 
fix modrinth link
 2025-01-16 20:42:00 -05:00
Trial97
3ee73916ca fix modrinth link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-13 08:16:12 +02:00
Alexandru Ionut Tripon
f4f1d5f0d7 Merge pull request #3228 from Trial97/delete_block 
Add settings to control the if prism should move the downloaded mods
 2025-01-09 00:12:12 +02:00
Alexandru Ionut Tripon
fbd886e9db Merge pull request #3255 from Trial97/propagate_load 
propagate load component error
 2025-01-09 00:11:48 +02:00
Trial97
d40c8b704c fix drop file on resource page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-08 01:52:11 +02:00
Trial97
6ebfcb91cf propagate load component error 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-31 13:44:22 +02:00
Trial97
7dde35fef2 Add settings to control the if prism should move the downloaded mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-20 19:57:09 +02:00
Kenneth Chew
c3712ba648 Fix tab order in launcher settings 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-12-12 14:53:39 -05:00
Trial97
a09af619ce Make FTB Import note italic to match others 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-24 20:29:07 +02:00
TheKodeToad
48235f5b71 Merge pull request #3083 from Trial97/fix_resource_search 
Fix resource search
 2024-11-15 23:09:28 +00:00
timoreo
736ecf266d Merge pull request #3019 from Trial97/task_parent 
fixed double deletion for tasks
 2024-11-15 06:19:40 +01:00
timoreo
54f2e75b9d Merge pull request #3070 from TheKodeToad/general-scrollbar 
Add scrollbar to Settings -> Launcher -> Features
 2024-11-15 06:16:54 +01:00
Trial97
172e43cd3f Fix warnings regarding Resource static cast 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-13 23:11:33 +02:00
Trial97
66883db645 Fix removed signal handler for filter resource 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-09 23:30:04 +02:00
TheKodeToad
71e55f8829 Add scrollbar to Settings -> Launcher -> Features 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-07 00:11:27 +00:00
TheKodeToad
e6d4e5d78d Unify instance and global settings pt.1 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-06 23:46:30 +00:00
Trial97
2b590f24ed remove task parent from constuctor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-01 00:11:45 +02:00
Trial97
0e80aae1b8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into lambda 2024-10-30 19:35:25 +02:00
TheKodeToad
c142d38f08 Merge pull request #1588 from TheKodeToad/resource-meta 
Implement tracking and updates for files other than mods
 2024-10-30 17:03:54 +00:00
Trial97
82bffabb69 do not capture by default all values in lambdas 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-30 18:16:43 +02:00
TheKodeToad
2368521a9a Add missing semicolon 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-29 17:54:03 +00:00
TheKodeToad
d49e6187cd Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-29 17:17:51 +00:00
Alexandru Ionut Tripon
51b7abec24 Merge pull request #3005 from Trial97/installed 
add installed text to version select
 2024-10-28 22:55:40 +02:00
Alexandru Ionut Tripon
d90ed89a30 Merge pull request #2989 from Trial97/what 
add extra protection against empty download link
 2024-10-28 22:55:21 +02:00
Alexandru Ionut Tripon
2dee936246 Merge pull request #2837 from Trial97/translate_standeard_butons 
translate standard buttons
 2024-10-28 22:31:47 +02:00
Trial97
94f65f8727 add qassert 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-28 22:27:40 +02:00
TheKodeToad
2b22a1aebe Reimplement View Homepage 
I removed it for some reason, but now it's back for all pages!

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 20:14:56 +00:00
Trial97
9cdda4377b remove message box 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-28 19:19:06 +02:00
TheKodeToad
49044e23de Fix Export List placement 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 16:21:00 +00:00
TheKodeToad
f57ca1e79e Add Change Version action to all pages 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 16:07:41 +00:00
Trial97
0f42f3cc5c Added warning regarding maximized option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-28 17:19:18 +02:00
Trial97
bd82737efb translate standard buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-28 15:46:47 +02:00
Alexandru Ionut Tripon
d4bf61da50 Merge pull request #3007 from Trial97/open_source 
add open source filter
 2024-10-28 15:04:33 +02:00
Trial97
0cafac84ac replace currentData with itemData on QComboBox::currentIndexChanged slots 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-28 12:54:21 +02:00
Trial97
61448a61ea swap search with filter button for modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-27 12:06:45 +02:00
Trial97
935b2e8fb2 add open source filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-27 11:56:48 +02:00
Trial97
b1c8ab9350 add installed text to version select 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-27 10:56:14 +02:00
Trial97
b593ff09e9 fix #3001 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-27 03:05:56 +02:00
Trial97
44894a29b1 rename snake_case to camelCase 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-27 03:05:30 +02:00