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

2657 Commits

Author SHA1 Message Date
Sefa Eyeoglu
7ba1e7d356 Merge pull request #1407 from TheKodeToad/icon-indexing 2023-08-15 10:43:29 +02:00
Sefa Eyeoglu
f533173b95 Merge pull request #1516 from Trial97/abort_connect 2023-08-15 10:40:12 +02:00
Sefa Eyeoglu
6ce7e426d2 chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 10:38:04 +02:00
Sefa Eyeoglu
1939e3e6ed chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 09:02:15 +02:00
Trial97
9546c77113 Some warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 00:52:34 +03:00
Trial97
0ba88ff138 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into staging 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 00:33:24 +03:00
Sefa Eyeoglu
215d7dbb74 chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-14 18:17:05 +02:00
Sefa Eyeoglu
91ba4cf75e chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-14 18:16:53 +02:00
Sefa Eyeoglu
779f70057b Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging 2023-08-14 18:16:13 +02:00
TheKodeToad
3c209ba502 theme -> catpacks 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-12 19:04:34 +01:00
Sefa Eyeoglu
35358f8180 Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings 2023-08-12 11:17:11 +02:00
Trial97
d801151d5c connect the abort signal in concurent task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-11 15:41:41 +03:00
Sefa Eyeoglu
ea43d0f687 fix: fix more warnings 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-11 10:57:57 +02:00
Sefa Eyeoglu
396f812496 Merge pull request #1230 from TheKodeToad/better-component-installation 
Revamp loader installation UI
 2023-08-11 08:24:14 +02:00
Sefa Eyeoglu
ef6f9487f4 Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings 2023-08-10 20:38:32 +02:00
Sefa Eyeoglu
8140374e26 chore: add licensing info to loader logos 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-10 20:18:28 +02:00
Sefa Eyeoglu
d67277a668 chore: replace LiteLoader logo with high quality version 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-10 20:18:16 +02:00
Sefa Eyeoglu
2090f958c8 Merge pull request #1324 from leia-uwu/ui-tweaks 2023-08-10 12:24:41 +02:00
Sefa Eyeoglu
8731f4ba27 chore: add comment about _kde_side_panel_view 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-10 12:24:33 +02:00
Trial97
b3da35be74 Fixed curseforge import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-10 12:19:38 +03:00
TheKodeToad
e079cbb055 Fix actions 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-07 13:51:26 +01:00
Tayou
9afa7cc91f Merge branch 'develop' into icon-indexing 
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
 2023-08-07 10:32:38 +02:00
seth
efaf4024ab Merge pull request #1464 from Ryex/fix/windows-console-attach 
[Windows] Fix attaching logs to console
 2023-08-06 15:37:44 -04:00
Sefa Eyeoglu
99fd1e622c chore: replace fabricmc icons with SVG 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-06 17:46:33 +02:00
Trial97
91eb30f037 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog 2023-08-05 19:04:53 +03:00
Trial97
377fc0352a Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons 2023-08-05 19:00:12 +03:00
Sefa Eyeoglu
304e294ea7 Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class 2023-08-04 20:31:43 +02:00
Sefa Eyeoglu
ae793f6cf1 Merge pull request #1459 from Scrumplex/format 2023-08-04 19:42:36 +02:00
Sefa Eyeoglu
1d638e018a chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-04 19:41:47 +02:00
TheKodeToad
1bafa36c17 icon -> iconName 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-02 20:33:01 +01:00
TheKodeToad
afaf6f894c Merge branch 'PrismLauncher:develop' into better-component-installation 2023-08-02 20:27:37 +01:00
TheKodeToad
8b3c465a50 Use protected inheritance for BasePageProvider 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-02 20:24:15 +01:00
TheKodeToad
40c614b3a5 Pressed -> Clicked (doh) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-02 20:23:30 +01:00
Sefa Eyeoglu
fa2b784f7e Merge branch 'develop' into sparkle-disable 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 19:27:48 +02:00
Sefa Eyeoglu
01e17806f6 Merge pull request #1391 from Trial97/prism_export2 2023-08-02 19:27:14 +02:00
Sefa Eyeoglu
f561e7febf Merge pull request #1476 from Scrumplex/fix-saving-metaurl 2023-08-02 19:24:24 +02:00
Sefa Eyeoglu
39d4f0df66 fix: don't reset meta url on launch 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:56:54 +02:00
Sefa Eyeoglu
1d468ac35a chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:35 +02:00
Sefa Eyeoglu
ce2ca13815 fix: add missing headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:08 +02:00
Sefa Eyeoglu
9f66f6495a fix: fix undisciplined multiple inheritance 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
c07a857359 fix: remove irregular enum initialization 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
76df836378 fix: simplify switch statement 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
a545f67a21 fix: take JavaCheckResult by const reference 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
ea56ff255d Merge pull request #1339 from TheKodeToad/remove-direct-launch 2023-08-02 18:31:27 +02:00
Sefa Eyeoglu
01d3eea379 Merge pull request #1359 from Trial97/import 2023-08-02 18:25:51 +02:00
Alexandru Ionut Tripon
f13eccb03d Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-02 19:24:58 +03:00
Sefa Eyeoglu
39d7bc6c24 Merge pull request #1294 from ashuntu/develop 2023-08-02 18:24:54 +02:00
Rachel Powers
bae59a8c07 refactor(windows console): reduce code duplication 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-08-02 06:19:43 -07:00
TheKodeToad
bb039d4bc7 Merge pull request #1445 from Trial97/curse 
feat: removed flame quilt warning
 2023-08-02 12:55:49 +01:00
Apix
16e6a01881 fix: fix copyright year 
Signed-off-by: Apix <apix0n@outlook.com>
 2023-08-02 11:35:54 +02:00