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

984 Commits

Author SHA1 Message Date
Kode
f60562c5a2
Merge branch 'develop' into mrpack-export 
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-13 19:07:03 +01:00
TheKodeToad
e1b6020b76 Make some changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-13 18:24:01 +01:00
Rachel Powers
6b6d6a01dc
Merge branch 'develop' into fix/network_and_signals 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-12 01:13:17 -07:00
Rachel Powers
884ac73078 Merge remote-tracking branch 'upstream/develop' into better-tasks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-07 13:21:21 -07:00
Sefa Eyeoglu
ce5bb29c44
Merge pull request #1054 from Ryex/more-lax-block-mods-filename-check 2023-05-06 09:54:59 +02:00
Sefa Eyeoglu
d535f73a58
Merge pull request #950 from DioEgizio/resize-settings 
fix: divide minecraftpage into tabs
 2023-05-06 08:28:46 +02:00
DioEgizio
d38696f411
Update launcher/ui/pages/global/MinecraftPage.ui 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-05-06 07:15:14 +02:00
Rachel Powers
b266068644
Apply suggestions from code review 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 14:07:10 -07:00
Rachel Powers
e0635955df fix: super lax compare 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-04 13:30:39 -07:00
Rachel Powers
5ec4cbf1cb fix add an addtion lax file name match with replaced with + 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-03 20:31:15 -07:00
Sefa Eyeoglu
64ba5e4ed1
Merge pull request #833 from Ryex/advanced_copy_instance 2023-05-02 12:11:41 +02:00
Rachel Powers
236764adf6 refactor: Qt can handle const& in signals and slots 
While most Qt types cna use implicit data sharing
pasing our own structs means copies. const& ensure
it's only copied as needed by Qt.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
0fb6a2836b refactor: propogate only only one StepProgress at a time 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
b6452215c1 feat: add details signal to Task 
feat: add details to mod pack downloading
feat: add logging rule sloading form `ligging.ini at data path root
feat: add `launcher.task` `launcher.task.net` and `launcher.task.net.[down|up]load` logging categories
fix: add new subtask progress to the end of the lay out not the beginning (cuts down on flickering)

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:47:50 -07:00
Rachel Powers
f1028fa66d fix: properly map progress range 
- doument PCRE used for URL compacting

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:47:31 -07:00
Rachel Powers
9d2f0e4dc8 feat: Propogated subtask progress 
Oh boy this is big.

> TaskStepProgress struct is now QMetaObject compatabile and can be sent through signals
> Task now has a method to propogates sub task progress it must be signal bound by each task containing a task wishing to report progress of it's children.
> Downloads report speed
> Tasks now have UUIDS to track them
  - use when reporting
  - use when logging
  - use when storeing them or objects related to them

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:47:20 -07:00
Rachel Powers
f997529cd4 feat: better task tracking 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:45:34 -07: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
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
Rachel Powers
12f0d51c0c Fix: signal/slot macro -> func pointer & network fixes 
- convert qt connect calls to use function pointers instead of the signal/slot macros wherever practical (UI classes were mostly left alone, target was tasks and processes)
- give signals an explicit receivers to use the static method over the instance method wherever practical
- ensure networks tasks are using the `errorOccured` signal added in Qt5.15 over the deprecated `error` signal
- ensure all networks tasks have an sslErrors signal connected
- add seemingly missing `MinecraftAccount::authSucceeded` connection for `MSAInteractive` login flow

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-17 18:23:18 -07:00
TheKodeToad
b8e0c8ebc6 Boring changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-17 10:16:03 +01:00
Sefa Eyeoglu
1b05303250
Merge pull request #946 from Ryex/subfolder-watch 2023-04-14 17:10:25 +02: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
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
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
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
Rachel Powers
4df4b43900
fix: Apply suggestions from code review (string changes) 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-31 18:25:29 -07:00
TheKodeToad
e42050cc8a Skip lookup if no files and fail if zipping fails 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-28 14:22:28 +01:00
Rachel Powers
df17f5e899 fix: use QDir::Filter::NoDotAndDotDot 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-27 19:11:26 -07:00
Rachel Powers
a0045ece07 feat: add setting to watch recursively 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-27 19:01:53 -07:00
DioEgizio
4c013e59f0 divide minecraftpage into tabs 
this way small screen users can use the launcher settings without having window a bigger than their actual screens
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-03-25 13:12:50 +01:00
Rachel Powers
ef50e5595e fix: don't try to watch the entier filesystem by watching parent links 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-21 12:17:01 -07:00
Rachel Powers
02bf086c09 feat: watch sub directories for mods 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-21 11:07:20 -07:00
Rachel Powers
0c986ba4d0 spelling and formatting 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 16:38:40 -07:00
Rachel Powers
a28193430c fix: adjust geometry and add missing tooltip 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:33 -07:00
Rachel Powers
458c2f38bc cleanup: code review sugestions 
clean up translation strings

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:33 -07:00
Rachel Powers
ae289c923c fix: clean up initial review comments (flowin) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:33 -07:00
Rachel Powers
e0ef86340f feat: connect new help button help-pages/instance-copy 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:33 -07:00
Rachel Powers
1ca2c59f2e feat: track instance copies that use links 
confirm deleations when other instances link to it

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
a0e03c41c0 fix: typos 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
a1053a4c5a feat: warnings when instance resources are linked 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
9f441a9678 feat: Add UAC icon when symlinking on windows. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
2837236d81 fix: intelegent recursive links & symlink follow on export 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
bc8336a4b1 fix: cleanup UI, detect FAT and turn off links 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
397e7f0363 feat(reflink): hook up relink / clone on the copy dialog 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
c9105e525e fix: follow symlinks when exporting 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
1bed7754e0 feat(symlinks): make recursive links explicit 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00