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

2288 Commits

Author SHA1 Message Date
Trial97
f6ed2036b3
Removed comment 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-03 00:55:18 +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
TheKodeToad
e0380960fd Change to use future 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-02 14:23:31 +01:00
Sefa Eyeoglu
64ba5e4ed1
Merge pull request #833 from Ryex/advanced_copy_instance 2023-05-02 12:11:41 +02:00
Rachel Powers
733619ca74 feat: estimate remining time on downloads 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
9f9c829bc5 fix: prevent logspam, fix MacOS theme artifacts 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07: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
a80b425551 fix: no need for const bool 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
d7032d975c fix: no need to loop all sub tasks 
pathc by flowin

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
96decbac27 feat: default qtlogging.ini file 
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
fe36471b8d refactor: logging.h -> Logging.h 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
6b28af6cc5 fix: clean up license headers for Tasks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
6306fb564b feat: add UID to debug lines of upload tasks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
cdccb25fe3 feat: add download size to download details alongside speed 
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
495103f72e fix: set x-xbl-contract-version header during xbox auth step 
Refrencing GDlauncher and ATLauncher code for auth as well as https://learn.microsoft.com/en-us/gaming/gdk/_content/gc/reference/live/rest/additional/httpstandardheaders
it is possible some of microsoft's server's are rejecting our request because of this missing header?

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:43:31 -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
Rachel Powers
788fa40c2a refactor: Move ini to use QSettings && drop get/setList functions 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-29 19:55:24 -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
61a2355618
Removed formated but not used files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-27 01:41:26 +03:00
Trial97
248920a221
Removed extra code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-27 01:33:46 +03:00
Japa
7298f9c273
Fixed typo 
Signed-off-by: Japa <japa4551@protonmail.com>
 2023-04-26 16:06:17 -03:00
Trial97
b2ecb9ac09
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 2023-04-22 22:28:08 +03:00
Trial97
f738d7566e
Fixed code qulity 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 22:27:33 +03:00
Japa
672f5cf160
Update launcher/minecraft/MinecraftInstance.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Japa <japa4551@protonmail.com>
 2023-04-21 19:46:33 -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
460e83207f
Fixed removeIf for Qt version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 01:18:27 +03:00
Trial97
75116364c6
Small Cleanup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 00:55:11 +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
b4fa6e120a
Fixed tipo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +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
fac33498db
Made some copy by reference 
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
7bd26ce468
Semi fixed the Modrinth dependency implementation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
Trial97
bcea19b957
Tried to fix codeQL 
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
Trial97
5655a33515
Added Dependency API 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
Japa
92cda68480
Update launcher/minecraft/MinecraftInstance.cpp 
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Signed-off-by: Japa <japa4551@protonmail.com>
 2023-04-21 11:18:17 -03:00
Japa
f41426f394
Instance Description displays the last launch date 
Initial Draft using the Standard C++ Library, still requires testing.

Signed-off-by: Japa <japa4551@protonmail.com>
 2023-04-21 00:30:38 -03:00
TheKodeToad
709736d3f9 Make response const 
I don't think the segfault fix was ideal :P
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-18 09:28:10 +01: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
2e9403a324 This was moved 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-17 13:19:59 +01:00
TheKodeToad
ba17efa381 Smol fixes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-17 13:18:25 +01: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
Trial97
11f8d25d94
Added missing character 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-12 00:49:50 +03:00
Trial97
4fbd5abe41
Added task to load dependencies 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-12 00:45:44 +03:00
Trial97
d524935b67
Added task to load local mod information 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-11 20:55:10 +03:00
Trial97
6d5c629b43
Added dependencies to the APIs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-10 00:04:35 +03:00
Kode
3a7961834a
Remove seek 
Don't need it if the data is already in a byte array.

Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-04-09 21:28:40 +01: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
TheKodeToad
813ccc1381 How did i- 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-07 11:03:11 +01:00
TheKodeToad
b65f4c9536 Better collectFileListRecursively error 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:59:24 +01:00
TheKodeToad
012d8bb468 Revert concurrent syntax 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:58:09 +01:00
TheKodeToad
d7a137ad13 Remove more prototype not good code 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:24:19 +01:00
TheKodeToad
073aaf9b3b Remove "prototype" field 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:19:41 +01:00
TheKodeToad
871d647c93 Use local metadata 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:18:36 +01:00
Rachel Powers
0ce3049579 fix: sysinfo libs needed too 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 18:48:28 -07:00
Rachel Powers
de20258aa7 fix: filelink needs network for local socket 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 18:30:28 -07:00
Rachel Powers
41c5e523b2 fix: add back QT::Widgets link 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 18:09:01 -07:00
Rachel Powers
197be9cfd0 fix: remove fixed datastream version 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 18:00:56 -07:00
Rachel Powers
5b50b806ec refactor: remove data duplication in statis FS Names 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 17:14:06 -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
seth
4055e34320
chore: use system architecture to detect vulkan layers 
Signed-off-by: seth <getchoo@tuta.io>
 2023-04-01 13:09:09 -04:00
