8f5bb982cd
Merge pull request #1513 from lumiscosity/fix/skin_transparency_bug
2023-08-15 10:54:07 +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
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
9546c77113
Some warnings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 00:52:34 +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
5056a51c18
Improvements and refinements to pack export
...
- Persist fields
- Toggle optional files
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-12 21:20:51 +01:00
b3b2e9df35
Merge branch 'develop' into feat/acknowledge_release_type
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-08-12 12:42:30 +03: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
ea43d0f687
fix: fix more warnings
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-11 10:57:57 +02:00
ef6f9487f4
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings
2023-08-10 20:38:32 +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
b2fdd83594
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-05 19:09:10 +03:00
939a2d67ed
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-05 18:21:09 +03:00
304e294ea7
Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class
2023-08-04 20:31:43 +02:00
1d638e018a
chore: update license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-04 19:41:47 +02:00
1d468ac35a
chore: reformat
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:35 +02:00
c07a857359
fix: remove irregular enum initialization
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:07 +02:00
76df836378
fix: simplify switch statement
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:07 +02:00
ea56ff255d
Merge pull request #1339 from TheKodeToad/remove-direct-launch
2023-08-02 18:31:27 +02:00
e64e4d7ef7
Fix: always false comparison
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-08-01 18:57:35 -07:00
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
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
566425166b
Merge pull request #1449 from Trial97/tehnic
...
Reintroduce parsing of INI files
2023-07-30 09:47:40 +02:00
1e82cb6a7c
fix: add support for QByteArray inifile
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-26 23:56:01 +03:00
af59c41713
fix: typo in task.h
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-26 16:20:30 -04:00
f505d43fc0
Fix token "0" being replaced
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-24 13:43:26 +01:00
57430fd189
Merge branch 'develop' into better-launch
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-22 11:26:02 +01:00
593f452986
Merge pull request #1399 from Scrumplex/offline-uuid
...
fix: generate predictable UUIDs for offline accounts
2023-07-19 10:16:27 +01:00
f8fcb98c68
fix: generate predictable UUIDs for offline accounts
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-18 10:07:35 +02:00
1fbb41f5e2
Make Launch Offline not launch online in 1.6+
...
Signed-off-by: Josiah Glosson <soujournme@gmail.com >
2023-07-17 17:07:06 -05:00
2be630904f
fix: don't take modloaders by reference
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-17 14:33:01 +02:00
54a091ca59
fix: check if any modloader is installed
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-17 10:09:01 +02:00
aaf1726965
Merge pull request #1357 from getchoo/quilt-beacon
...
feat: add toggle for quilt beacon
2023-07-17 06:42:46 +02:00
a2a09ffe01
chore: better explain quilt loader beacon
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-15 14:25:05 -04:00
149b6d59cf
fixed tests
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 23:22:11 +03:00
db9f5f44e0
Split in two the options
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 22:26:22 +03:00
3099a70edc
Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-place
...
fix(flame install): don't assume .zip is a resource pack. default to mod
2023-07-14 00:16:43 -04:00
cde85947c7
Update launcher/minecraft/mod/tasks/LocalResourceParse.cpp
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-13 21:12:12 -07:00
520594e529
Merge branch 'develop' into chore/add-compiler-warnings
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-13 20:05:16 -07:00
89aaedc06c
feat: add toggle for quilt beacon
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-12 21:10:48 -04:00
640aaa8c23
Merge pull request #1331 from TheKodeToad/hungry-trash
...
Fix updating trashing resources
2023-07-10 16:31:43 -04:00
9aedb5afff
Merge pull request #1334 from TheKodeToad/litemod-dl
...
LiteMod downloading
2023-07-10 16:42:38 +01:00
e21756ea8c
Remove direct launch
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-10 16:22:37 +01:00
d53d58a5d4
LiteMod downloading
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-08 22:16:43 +01:00
e704072892
fix(flame install): don't assume .zip is a resource pack. default to mod
...
let identifier move it if needed
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-08 13:38:00 -07:00
