28ffa8bf44
Update launcher/ui/pages/global/MinecraftPage.ui
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-08-18 12:57:08 +03:00
6d1c67663d
feat:added option to show playtime in hours
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-18 12:24:28 +03:00
e88418ab7f
Merge pull request #1392 from Scrumplex/feat-native-override
2023-08-17 16:09:16 +02:00
85f36ebed7
Merge pull request #981 from Ryex/curseforge-url-handle
2023-08-17 09:24:35 +02:00
5e2d1ffdfb
removed line
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-17 00:23:53 +03:00
c22eec8f27
fixed crash on atlauncher pack install
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 17:03:51 +03:00
c94ee67077
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 12:16:00 +03:00
8f5bb982cd
Merge pull request #1513 from lumiscosity/fix/skin_transparency_bug
2023-08-15 10:54:07 +02:00
a360ddbe0b
Merge pull request #1508 from comp500/fix/allow-empty-lines
2023-08-15 10:53:43 +02:00
06aba530d7
fix: add missing header
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:52:40 +02:00
c2d6a137ab
fix: only add native library overrides if files exist
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:52:08 +02:00
b927e58126
fix: improve debug message
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:52:08 +02:00
4c446ccd50
fix: remove meta OpenAL workaround
...
LWJGL 2 doesn't have a separate zip for OpenAL. So there is no reason
for this code.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:51:48 +02:00
83aa0062c7
feat: add custom native library path settings
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:51:21 +02:00
ff67fd10c3
feat: implement override for GLFW/OpenAL with split natives
...
Fixes PrismLauncher/PrismLauncher#513
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:50:38 +02:00
7ba1e7d356
Merge pull request #1407 from TheKodeToad/icon-indexing
2023-08-15 10:43:29 +02:00
f533173b95
Merge pull request #1516 from Trial97/abort_connect
2023-08-15 10:40:12 +02:00
6ce7e426d2
chore: reformat
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:38:04 +02:00
1939e3e6ed
chore: reformat
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 09:02:15 +02:00
9546c77113
Some warnings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 00:52:34 +03:00
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
215d7dbb74
chore: update license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-14 18:17:05 +02:00
91ba4cf75e
chore: reformat
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-14 18:16:53 +02:00
779f70057b
Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging
2023-08-14 18:16:13 +02:00
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
35358f8180
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings
2023-08-12 11:17:11 +02:00
019e5ca3e8
fix: use ApiDownload for CF URL handling
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-12 11:11:58 +02:00
6423edaa76
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
2023-08-12 10:58:27 +02:00
73adac2501
fix: use QColorConstants in Qt 5.14+
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-11 15:57:12 +02:00
d801151d5c
connect the abort signal in concurent task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-11 15:41:41 +03:00
ea43d0f687
fix: fix more warnings
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-11 10:57:57 +02:00
396f812496
Merge pull request #1230 from TheKodeToad/better-component-installation
...
Revamp loader installation UI
2023-08-11 08:24:14 +02:00
ef6f9487f4
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings
2023-08-10 20:38:32 +02:00
8140374e26
chore: add licensing info to loader logos
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-10 20:18:28 +02:00
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
97ef8e8d0e
Fix transparency in skin icon
...
QPainter has a bug where drawing transparency to a freshly initialized, empty QPixmap causes garbage data to be drawn. This broke the rendering of the skin icon. The fix is simply to fill the QPixmap with empty transparent pixels beforehand.
Signed-off-by: maple! <averyrudelphe@gmail.com >
2023-08-10 15:32:47 +02:00
2090f958c8
Merge pull request #1324 from leia-uwu/ui-tweaks
2023-08-10 12:24:41 +02:00
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
b3da35be74
Fixed curseforge import
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-10 12:19:38 +03:00
1c3449e5a2
Remove unnecessary #if
...
Signed-off-by: comp500 <comp500@users.noreply.github.com >
2023-08-09 23:04:44 +01:00
a351d1834a
Allow empty lines in log output
...
Preserving empty lines in the game log ensures that crash reports and debugging information has necessary whitespace - the previous behaviour made crash reports hard to read.
Signed-off-by: comp500 <comp500@users.noreply.github.com >
2023-08-09 20:48:02 +01:00
e079cbb055
Fix actions
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-07 13:51:26 +01:00
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
74fe2fb2a6
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
2023-08-06 21:54:00 +02:00
a83e5be8f2
fix: makeShared for QByteArray
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-06 21:51:03 +02:00
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
99fd1e622c
chore: replace fabricmc icons with SVG
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-06 17:46:33 +02:00
91eb30f037
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog
2023-08-05 19:04:53 +03:00
377fc0352a
Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons
2023-08-05 19:00:12 +03:00
304e294ea7
Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class
2023-08-04 20:31:43 +02:00