Rachel Powers
538092b727 fix: typos, CamelCase to camelCase the new names 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-31 20:31:27 -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
seth
3e3b92d4c1
chore: improve detection of newer vulkan layers 
i've been scrump'd

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: seth <getchoo@tuta.io>
 2023-03-31 20:09:26 +00:00
seth
c7dc115365
fix: search for newer mangohud vulkan layers 
Signed-off-by: seth <getchoo@tuta.io>
 2023-03-31 15:49:09 -04: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
Sefa Eyeoglu
9418c62d95
refactor: reprocess log lines per instance 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-22 10:32:17 +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
Sefa Eyeoglu
44bf32e729
fix: handle partial lines in LoggedProcess 
Fixes PrismLauncher/PrismLauncher#930

Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-21 18:30:46 +01: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
0bec0046bb format: clang-format to fix windows fallout 
it looked fine over in vscod on windows but
as soon as I opened it on linux via Helix
the chaos was clear

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
dc5402349e refactor: use UUID toString mode 
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
3ec92acfe7 fix: use noexcept overload of std::filesystem::hard_link_count 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
562ae676a5 fix: mingw still missing typedefs 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
72292f4e03 fix: windows compile broke 
move winapi defs into #ifndef blocks don't check explicitly for __mingw__ define
function name win_ioctl_clone didn't get updated in teh last commit

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
536da704fc refactor: cleanupFilesystem.cpp 
* remove now redundant reflink/clone code for windows
* remove unnessacery debug code that could slow things down

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
7870cf28e5 fix: add missing mingw defs 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
9939367db7 feat(reflink): ioctl_clone for winbtrfs & ReFS 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
1210c3256d fix: macos compat after refactor of clonefile 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
2e8d04aad0 feat: support reflink on windows via winbtrfs! 
https://github.com/maharmstone/btrfs

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
3a0e4546c2 fix: windows test compat 
fix: compiler warning on int qint32 compare

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
34ac8b3ec3 fix: Qt < 5.14.0 compat 
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
c5bbe42b57 feat: reflink / Clone support! 
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
8ba51c7900 refactor: make complete list of links to make and send that. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
6d160a7b7e feat: successful process elevation and comunication! 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
32409a361b fix CMakeLits.txt for non MSVC windows builds 
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
46f448dfba Improve invokeMethod syntax 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-19 21:26:25 +00:00
TheKodeToad
710156b9f1 Replace native file separator - this was accidentally brought to my attention on Modrinth's guild 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-19 21:25:12 +00: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
8837f06e4e Only add summary if not empty 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-18 14:01:41 +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
Sefa Eyeoglu
05b6969ee5
fix: add mnemonic to downloads directory setting 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-14 13:35:16 +01: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
Kenneth Chew
430369feb8
fix: explicit conversion to C string to fix MinGW g++ 10 build 
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2023-03-12 18:33:48 -04:00
Sefa Eyeoglu
1dd96898e1
Merge pull request #896 from TheKodeToad/modrinth-token 2023-03-09 15:10:40 +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
TheKodeToad
59b15c5f08
Fix another duplicate name 🤦 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-07 21:03:09 +00:00
TheKodeToad
59cf8f678f
(hopefully) Fix duplicates names 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-07 20:50:19 +00:00
TheKodeToad
088be050b2
Apply flowln's suggestion :) 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-07 20:46:27 +00:00
TheKodeToad
5d5fcae501 Further reduce buggy behaviour 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-06 17:24:04 +00:00
TheKodeToad
970ec8187c More refactoring 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-05 18:25:57 +00:00
TheKodeToad
76f66148db Apply flowln's suggestion 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-05 18:21:24 +00:00
Sefa Eyeoglu
f3f0652d2b
Merge pull request #853 from kumquat-ir/nil 
NilLoader mod metadata support
 2023-03-05 13:39:00 +01:00
