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

376 Commits

Author SHA1 Message Date
Trial97
69c709b05a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 20:01:17 +03:00
Trial97
cb2671a02c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-23 19:35:47 +03:00
Trial97
0a56631831
Added curseforge search 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 19:35:41 +03:00
Trial97
85bbab0e92
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-23 14:38:30 +03:00
Trial97
763b3c3236
Added Thumbs.db to excluded files in MrPackExport 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 10:38:26 +03:00
Trial97
049b02cee4
finished up the curesforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 21:06:01 +03:00
Trial97
58321f3491
Added curseforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 20:03:44 +03:00
Trial97
836e8d2e28
Fixed code quality 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 17:39:57 +03:00
Trial97
b84dc8551a
Fixed trigger function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 16:49:19 +03:00
Trial97
f7d502c68c
Added ExportModsToStringDialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 16:08:04 +03:00
Trial97
2e82c1d40c
Added regex expresion to exclude .DS_Store files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-21 23:22:25 +03:00
Trial97
6fd729e285
Fixed regresion regarding modrinth project_id in dependence array 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 17:42:16 +03:00
Trial97
1bdde1f947
Small fixes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 00:36:37 +03:00
Trial97
319ce8c19f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-19 00:06:44 +03:00
Trial97
6826f1d605
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-18 23:27:41 +03:00
Trial97
0161520b33
Fixed leaks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-18 23:27:26 +03:00
seth
fd9a8d1551
Merge pull request #1110 from TheKodeToad/version-search 
Add a search bar to version lists
 2023-06-16 14:47:39 -04:00
Trial97
182e19eae3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-15 10:35:26 +03:00
leo78913
a807b231a7 fix: fix crash when selecting resource/texture/shader packs 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-06-06 15:17:13 -03:00
TheKodeToad
961285d6ab Add a search bar to version lists 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-05 22:47:42 +01:00
TheKodeToad
37b4f606c8 Validate input lengths on mrpack export 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-05 17:54:24 +01:00
Rachel Powers
3dccc38f42
Merge pull request #904 from TheKodeToad/mrpack-export 
mrpack export
 2023-06-04 19:01:50 -07:00
TheKodeToad
e26827b849 Optimised icons 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-03 13:39:42 +01:00
Alexandru Ionut Tripon
1840505a0f
Fix crash when selecting same mod from different providers (#1029) 2023-06-02 18:04:06 -03:00
Trial97
b4dff181f7
Fixed Ptr logic 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 18:22:55 +03:00
Trial97
737fc1a2a4
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 18:01:39 +03:00
Trial97
27c3775f99
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 17:44:23 +03:00
Rachel Powers
a04a6f1e0d fix(memory leak): don't give shared pointers out to foldermodels (causes cyclic refrence) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 02:15:39 -07:00
TheKodeToad
863027cbe8 Enable size grip 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-22 11:56:54 +01:00
Kode
3be18b58bb
Better variable name :p 
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-15 19:15:56 +01:00
TheKodeToad
22aaf56855 De-hardcode .index 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-15 18:48:49 +01:00
Trial97
ffcc58cb3e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-14 14:20:24 +03:00
Trial97
8c7fd3327e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert 2023-05-14 14:20:04 +03:00
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
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
Trial97
ef6cbdfa2a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-07 19:01:20 +03: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
Trial97
469ef3e06d
Fixed code error 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-05 00:04:24 +03:00
Trial97
107b470289
Updated required_by as dependency 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-04 23:54:46 +03: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
Trial97
8b14b946e2
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-04 22:35:16 +03:00
Trial97
f7b912fc9d
Fixed comments 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-04 22:25:05 +03:00
Trial97
9fbec3793f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-04 20:29:33 +03: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
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
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
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
Trial97
248920a221
Removed extra code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-27 01:33:46 +03:00
Trial97
1d167f8fda
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 01:32:33 +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
Trial97
42bc91463e
Updated links 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 20:37:17 +03:00
Trial97
2c744da9f7
More cleanup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00
Trial97
ffaa47bf54
Small cleanup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00
Trial97
c1490cd627
Refator task to work with multiple providers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00
Trial97
31e84780a8
Hope to fix windows build errors 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00
Trial97
f3f8f3574a
Small headers removal 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
Trial97
5079ce8d64
Fixed headers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
Alexandru Ionut Tripon
f231a33f6e
Merge branch 'PrismLauncher:develop' into develop 2023-04-21 18:42:05 +03:00
Trial97
4fe497cd68
First working version with curseforge mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
TheKodeToad
b8e0c8ebc6 Boring changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-17 10:16:03 +01: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
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
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
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
a0e03c41c0 fix: typos 
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
Rachel Powers
5978882378 feat(symlinks&hardlinks): linkup copy dialog 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
f794e49bb6 we want to make links! 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:27 -07:00
TheKodeToad
ec8cb056bf QRegExp -> QRegularExpression :P 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-19 11:49:24 +00:00
TheKodeToad
1893871a99
Merge branch 'PrismLauncher:develop' into mrpack-export 2023-03-18 14:02:05 +00:00
TheKodeToad
5346dfc782 Use first line of notes for summary 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-18 12:57:44 +00:00
TheKodeToad
ddca838e46 Info and error dialogs 
TODO: is there a better approach?

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-18 12:24:18 +00:00
Janrupf
c17f6e37e5 feat: Add setting for downloads directory 
Closes #641

Signed-off-by: Janrupf <business.janrupf@gmail.com>
 2023-03-13 21:58:22 +01:00
TheKodeToad
2cc9b0df06 Only select some paths by default - again! 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-08 18:10:52 +00:00