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

592 Commits

Author SHA1 Message Date
Trial97
ffcc58cb3e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-14 14:20:24 +03: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
Trial97
ef6cbdfa2a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-07 19:01:20 +03: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
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
9fbec3793f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-04 20:29:33 +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
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
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
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
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
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
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
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
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
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
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
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
Sefa Eyeoglu
1dd96898e1
Merge pull request #896 from TheKodeToad/modrinth-token 2023-03-09 15:10:40 +01: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
Sefa Eyeoglu
f3f0652d2b
Merge pull request #853 from kumquat-ir/nil 
NilLoader mod metadata support
 2023-03-05 13:39:00 +01: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
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