flow
06de728aa7 fix: use toLocalFile() instead of path() 
QUrl::path() adds a '/' at the beginning of the path on Windows, causing
the world to explode every once in a while.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-03-05 08:24:56 -03:00
TheKodeToad
87384182a1 Fix abort? 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-04 11:07:07 +00:00
TheKodeToad
f583e617ec Implement abort (possible broken?) and therefore make it work without crashing! 
The shared pointer was going out of scope 🤦.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-04 10:37:56 +00:00
TheKodeToad
a2716f5cf6 Improve code 
Even more broken now (it is stuck loading forever)!

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-04 10:24:25 +00:00
TheKodeToad
55f928f845 More consistent naming 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-03 15:06:29 +00:00
TheKodeToad
2343aad088 Make it work! (TODO make it not crash) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-03 15:00:07 +00:00
TheKodeToad
dcaa907fed Mod loader support 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-03 11:25:11 +00:00
TheKodeToad
adcdf28d64 Move task to another thread 
I don't know whether this is the prefered method.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-03 11:24:36 +00:00
TheKodeToad
f28a7b9d08 Add PackIgnoreProxy.h to cmake 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 19:50:42 +00:00
TheKodeToad
6505b0c065 Move logic to task 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 19:48:41 +00:00
TheKodeToad
88ef02474f Minify index JSON 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 17:36:44 +00:00
TheKodeToad
9ec32b2561 Fix QuaZipFile usage 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 17:36:28 +00:00
TheKodeToad
a5dd6b6cd7 Export without file urls 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 16:41:09 +00:00
TheKodeToad
46cc325f7c Add file tree 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 11:25:36 +00:00
TheKodeToad
0fadb5a2be Add *basic* interaction 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 10:31:53 +00:00
TheKodeToad
8b897ac714 Fix menu being set as central widget 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 10:31:53 +00:00
TheKodeToad
a80b820e94 UI for mrpack export (broken) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 10:31:53 +00:00
TheKodeToad
4efbf22089 Prism-ify more license headers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 10:19:42 +00:00
TheKodeToad
5c913149c8
Merge branch 'PrismLauncher:develop' into modrinth-token 2023-03-02 10:10:46 +00:00
Sefa Eyeoglu
9265c319a9
Merge pull request #788 from flowln/other_resource_downloaders_two 
Add resource pack, texture pack and shader pack downloaders
 2023-03-02 10:08:45 +00:00
TheKodeToad
cbe6eff2fa Move Modrinth before CurseForge for consistency 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 09:28:14 +00:00
TheKodeToad
1f3d18ec12 Replace with exact match and add TODO to improve 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 09:26:00 +00:00
Sefa Eyeoglu
89255e34bd
fix: change wording of TP/RP download buttons 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-02 09:42:28 +01:00
TheKodeToad
a7b8092296 Add link 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-01 14:41:16 +00:00
TheKodeToad
1feb630520 Allow custom Modrinth API token 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-01 14:24:56 +00:00
Sefa Eyeoglu
651e511ff0
fix: use makeShared for importing components 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-01 12:33:00 +01:00
Sefa Eyeoglu
0eae9355e6
Merge pull request #889 from flowln/fix_zip_extract 2023-03-01 09:51:08 +01:00
Sefa Eyeoglu
4878f1a438
Merge pull request #735 from Scrumplex/import-component 2023-03-01 09:49:47 +01:00
flow
d5c6704475
fix: prevent crash when aborting import task while extracting pack 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-24 20:34:43 -03:00
flow
fda9ca1e34
fix+refactor: fix fail to import modpacks and clean up a bit 
QDir::cleanPath called by FS::PathCombine removes the trailing '/'...

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-24 20:09:02 -03:00
kumquat-ir
dc8109658c review fixes 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-22 13:20:13 -05:00
kumquat-ir
7973b01e81 fix metadata for mods with .nilmod extension 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-19 17:21:53 -05:00
kumquat-ir
256fc322a8 minor cleanup 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-16 12:57:35 -05:00
Sefa Eyeoglu
1f0fc61b53
Merge pull request from GHSA-gq28-qx55-mh2r 
Don't extract files outside of target path
 2023-02-15 21:48:06 +01:00
