CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,980 Commits 10 Branches 30 Tags 34 MiB
eab1180f68
Commit Graph

2818 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
eed7e996da
Update launcher/ui/widgets/JavaSettingsWidget.cpp 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-22 16:17:05 +03:00
Alexandru Ionut Tripon
06dbd381f8
Update launcher/ui/pages/instance/InstanceSettingsPage.cpp 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-22 16:16:57 +03:00
Alexandru Ionut Tripon
3574d89e0f
Update launcher/ui/pages/global/JavaPage.cpp 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-22 16:16:50 +03:00
TheKodeToad
0e96111116
Merge pull request #1556 from Trial97/metacache 
Gracefully handle invalid cache metadata
 2023-08-22 14:09:44 +01:00
Trial97
09aca7a0b5
Added warning to settings page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-22 10:52:35 +03:00
Sefa Eyeoglu
b1783d8fb1
Merge pull request #1557 from Trial97/curse_crash 2023-08-21 23:04:45 +02:00
Trial97
c3d03f0c33
added check for valid query items in curse url install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 22:20:33 +03:00
Trial97
7acfe36a62
fixed httpmetacache load 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 21:30:44 +03:00
Trial97
45dad27a6d
fixed check 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 17:46:50 +03:00
TheKodeToad
fff378b643
Merge pull request #1553 from TheKodeToad/list-fixes 
A few boring list-related fixes
 2023-08-21 15:33:16 +01:00
TheKodeToad
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
Trial97
1eb75b6852
fixed build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 15:34:45 +03:00
Trial97
492bf373c6
updated memory allocation on quick setup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 15:00:11 +03:00
Danny Dorazio
3638fc0a7d Update “Welcome” message on account list page 2023-08-20 23:00:50 -04:00
Danny Dorazio
8092c321a9 Replace instances of “Minecraft account” 2023-08-20 23:00:25 -04:00
Trial97
19316e22b4
fixed status label after instance remove 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-20 22:46:44 +03:00
Trial97
254444470f
renamed enum type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-20 16:40:58 +03:00
Sefa Eyeoglu
5b4dcae7d9
Revert "feat: add toggle for quilt beacon" 
This reverts commit 89aaedc06c.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-20 13:23:11 +02:00
Sefa Eyeoglu
963627fe98
Revert "chore: better explain quilt loader beacon" 
This reverts commit a2a09ffe01.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-20 13:23:08 +02:00
TheKodeToad
ebbc8838a8
Merge pull request #1541 from Trial97/neoforge_search 
feat:neoforge can download forge mods
 2023-08-19 23:10:56 +01:00
