mirror/PrismLauncher
1
0 Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-09-15 07:34:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,409 Commits 18 Branches 57 Tags
3680a052d0359d4e02668153ca3ac4ed9196fc12
Commit Graph
74 Commits
Author SHA1 Message Date
Trial97 c7cfb6d61f feat(launch): add early-launch command 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-09-10 15:22:51 +03:00
Trial97 857ecfa008 chore(clang-tidy): modernize the code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-08-31 13:15:39 +03:00
Trial97 4993687ee3 fix(instances): reset java override on managed pack switch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-08-31 13:06:26 +03:00
Vishrut Sachan 601101555f Merge remote-tracking branch 'upstream/develop' into feature/global-playtime-counter 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>

# Conflicts:
#	launcher/InstanceList.h
 2026-08-07 10:25:55 +05:30
timoreo 81978aae09 Improve performance of BaseInstance::uuid (#5887) 2026-08-06 09:25:45 +00:00
TheKodeToad 8d2528dc10 Change InstanceList to only contain MinecraftInstance 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2026-08-05 18:47:14 +01:00
TheKodeToad c5cc832155 Improve performance of BaseInstance::uuid 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2026-08-04 23:17:42 +01:00
Vishrut Sachan dac05d1c31 Gate global playtime tracking behind CountGameTime setting 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-08-04 20:05:43 +05:30
Vishrut Sachan 0bfac60ee4 Move playtime counter to separate playtime.cfg file 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-08-04 15:53:34 +05:30
Vishrut Sachan c31a7cd7b3 Add persistent global playtime counter 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-08-03 14:29:20 +05:30
Trial97 62eb9963a1 chore(clang-tidy): fix clang tidy warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-08-01 10:23:28 +03:00
Trial97 7df7c1d344 chore(clang-tidy): fix clang tidy warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-08-01 10:14:48 +03:00
Trial97 8e1059ebf1 refactor ModrinthCreationTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-08-01 09:54:11 +03:00
Octol1ttle b237ae7f00 Add option whether to count instance in total playtime (#5765) 2026-07-28 09:11:13 +00:00
Octol1ttle 20b005da7f Fix instance shortcuts breaking when the instance is renamed (#5816) 2026-07-22 13:17:03 +00:00
Vishrut Sachan aeb01ef054 Use regenerateUuid() in the constructor to avioid duplicating code 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-07-22 16:57:18 +05:30
Octol1ttle ca3b86153d fix existing instance shortcuts not being detected 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2026-07-22 16:24:56 +05:00
Vishrut Sachan 8c85c2f64b Regenerate UUID on instance duplication 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-07-22 16:24:19 +05:30
Vishrut Sachan 78e9067972 Fix instance shortcuts breaking when the instance is renamed 
Signed-off-by: Vishrut Sachan <vishrutsachan2004@gmail.com>
 2026-07-22 12:40:20 +05:30
arch1t3cht c0c862d94e Add option whether to count instance in total playtime 
The use case here is making a copy of your instance as a backup (say,
when migrating to a new modpack version) and wanting to keep the old
copy displayed in Prism. In that case, the old instance can now be
configured to not count towards total playtime. This way, the instance,
including its playtime, can be fully preserved and displayed in Prism,
but the total playtime statistic stays accurate.

Closes #4937.

Signed-off-by: arch1t3cht <arch1t3cht@gmail.com>
 2026-07-08 21:16:48 +02:00
Trial97 0b81260cab update local pack by url 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-01-17 17:30:43 +02:00
Octol1ttle 549405ab2f refactor!!!: migrate from shared pointers 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2026-01-11 21:00:03 +05:00
Yihe Li ef3bf75715 Remove some duplicate code 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-06-05 16:15:29 +08:00
Trial97 8c710fb8de chore: migrate map settings to json string 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-06-02 11:56:03 +03:00
Yihe Li 8965200384 Handle JSON parse error 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-06-02 14:19:31 +08:00
Yihe Li 50fb2db718 Validate JSON parsing results 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-06-02 07:36:53 +08:00
Yihe Li 0a1001ee84 Use QString instead of QByteArray 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-06-02 01:34:24 +08:00
Yihe Li d2ee023788 Switch to JSON-encoded store 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-06-01 16:13:40 +08:00
Yihe Li 7c3a810d3d Implement persistence by storing shortcut in settings 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-06-01 14:16:47 +08:00
Yihe Li d3f337d6ef Delete shortcut when deleting instances 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-06-01 08:13:18 +08:00
Alexandru Ionut Tripon 0d15699b26 change java on modpack update (#3379) 2025-04-29 08:31:59 +03:00
Trial97 c5fd5e6ac1 chore: make all the regexes static const 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-04-28 22:37:29 +03:00
Yihe Li da007d6212 Use CustomMessageBox::selectable 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-03-31 07:14:09 +08:00
Yihe Li 45368fbf2f Get rid of unused includes 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-03-27 08:36:07 +08:00
Yihe Li 294448a01e Filter out invalid chars 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-03-27 06:54:10 +08:00
Yihe Li 8fea37b8b7 Only call on interactive uses 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-03-27 06:53:57 +08:00
Yihe Li 7b511f4c67 Refactor into InstanceDirUpdate.h 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-03-27 05:47:29 +08:00
Yihe Li b550a6c5c4 Revert the radio button changes 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-03-27 05:20:58 +08:00
Yihe Li 7ea5b6173c Refactor updateInstanceRoot() to BaseInstance 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-03-27 04:51:13 +08:00
Trial97 c9471d083b change java on modpack update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-19 09:28:06 +02:00
Trial97 0f42f3cc5c Added warning regarding maximized option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-28 17:19:18 +02:00
Alexandru Ionut Tripon 1fcad8d427 Merge pull request #1886 from Trial97/time4 
Fixed playtime recording
 2024-06-24 23:07:41 +03:00
Trial97 e3af4f9a78 Fixed playtime recording 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-22 20:34:12 +02:00
Trial97 9f39e45b28 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time 2023-11-18 10:45:24 +02:00
Trial97 4e3132e8b2 reseted the setting 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:40:36 +02:00
TheKodeToad cf33927f21 Merge remote-tracking branch 'upstream/develop' into sysprops 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-19 11:28:07 +01:00
Trial97 52c94eb568 reset the setting if is under 0 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-15 16:47:23 +03:00
Trial97 b075711be0 ensured totalTimePlayed is allways greater than 0 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-15 16:03:14 +03:00
TheKodeToad 3e2733d840 Merge branch 'develop' into better-launch 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-16 22:23:38 +01:00
TheKodeToad e2d77f21ba More system properties because yes!! 🎉 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-11 00:02:48 +01:00