kumquat-ir
9c2a3231c5 do not create nilmods folder 
"it cant be that easy" - me, clueless

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-13 01:45:23 -05:00
Rachel Powers
80840f1fdb fix: add missing header to Application.cpp 
fails to compile on KISS Linux without

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-02-12 22:32:34 -07:00
kumquat-ir
c07fff7503 switch to qdcss for parsing 
make it not horrible to look at

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-12 17:23:15 -05:00
kumquat-ir
7896dd19c1 nilmods instance page 
mostly copied from the coremod page impl

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-11 17:46:17 -05:00
kumquat-ir
f5f2d33f93 parse nil metadata 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-11 17:46:17 -05:00
Sefa Eyeoglu
e70a5a47ee
fix: ignore absolute paths when extracting 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-10 10:46:21 +01:00
Sefa Eyeoglu
6be7eed878
fix: don't extract files outside of target path 
This should fix a security issue regarding path traversal in zip files.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-10 09:17:48 +01:00
PandaNinjas
d886d32bd8
Replace potentially ReDOSable regex 
Signed-off-by: PandaNinjas <admin@malwarefight.gq>
 2023-02-07 17:21:00 +00:00
DioEgizio
f36c3a3f6c
Merge pull request #819 from Scrumplex/fix-launch-script 2023-02-06 16:26:54 +01:00
flow
46c6cc2d2b
chore: add my copyright headers 
.-.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:56 -03:00
flow
ada5e88eb9
feat(RD): add texture pack downloader 
This extends the resource pack downloader, with the custom behavior of
filtering the versions that shows up, to those <= 1.6. As always, Flame
is funky and requires a bit more workarounds than average.

This will also get a nice improvement when the Version parsing and
comparison PR gets merged! :D

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:56 -03:00
flow
b724607e31
feat(RD): add shader pack downloader 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:56 -03:00
flow
c3ea303a37
feat(RD): add resource pack downloader 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:52 -03:00
Sefa Eyeoglu
e89a10945c
Merge pull request #823 from BalkanMadman/linux-java 
Fix https://github.com/PrismLauncher/PrismLauncher/issues/790
 2023-02-05 19:09:48 +01:00
Sefa Eyeoglu
8ddc89fa01
Merge pull request #825 from Ryex/cmd_env_native_sep 
fix https://github.com/PrismLauncher/PrismLauncher/issues/824
 2023-02-05 18:42:19 +01:00
Sefa Eyeoglu
a47bf72b07
Merge pull request #751 from Edgars-Cirulis/develop 2023-02-05 17:48:26 +01:00
Rachel Powers
34460dd77a ensure command env vars use native path seperators 
fix #824

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-02-04 12:28:52 -07:00
BalkanMadman
c125c96e88 Java installations detection fix for Linux 
Signed-off-by: BalkanMadman <zurabid2016@gmail.com>
 2023-02-04 16:48:06 +02:00
Sefa Eyeoglu
d2fd0fd8e8
Merge pull request #802 from KosmX/develop 2023-02-04 14:43:28 +01:00
Sefa Eyeoglu
edaa66f622
fix: use /usr/bin/env bash in launch script 
This should make it possible to run these scripts on any system, as
/bin/bash is not standard! Notably this fixes the script on NixOS.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-04 01:06:16 +01:00
Sefa Eyeoglu
6ac073e779
fix: fix component uid regex 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-03 18:32:57 +01:00
flow
4166d9ab7b
fix: give error when components have bad uids 
This allows other code to reject proceeding when the UID is bad, which
is generally a good idea. :p

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-02 17:11:24 -03:00
flow
435273e08a
fix(Inst.Import): don't allow bad file path in mrpack import 
This checks the URL of the path of the file to be downloaded,
ensuring that it always contains the root .minecraft target folder,
following the warning in the mrpack documentation.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-02 17:11:24 -03:00
KosmX
35a62d9787
commit requested change, make the lock static 
Signed-off-by: KosmX <kosmx.mc@gmail.com>
 2023-02-01 23:31:12 +01:00