TheKodeToad
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
Sefa Eyeoglu
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
Trial97
0138cd65cb
feat:neoforge can download forge mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-19 09:00:59 +03:00
Trial97
ab6301d5a1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-19 00:38:40 +03:00
Sefa Eyeoglu
3098aecf97
Merge pull request #1498 from Scrumplex/neoforge 2023-08-18 22:56:55 +02:00
Trial97
05094b7382
more fixes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 22:24:30 +03:00
Trial97
58efd3e9e2
fixed code scaning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 21:43:57 +03:00
Trial97
4c52b18bdd
replaced removeFirst with mid 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 20:19:51 +03:00
Trial97
44ff247f5f
feat:refactored modpack ux 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 20:03:02 +03:00
Alexandru Ionut Tripon
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
Trial97
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
Sefa Eyeoglu
f4ebeedc21
fix: fix browse button size in skin upload dialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-18 09:01:57 +02:00
Sefa Eyeoglu
be2888d6fb
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-17 22:23:50 +02:00
Trial97
7ab391904a
Flame support for neoforge 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-17 22:23:34 +02:00
Sefa Eyeoglu
aac734d174
fix: add theoretical support for NeoForge in FTB modpacks 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-17 22:21:12 +02:00
TheKodeToad
ffd8ed550f
Reformat 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-17 18:53:32 +01:00
Trial97
c5bac475e8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-17 17:29:57 +03:00
Sefa Eyeoglu
e88418ab7f
Merge pull request #1392 from Scrumplex/feat-native-override 2023-08-17 16:09:16 +02:00
Trial97
bc0934a19c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle 2023-08-17 15:25:32 +03:00
Trial97
4a1d85f999
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-17 14:23:37 +03:00
TheKodeToad
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
Sefa Eyeoglu
85f36ebed7
Merge pull request #981 from Ryex/curseforge-url-handle 2023-08-17 09:24:35 +02:00
Trial97
f8ffb14619
Merge branch 'curseforge-url-handle' of github.com:Trial97/PrismLauncher into curseforge-url-handle 2023-08-17 00:25:38 +03:00
Trial97
5e2d1ffdfb
removed line 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-17 00:23:53 +03:00
TheKodeToad
3e2733d840
Merge branch 'develop' into better-launch 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-16 22:23:38 +01:00
Trial97
bad44ea264
feat:added flame install mod metadata 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-17 00:14:49 +03:00
Trial97
f0da16a758
removed line 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-17 00:13:12 +03:00
Trial97
b0e197de38
removed warning for one mod selected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-16 21:26:43 +03:00
Alexandru Ionut Tripon
6c2c724bd9
Update launcher/ui/pages/instance/ExternalResourcesPage.ui 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-16 21:03:09 +03:00
Trial97
f919d363b7
made safe for vegetarians 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-16 20:02:32 +03:00
Trial97
589d8b6923
feat:Added remove metadata button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-16 19:53:39 +03:00
Trial97
c22eec8f27
fixed crash on atlauncher pack install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 17:03:51 +03:00
Trial97
cf27d2f9ab
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 12:49:21 +03:00
Trial97
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
Sefa Eyeoglu
62c14cea2a
fix: allow NeoForge in resource APIs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 11:06:14 +02:00
Sefa Eyeoglu
01c3750835
feat: support NeoForge mrpack modpacks 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 11:06:14 +02:00
Sefa Eyeoglu
52e5ee7111
feat: add NeoForge to UIs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 11:06:14 +02:00
Sefa Eyeoglu
3a0aa353cc
feat: add NeoForge to ModLoaderType 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 11:06:13 +02:00
Sefa Eyeoglu
8f5bb982cd
Merge pull request #1513 from lumiscosity/fix/skin_transparency_bug 2023-08-15 10:54:07 +02:00
Sefa Eyeoglu
a360ddbe0b
Merge pull request #1508 from comp500/fix/allow-empty-lines 2023-08-15 10:53:43 +02:00
Sefa Eyeoglu
06aba530d7
fix: add missing header 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 10:52:40 +02:00
Sefa Eyeoglu
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
Sefa Eyeoglu
b927e58126
fix: improve debug message 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 10:52:08 +02:00
Sefa Eyeoglu
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
Sefa Eyeoglu
83aa0062c7
feat: add custom native library path settings 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 10:51:21 +02:00
Sefa Eyeoglu
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
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
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
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
Trial97
71890707c0
format and apply the sugestion 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-12 13:08:39 +03:00
Alexandru Ionut Tripon
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
Sefa Eyeoglu
35358f8180
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings 2023-08-12 11:17:11 +02:00
Sefa Eyeoglu
019e5ca3e8
fix: use ApiDownload for CF URL handling 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-12 11:11:58 +02:00
Sefa Eyeoglu
6423edaa76
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle 2023-08-12 10:58:27 +02:00
Sefa Eyeoglu
73adac2501
fix: use QColorConstants in Qt 5.14+ 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-11 15:57:12 +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
maple!
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
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
comp500
1c3449e5a2 Remove unnecessary #if 
Signed-off-by: comp500 <comp500@users.noreply.github.com>
 2023-08-09 23:04:44 +01:00
comp500
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
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
Sefa Eyeoglu
74fe2fb2a6
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle 2023-08-06 21:54:00 +02:00
Sefa Eyeoglu
a83e5be8f2
fix: makeShared for QByteArray 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-06 21:51:03 +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