fbf6833124
Merge pull request #1519 from TheKodeToad/better-export-pack
2023-08-28 10:29:32 +02:00
9110fbf282
Merge pull request #1560 from Trial97/curse_multiple_loaders2
...
Add suport for flame multiple loaders
2023-08-27 18:21:14 +01:00
e3b04d10cf
Merge pull request #1536 from Trial97/time3
...
Allow showing playtime in hours
2023-08-27 18:14:04 +01:00
c5aac24a93
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse_multiple_loaders2
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-27 15:53:35 +03:00
df14f88307
Merge pull request #1532 from Trial97/curseforge-url-handle
2023-08-27 12:26:57 +02:00
abfd1a4205
minor dependency crash fix
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-25 18:35:25 +03:00
6178e5a975
reverted change for optional
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 13:55:38 +03:00
e6ba2f4970
Added loaders check on versions load
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 12:52:51 +03:00
4704c522e0
moved modloaderTypes to ModPlatform
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 10:26:57 +03:00
fff378b643
Merge pull request #1553 from TheKodeToad/list-fixes
...
A few boring list-related fixes
2023-08-21 15:33:16 +01:00
d7dadabfbf
List fixes
...
Double-click to toggle profile components.
Restore double-click to toggle resources.
Fix clicking on checkbox to select account.
Double-click to select account.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-21 14:44:46 +01:00
5b4dcae7d9
Revert "feat: add toggle for quilt beacon"
...
This reverts commit 89aaedc06c3eb7a035d8be593a7bbe417cb2f712.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-20 13:23:11 +02:00
963627fe98
Revert "chore: better explain quilt loader beacon"
...
This reverts commit a2a09ffe01fe8eb6cd1f557b0feb98ed0271151e.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-20 13:23:08 +02:00
f99b04bd16
Merge pull request #1320 from TheKodeToad/better-launch
...
Combine launch buttons in instance window, persist profiler
2023-08-19 11:08:02 +01:00
acf586ef82
chore: add fixme about UI code in Minecraftinstance
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-19 10:21:46 +02:00
3098aecf97
Merge pull request #1498 from Scrumplex/neoforge
2023-08-18 22:56:55 +02: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
6da2e7d3f6
I was forced
...
/j
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-17 10:12:38 +01:00
3e2733d840
Merge branch 'develop' into better-launch
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-16 22:23:38 +01:00
bad44ea264
feat:added flame install mod metadata
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-17 00:14:49 +03:00
3a0aa353cc
feat: add NeoForge to ModLoaderType
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 11:06:13 +02:00
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
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
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