KosmX
ec5bb944b2
thread-safe logger 
Signed-off-by: KosmX <kosmx.mc@gmail.com>
 2023-02-01 14:59:11 +01:00
leo78913
2b0252d4ae Fix: fix some regressions in the main window 
this removes the update action from the help button
and fixes the add to path action not showing on macos

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-28 15:09:26 -03:00
flow
c78db5459e
Merge pull request #724 from leo78913/dot-ui-mainwindow 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/594
Closes https://github.com/PrismLauncher/PrismLauncher/issues/69
Closes https://github.com/PrismLauncher/PrismLauncher/issues/473
 2023-01-27 10:55:49 -08:00
leo78913
a27564ed70 better fix for WideBar::insertSeparator 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-27 13:48:12 -03:00
leo78913
df8df41621 Remove unused BarEntry variable 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-27 12:40:27 -03:00
leo78913
d5a0d4b452
Update launcher/ui/MainWindow.ui 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-27 12:35:53 -03:00
leo78913
357b6ee991
Update launcher/ui/MainWindow.ui 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-27 12:35:41 -03:00
leo78913
4d2b5c2f42 refactor: clean up some MainWindow stuff 
this makes the accounts button and menubar item share the same QMenu
and also refactors some code

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-26 19:48:21 -03:00
flow
29f7ea752f
refactor: make shared_qobject_ptr ctor explicit 
This turns issues like creating two shared ptrs from a single raw ptr
from popping up at runtime, instead making them a compile error.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-25 16:57:51 -03:00
Sefa Eyeoglu
199a7df807
refactor: add error handling to component import 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-25 10:43:23 +01:00
Sefa Eyeoglu
5186ad95d3
Merge pull request #784 from flowln/fix_resource_folder_double_smart_ptrs 2023-01-25 10:33:01 +01:00
Sefa Eyeoglu
0546345182
Merge pull request #458 from Scrumplex/remove-updater 2023-01-25 10:32:49 +01:00
flow
90feaaf2df
fix(Tasks): don't try to start more tasks than necessary 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-24 17:04:05 -03:00
flow
6d27ef5eea
fix(ResourceFolder): don't create two smart ptrs for the same raw ptr 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-24 17:04:01 -03:00
Rachel Powers
3ddf413332
Update launcher/Application.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-24 09:24:12 -07:00
Sefa Eyeoglu
6e841a3b7e
Merge branch 'develop' into remove-updater 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-24 14:40:17 +01:00
Rachel Powers
085e067fc1
remove NDEBUG check per Scrumplex's orders 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-24 02:26:21 -07:00
Rachel Powers
c45fa016c0
fix: let jars be found from inside build dir for debug builds 
debug bug builds run form inside the build dir before they are bundled can't find the jars

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-23 18:36:58 -07:00
Sefa Eyeoglu
16477a8f6c
Merge pull request #675 from flowln/generalize_mod_model 2023-01-23 23:58:52 +01:00
Sefa Eyeoglu
04e4900415
Merge pull request #758 from flowln/fix_process_events_backstab 2023-01-23 23:58:41 +01:00
flow
ea5020e188
fix(license): add/fix my copyright/license headers 
*sobbing in messy legal stuff i know nothing about*

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-23 11:12:43 -03:00
flow
445f9e5f71
feat+fix(Version): make comparsion FlexVer-compatible 
... and fixes a minor issue in the parsing.

