Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-01 07:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,912 Commits 10 Branches 38 Tags
Commit Graph

341 Commits

Author SHA1 Message Date
TheKodeToad
06b50dfd33
Fix more header mistakes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 11:11:45 +00:00
TheKodeToad
5a76d9b7e1
Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 10:58:06 +00:00
TheKodeToad
5d179671bf
Fix non-Linux build 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 18:55:24 +00:00
TheKodeToad
dc6f536843
Fix Qt 5 compilation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 18:04:41 +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
7aaa9fa93c
Finish off MinecraftSettingsWidget implementation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 16:46:26 +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
147b315c14
Update thresholds when min. memory value is changed too 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 14:15:07 +00:00
TheKodeToad
9d0918a064
Remove outdated JavaWizardWidget comment 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 13:19:10 +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
39ae2fbd4a
Fix tab inconsistencies 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-26 22:44:43 +00:00
TheKodeToad
36a35d7925
Fix tab order 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-26 22:36:48 +00:00
TheKodeToad
1b4b36df33
Unify Java page 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-26 22:25:26 +00:00
Jeffery Tolmie
caccaefb39
Change "none" to "" 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: Jeffery Tolmie <jeffery.tolmie@gmail.com>
 2025-01-22 02:06:49 +13:00
eff3ry
532fec7748 DCO Remediation Commit 
DCO Remediation Commit for eff3ry <jeffery.tolmie@gmail.com>

I, eff3ry <jeffery.tolmie@gmail.com>, hereby add my Signed-off-by to this commit: 2a403b3bfe9f4c79c38c33e80515a232576f6018
I, eff3ry <jeffery.tolmie@gmail.com>, hereby add my Signed-off-by to this commit: 4ba3fd559d2664099524848825adb6f5a60650ab

Signed-off-by: eff3ry <jeffery.tolmie@gmail.com>
 2025-01-22 01:48:04 +13:00
eff3ry
4ba3fd559d Update Filter Checks 
Updates the filter checks so that options both and none can be differentiated.

Signed-off-by: Jeffery Tolmie Jeffery.tolmie@gmail.com
 2025-01-22 01:40:59 +13:00
Alexandru Ionut Tripon
f17599c8b8
Merge pull request #1689 from Trial97/progrss_bar_interaction 
Added mouse interactions for labels in ProgressDialog
 2025-01-17 20:59:52 +02:00
Trial97
0f9ea5c949
remove drop label 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-08 01:55:45 +02:00
TheKodeToad
012bbca197
JavaSettingsWidget -> JavaWizardWidget 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-07 14:51:43 +00:00
TheKodeToad
8132828ad7
Phrasing fix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-07 13:36:33 +00:00
TheKodeToad
e06b3e7a7a
Implement open global settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-07 00:47:32 +00:00
TheKodeToad
223b6b3b2b
Fix non-Linux build 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-07 00:22:22 +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
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
TheKodeToad
bd8b30c606
Implement link for InfoFrame::updateWithResource 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 22:17:16 +00: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
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
08f5148a9a
Added mouse interactions for labels in ProgressDialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-28 16:22:52 +02:00
Trial97
f75e049675
add release_type filer for mod/modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-28 15:36:47 +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
Alexandru Ionut Tripon
6338e2b362
Update launcher/ui/widgets/ModFilterWidget.ui 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-10-28 00:34:41 +02:00
Trial97
935b2e8fb2
add open source filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-27 11:56:48 +02:00
Mia Moir
3a1c06de02
fix: Tab order on custom command inputs 
The tab order on the custom command UI in the instance settings is off, it goes 0 -> 2 -> 1, This re-orders the ui file to fix the order the inputs are in.

Signed-off-by: Mia Moir <63592337+archessmn@users.noreply.github.com>
 2024-10-12 23:47:58 +01:00
Trial97
5bd5627a96
extended the modrinth search and applied the suggested change 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-08 15:06:50 +03:00
Trial97
6e5f616ced
move checkMcVersions to Filter struct 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-07 00:21:28 +03:00
Trial97
dfe3cd849d
add curseforge modpack filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-02 01:06:45 +03:00
Trial97
c85294af9d
Improve wizzard page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 19:33:24 +03:00
Trial97
034e2a44ad
update thresholds each time java result changes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-26 17:43:49 +03:00
Trial97
d55ebefac3
fix java 64 bit condition 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-25 21:42:40 +03:00
Trial97
92495494ca
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-23 08:16:59 +03:00
Trial97
26ae608685
fix initial java dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-21 15:01:42 +03:00
Trial97
002fc71b8d
allways load java list on autodetect 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-20 01:18:37 +03:00
Trial97
4d24213aa3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-08-20 00:02:14 +03:00
Trial97
38b5ee198a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-08-18 22:39:46 +03:00
Trial97
b5bbe93775 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-17 00:20:40 +03:00
Trial97
a9c7e95c66
fix widebar action removal 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-08 19:39:32 +03:00
Trial97
c9809fff6d
add setting for quickplay singleplayer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-08 16:53:26 +03:00
Trial97
0ac62f9ddf
Recommend java major 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-23 01:41:41 +03:00
Trial97
29a6db171f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-22 08:57:31 +03:00