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 |
|
Sefa Eyeoglu
|
35358f8180
|
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings
|
2023-08-12 11:17:11 +02: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 |
|
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
|
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 |
|
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
|
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 |
|
Rachel Powers
|
e64e4d7ef7
|
Fix: always false comparison
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-08-01 18:57:35 -07:00 |
|
Rachel Powers
|
f19e8dd086
|
Apply suggestions from code review
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-08-01 18:53:51 -07:00 |
|
Rachel Powers
|
5a9f780cf8
|
fix(FlameInstanceCreationTask): include Net::Apidownload
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-31 22:36:13 -07:00 |
|
Rachel Powers
|
2d1197f59f
|
Merge branch 'develop' into refactor/net-split-headers-to-proxy-class
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-31 22:26:20 -07:00 |
|
Rachel Powers
|
7091bc81c2
|
chore(rename): fix unfinshed renames from deshadow changes
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 15:56:38 -07:00 |
|
Rachel Powers
|
b9fe37aec1
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 15:33:46 -07:00 |
|
Rachel Powers
|
760b80934f
|
fix(filelink exe): add console sources
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 15:22:18 -07:00 |
|
Rachel Powers
|
6d564628b7
|
fix(FileLink): drop FreeConsole
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 15:11:00 -07:00 |
|
Rachel Powers
|
a7ef663735
|
fix(windows console): use new logic in FileLink exe
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 14:03:20 -07:00 |
|
Rachel Powers
|
186211244d
|
refactor(windows console): move to external file
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 13:38:47 -07:00 |
|
Rachel Powers
|
5740ee0444
|
fix(windows console): properly bind windows console
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 13:38:47 -07:00 |
|
Sefa Eyeoglu
|
566425166b
|
Merge pull request #1449 from Trial97/tehnic
Reintroduce parsing of INI files
|
2023-07-30 09:47:40 +02:00 |
|
Ash
|
d133b40b25
|
Merge branch 'PrismLauncher:develop' into develop
|
2023-07-28 21:22:35 +00:00 |
|
Trial97
|
c3eb17db74
|
removed unneded if condition
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-28 13:22:04 +03:00 |
|
Trial97
|
4789708cc2
|
added missing )
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-28 13:16:57 +03:00 |
|
Alexandru Ionut Tripon
|
83fce74bb1
|
Update launcher/ui/dialogs/NewInstanceDialog.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-28 13:11:56 +03:00 |
|