This changes the expected behavior of Versions in one significant way:
Now, Versions like 1.2 or 1.5 evaluate to LESS THAN 1.2.0 and 1.5.0
respectively. This makes sense for sorting versions, since one expects
the versions without patch release to 'contain' the ones with, so the
ones without should be evaluated uniformily with the ones with the
patch.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-21 18:47:47 -03:00
leo78913
5a25ce8c1b Fix main window icon and stuff 
i forgor 💀

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
670cf8ee07 Fix: make the newsLabel toolbutton fullwidth again 
this reverts it to how it was before the MainWindow .ui port

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
6c5f6e8900 Fix status bar name 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
4ed4fb2314 remove useless setEnabled calls 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
f16989bea9 feat(WideBar): custom context menu actions 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
55d4064335 Fix: translate actionNoDefaultAcount text 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
3b38a4c690 Fix: translate NoAccountsAdded text 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
ada595663d fix(widebar): fix insertSeparator 
WideBar::insertSeparator was adding the separator to the end of the toolbar

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
b2de01b076 feat(WideBar): Allow disabling alt shortcuts 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
f3acf35aea refactor: Port the main window to a .ui file 
some stuff still needs to be done in the c++ side because qt designer is dumb >:(

the instance toolbar icon and instance name buttons are still added manually inside MainWindow.cpp

looks almost identical, with some minor tweaks:
- the instance toolbar is now a WideBar, so you can customize what actions you want :D
- the instance toolbar buttons are now fullwidth
- the close window button is now at the end of the file menu
- the help menu has some layout changes

this also fixes some stuff:
- menus not having tooltips
- the top toolbar not connecting to the title bar in kde
- the instance toolbar separators looking weird after you move the toolbar

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
3da1d6a464 feat: add Widebar::InsertWidgetBefore method 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:44:39 -03:00
Tayou
cdc9f93f71
make MainWindow cat update instantly 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-20 15:16:25 +01:00
flow
bcebb1920f
refactor: clean up Section struct 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-20 11:15:26 -03:00
flow
81848e05f1
refactor: simplify Version operators 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-20 11:15:26 -03:00
Edgars Cīrulis
0199d8a74f
Version.cpp: Add new line 
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-19 14:12:59 +02:00
Edgars Cīrulis
f49ad2ee03
Version.h: Fix comparison of null version in Version class 
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-19 10:40:30 +02:00
Rachel Powers
7ed993b54e
fix: proper null padded version comparison 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-19 09:51:11 +02:00
Rachel Powers
9934537e19
feat: add debug printing for Version 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-19 09:50:45 +02:00
flow
00d42d296e
fix: call processEvents() before adding new tasks to the task queue 
This allows the ongoing task to go off the stack before the next one is
started.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-18 16:23:30 -03:00
Edgars Cīrulis
730f714e97
Version.cpp: Remove unnecessary QStringList include 
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-17 22:39:19 +02:00
Edgars Cīrulis
3bec4a80b3
Version.cpp: Decompose version strings according to flexver 
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-17 22:39:12 +02:00
Edgars Cīrulis
a84e4b0e07
Version.cpp: Format parse function code using clang-format 
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-17 07:14:49 +02:00
Edgars Cīrulis
198139feb4
Version.cpp: Simplify Version::parse by using const auto& current_char 
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-17 07:14:37 +02:00
Edgars Cīrulis
de11017552
Version.cpp: Use anonymous function to eliminate code duplication 
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-17 07:14:29 +02:00
Edgars Cīrulis
6fb837c529
Version.cpp: Add version string parser to split on '.' character 
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-17 07:14:05 +02:00
Edgars Cīrulis
c0c3892064
Version.cpp: Improve version parsing to handle mixed numeric and alphabetic characters 
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-17 07:13:24 +02:00
Sefa Eyeoglu
1a35fec134
Merge pull request #696 from Ryex/import-all-the-things 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/581
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/700
 2023-01-16 10:04:09 +01:00
Sefa Eyeoglu
cd893e18d2
chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-14 17:21:52 +01:00
flow
cf022524d1
Merge pull request #743 from flowln/fix_mods_with_wrong_modListVersion 2023-01-14 12:19:12 -03:00
flow
ebb0596c1a
fix: don't fail mod parsing when encountering invalid modListVersion 
The spec (admitely a very old one) states that this entry should always
have the value "2". However, some mods do not follow this convention,
causing issues.

One notable example is the 1.6 version of Aether II for 1.7.10, that has
this value set at "5" for whatever reason.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 21:15:10 -03:00
flow
3de681d2d6
Merge pull request #685 from byteduck/instance-accounts 2023-01-13 17:21:12 -03:00
Rachel Powers
f7b0ba88da Apply suggestions from code review 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-13 13:15:13 -07:00
flow
c95c81d42f
fix(ModUpdater): ensure instead of require icon_url 
The spec says that this can be null, and indeed some mods have it set to
null, and should still be considered as valid.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:59:37 -03:00
flow
9407596b12
fix(ModUpdater): fail mods individually when there's errors in the JSON 
Prevents a single problematic mod from invalidating all the API
response.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:49:21 -03:00
flow
c294c2d1df
refactor(RD): allow setting custom folder target for downloaded resources 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:09 -03:00
flow
bd36f8e220
fix(RD): set resource strings for ReviewMessageBox too 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:09 -03:00
flow
1919069b12
fix(RD): don't assert search offset on fetchMore() in ResourceModel 
This allows the standard QAbstractItemModelTester to work without
shenanigans!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:09 -03:00
flow
ba677a8cb7
refactor: change some ResourceAPI from NetJob to Task 
This makes it easier to create resource apis that aren't network-based.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:09 -03:00
flow
e62e1d9701
refactor(RD): move BaseInstance dep. to subclasses of ResourceModel 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:08 -03:00
flow
b3330cb0da
fix(RD): correctly set the strings for the specific resource names 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:08 -03:00
flow
7d128c79a3
fix: CodeQL warnings about the rule of two 
shush

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:08 -03:00
flow
3cff23dae2
refactor(RD): move success callbacks from ModModel to ResourceModel 
While implementing the resource pack downloader in another branch, I
noticed that most of the code in the success callback was identical in
both cases, safe for a few minute differences in strings. So, this tries
to make it easier to share this piece of code.

However, it still leaves the possibility of extending the methods in
ResourceModel to accomodate for cases where this similarity may not
hold.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:08 -03:00
flow
c3f0139f76
refactor(RD): add helper in ResourceModel to find current sorting 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:08 -03:00
flow
563fe8d515
fix(RD): separate search and versions/info tasks 
This allows us to check whether a search request is already on-going, in
which case we don't need to make another one (and shouldn't).

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:08 -03:00
flow
38e20eb148
fix(RD): pass copy of IndexedPack to callbacks instead of ref. 
This prevents a crash in which the pack list gets updated in a search
request meanwhile a versions / extra info request is being processed.
Previously, this situation would cause the reference in the latter
callbacks to be invalidated by an internal relocation of the pack list.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:07 -03:00
flow
36571c5e22
refactor(RD): clear up sorting methods 
This refactors the sorting methods to join every bit of it into a single
list, easing maintanance. It also removes the weird index contraint on
the list of methods by adding an index field to the DS that holds the
method.

