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

764 Commits

Author SHA1 Message Date
Trial97
843c2d67eb Added FTBAPP Import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-13 18:41:29 +03:00
seth
89aaedc06c feat: add toggle for quilt beacon 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-12 21:10:48 -04:00
Trial97
766e833a73 fixed crash if no version is loaded 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-12 16:25:05 +03:00
Rachel Powers
149bc8e9ce cleanup: pull out data object so I'm not repeating myself 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-11 21:42:34 -07:00
Rachel Powers
9957aeb003 Merge branch 'develop' into curseforge-url-handle 2023-07-11 21:42:29 -07:00
TheKodeToad
4c69290381 Merge branch 'develop' into better-component-installation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-11 11:14:06 +01:00
TheKodeToad
91c9082d19 Merge pull request #1249 from Trial97/curse 
Curseforge modpack export
 2023-07-10 14:20:29 +01:00
TheKodeToad
4f4ccdaa59 Merge pull request #1338 from Trial97/unlockVersionPage 
feat:unlocked versions page
 2023-07-10 13:06:32 +01:00
TheKodeToad
f816e3cd3f Merge pull request #1241 from Trial97/settings 
Allow editing of running instances
 2023-07-09 22:10:43 +01:00
Trial97
308877aa8f removed redundant code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-09 23:18:38 +03:00
Trial97
159f14c076 feat:unlocked versions page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-09 22:47:38 +03:00
TheKodeToad
08c140b9b4 Fix actionVisitItemPage insersion, and prevent widebar segfault 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-08 20:55:30 +01:00
Trial97
bc2940e16a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-08 00:14:05 +03:00
Tayou
1131038fdb Merge pull request #1120 from Trial97/visit_mod_page 2023-07-07 22:23:59 +02:00
Sefa Eyeoglu
51e62761ee fix: improve QUrl construction 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-07 19:25:12 +02:00
TheKodeToad
b8482a5d89 Update ModFolderPage.cpp 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-07 15:53:50 +01:00
Trial97
3139af8487 Made action text simpler 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-07 17:12:10 +03:00
Sefa Eyeoglu
073cb91f88 fix(ui): validate meta override url 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-07 15:56:07 +02:00
TheKodeToad
22327bbe71 Combine launch buttons in Instance window, persist profiler 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-06 18:07:45 +01:00
leo78913
f9578066d6 make "browse" buttons and java pages more consistent 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-07-06 01:39:59 -03:00
PandaNinjas
4509fde410 Merge branch 'develop' into fix-implicit-fallthrough 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-07-04 16:41:34 -04:00
PandaNinjas
1fbc17d275 Remove break and add fallthrough comment in WorldListPage.cpp 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-07-04 16:38:04 -04:00
TheKodeToad
64c591b234 Better parent version filtering; handle old fabric :P 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-03 20:48:37 +01:00
Trial97
026293f773 updated option text 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-03 14:17:39 +03:00
TheKodeToad
43e6f05ed5 Merge pull request #1232 from telans/screenshots-update 
ScreenshotsPage fixes
 2023-07-02 16:44:54 +01:00
Trial97
6c4cf085e0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 12:50:45 +03:00
Rachel Powers
8d7dcdfc5b chore: fix shadowed member and signed/unsigned mismatch 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: supress unused with [[maybe_unused]]

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: unshadow ^&^& static_cast implicit return

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: deshadow and mark unused in parse task

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: mark unused in folder models

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: deshadow and mark unused with instances

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: more deshadow and unused

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: remove uneeded simicolons

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: mark unused

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: prevent shadow

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 23:39:38 -07:00
TheKodeToad
6cc3587da2 Disable as intended 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-01 20:10:38 +01:00
TheKodeToad
4cdf669154 Modify "Change Version" to use "Install Loader" dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-01 19:39:04 +01:00
TheKodeToad
7138425c85 Merge branch 'develop' into better-component-installation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-01 13:05:55 +01:00
Tayou
1dc7f80034 4 clang-tidy changes, update copyright info 
while already at it I updated all my emails to use one from my domain
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 23:08:04 +02:00
Trial97
0f64ee6a5f Added warnings for running instances 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-28 18:28:25 +03:00
Trial97
c23bf2fd22 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings 2023-06-28 17:46:01 +03:00
Sefa Eyeoglu
faec21d572 Merge pull request #1266 from TheKodeToad/smol-tweaks 2023-06-28 08:47:53 +02:00
Trial97
54cb077b40 Added more information to the screenshot upload warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 19:31:36 +03:00
Sefa Eyeoglu
0aaec9ae4f chore: remove obsolete macOS warning 
We don't support that macOS version. This check also never worked, as we
never set the platform to that value.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 11:53:48 +02:00
Rachel Powers
df4fd7df7f Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class 2023-06-25 12:43:48 -07:00
Trial97
6d0e255ca1 fix: Page container extra info set on logs page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 22:00:33 +03:00
Rachel Powers
9c10965997 refactor: split out setting api headers for downloads 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 11:09:25 -07:00
TheKodeToad
c75ba0f855 Fix big mistake :iea: 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 12:46:07 +01:00
TheKodeToad
603ed22015 Replace accidental usages of QAbstractButton::pressed 
This signal is not usually what you want, and creates an inconsistent experience.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 10:36:54 +01:00
Trial97
ce4a86fbcd Made custom url function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 10:41:29 +03:00
Trial97
54d7477679 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page 2023-06-25 10:12:29 +03:00
TheKodeToad
8a3aba1634 Fix Open Global Settings, why not 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:30:51 +01:00
TheKodeToad
529e2054ea A few tweaks, with inspiration from Zeke :3 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:26:27 +01:00
Trial97
81c1a95166 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-24 20:04:56 +03:00
Trial97
30ef5475c7 Made sure CurseForge string is corect 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 14:50:05 +03:00
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
85bbab0e92 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-23 14:38:30 +03:00
seth
83efdccfe1 Merge pull request #1252 from getchoo/import-hehe 
chore: avoid confusion in file/url import dialog
 2023-06-22 17:12:35 -04:00