Lastly, it puts the available methods on their respective API, so other
resources on the same API can re-use them later on.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:07 -03:00
flow
c8eca4fb85
fix: build with qt5.12 on Linux and pedantic flag 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:07 -03:00
flow
0e207aba6c
feat(RD): add roleNames and Q_PROPERTY to ResourceModel 
in preparation for QML interop.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:07 -03:00
flow
45d1319891
refactor(RD): decouple ResourceModels from ResourcePages 
This makes it so that we don't need a reference to the parent page in
the model. It will be useful once we change the page from a widget-based
one to a QML page.

It also makes tasks be created in the dialog instead of the page, so
that the dialog can also have the necessary information to mark versions
as selected / deselected easily. It also makes the task pointers into
smart pointers.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:07 -03:00
flow
39b7ac90d4
refactor(RD): unify download dialogs into a single file 
No need for multiple files since the subclasses are so small now

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:06 -03:00
flow
ef87bdf18a
fix(RD): prevent weird behavior of progress widget 
when i.e. clicking on links or just using the downloader at all, this
prevents some flickering and the widget never getting hidden in some
cases.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:06 -03:00
flow
433a802c6e
refactor: put resource downloading classes in common namespace 
Puts them all inside the 'ResourceDownload' namespace, so that it's a
bit clearer from the outside that those belong to the same 'module'.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:06 -03:00
flow
6a18079953
refactor: generalize mod models and APIs to resources 
Firstly, this abstract away behavior in the mod download models that can
also be applied to other types of resources into a superclass, allowing
other resource types to be implemented without so much code duplication.

For that, this also generalizes the APIs used (currently, ModrinthAPI
and FlameAPI) to be able to make requests to other types of resources.

It also does a general cleanup of both of those. In particular, this
makes use of std::optional instead of invalid values for errors and,
well, optional values :p

This is a squash of some commits that were becoming too interlaced
together to be cleanly separated.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:00 -03:00
flow
b937d33436
Merge pull request #714 from redstrate/cmark 2023-01-13 16:16:00 -03:00
Aaron Sonin
b2f48eaeb8
Merge branch 'PrismLauncher:develop' into instance-accounts 2023-01-12 20:11:46 -08:00
Aaron
160dd09fc2
Fix instance account selector face for offline accounts 2023-01-12 20:03:31 -08:00
Joshua Goins
807da6a035 fix: Remove extra line breaks for modrinth descriptions 
Signed-off-by: Joshua Goins <josh@redstrate.com>
 2023-01-12 10:08:52 -05:00
Sefa Eyeoglu
22a2b7ac46 refactor: support system and bundled cmark 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-12 10:08:52 -05:00
Joshua Goins
24a4bd3a1c refactor: replace hoedown markdown parser with cmark 
Signed-off-by: Joshua Goins <josh@redstrate.com>
 2023-01-12 10:08:52 -05:00
Sefa Eyeoglu
fff52cb247
feat: add button to import component JSONs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-11 13:50:57 +01:00
Sefa Eyeoglu
219c5b323d
Merge pull request #731 from flowln/windows_server_trash 2023-01-11 09:49:20 +01:00
flow
391ef64c22
fix(FileSystem): don't attempt to trash items on Windows Server 
For some reason this makes some of our CI test runs super slow, and
sometimes fail miserably.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-10 12:50:56 -03:00
Tayou
668b19d119
Add hint about Cat 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:09:57 +01:00
Sefa Eyeoglu
5c48f0b458
fix: set minimum size for setup wizard 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-10 16:06:50 +01:00
Tayou
689fe1e2c7
CRLF -> LF 
damn you visual studio for creating CRLF files everywhere...
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:50 +01:00
Tayou
7d440402ad
Update launcher/Application.cpp with suggestion from scrumplex 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:42 +01:00
Tayou
6daa457838
Implement Suggestions from flow & Scrumplex 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:42 +01:00
Tayou
49d317b19a
UX tweak + formatting + added cat to wizard 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:24 +01:00
Tayou
1b80ae0fca
add theme setup wizard 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:01 +01:00
Sefa Eyeoglu
61144f7a21
Merge pull request #726 from TheLastRar/qt6-win-darkmode 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/158
 2023-01-10 08:48:17 +01:00
Rachel Powers
574af2c795 chore: cleanup review suggestions 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-09 17:18:08 -07:00
Rachel Powers
a4870d4834 fix: fix #700 
fixed by properly converting from a file path and converting to native seperators.
should have known naive handling of file path as a URL would come back to bite us cross platform.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-09 17:00:12 -07:00
TheLastRar
78bbcac0ea ui: Let Qt 6.4.2 handle dark mode titlebar 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2023-01-09 19:44:11 +00:00
Sefa Eyeoglu
ca9b2525c8
Merge pull request #715 from getchoo/add-teawie 2023-01-09 09:46:31 +01:00
seth
9de6927c3f
feat: add CC BY-SA 4.0 info for teawie images 
Signed-off-by: seth <getchoo@tuta.io>
 2023-01-07 19:18:22 -05:00
Rachel Powers
30b01ef053 fix: *sigh* no implicit QString->QFileInfo conversion in Qt6, again... 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-07 15:04:23 -07:00
Rachel Powers
03b75bf2a9 feat: Import all the things! 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-07 15:04:22 -07:00