CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,264 Commits 10 Branches 30 Tags 34 MiB
52807ab279
Commit Graph

3026 Commits

Author SHA1 Message Date
Trial97
aa065f2b51
Updated dependency resolution 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 13:28:23 +03:00
Sefa Eyeoglu
2283498ccb
Merge pull request #1552 from Trial97/memory_quick_setup 2023-08-23 11:56:53 +02:00
Trial97
e6ba2f4970
Added loaders check on versions load 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 12:52:51 +03:00
Trial97
f8f9ffa118
added loaders for flame version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 11:33:45 +03:00
Trial97
4704c522e0
moved modloaderTypes to ModPlatform 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 10:26:57 +03:00
TheKodeToad
f7951f6082
Merge pull request #1548 from Trial97/version_label 
Reset status label when deleting instance
 2023-08-22 15:14:02 +01:00
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
Trial97
02264f67f3
Fixed codeql 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 14:15:51 +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
8e5be6f420
added suport for atlauncher browser download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 00:09:46 +03: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
Trial97
d25e89a4c1
refactor packwiz file write 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-20 00:48:46 +03: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
Trial97
fecc1e087a
Add Trial97 to contribuitors list 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 13:35:50 +03:00
Trial97
d3acac16e6
added -Wno-gnu-zero-variadic-macro-arguments and fixed more warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 13:10:13 +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
044ce4df32
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file 2023-08-17 15:24:14 +03:00
Trial97
758999fa64
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background 2023-08-17 15:23:22 +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
1faf741004
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 13:29:42 +03:00
TheKodeToad
8cff7c4de6
Merge branch 'develop' into rename-groups 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-15 11:03:19 +01: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
6c362afc21
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 12:41:46 +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
6d070e8607
"Format" 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-12 21:50:02 +01: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
TheKodeToad
f6d8c9659c
Rework 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-11 00:39:05 +01:00
TheKodeToad
e2d77f21ba
More system properties because yes!! 🎉 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-11 00:02:48 +01: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
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
f7e8ec1855
format files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-05 21:17:38 +03:00
Trial97
72de2d5254
Added missing header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-05 21:08:16 +03:00
TheKodeToad
f25d0a4e0e
Merge branch 'develop' into env-vars 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-05 18:01:53 +01:00
Trial97
1d3f2674d1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-05 19:21:37 +03:00
Trial97
f9ebcb5d2e
Merge branch 'refactor/net-split-headers-to-proxy-class' of https://github.com/Ryex/PrismLauncher into refactor/NetActions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-05 19:16:57 +03:00
Trial97
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
Trial97
91eb30f037
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog 2023-08-05 19:04:53 +03:00
Trial97
d936b25868
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-05 19:04:15 +03:00
Trial97
e7c2274893
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file 2023-08-05 19:02:11 +03:00
Trial97
377fc0352a
Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons 2023-08-05 19:00:12 +03:00
Trial97
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
Sefa Eyeoglu
304e294ea7
Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class 2023-08-04 20:31:43 +02:00
Sefa Eyeoglu
ae793f6cf1
Merge pull request #1459 from Scrumplex/format 2023-08-04 19:42:36 +02:00
Sefa Eyeoglu
1d638e018a
chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-04 19:41:47 +02:00
TheKodeToad
c5bffed21e
Merge branch 'PrismLauncher:develop' into skinfix 2023-08-04 16:29:30 +01:00
TheKodeToad
d48dd7eb6a
Use override-based setting for online fixes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-04 16:00:02 +01: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
1d468ac35a
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:35 +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
TheKodeToad
b572f75dba
Merge branch 'PrismLauncher:develop' into icon-indexing 2023-07-31 14:40:27 +01:00
Rachel Powers
14e16db01e
refactor(filelink): drop moved funciton 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 16:02:37 -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
1e947ca893
fix(flame creation task): import ApiDownload 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:42:15 -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
5d68a4c992
fix: religate export zip to launcher app only 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix(MMCZip): include QUrl

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix(FileLink): drop FreeConsole

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix(filelink exe): add console sources

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:24:50 -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
f03924478b
Merge branch 'fix/windows-console-attach' into feat/launcher-updater 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

# Conflicts:
#	launcher/Application.cpp
#	launcher/CMakeLists.txt
#	launcher/filelink/FileLink.cpp
 2023-07-30 14:30:16 -07:00
Rachel Powers
7c1a465ec9
Merge branch 'develop' into feat/launcher-updater 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 14:19:31 -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
Trial97
fcac98b367
removed comment 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 10:05:22 +03:00
Trial97
97ff7afbe7
keep the icon suffix 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 08:37:45 +03:00
Trial97
7e58b965b7
refactor icon list 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 01:20:05 +03:00
Trial97
1ca7e5efe9
added license header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 01:20:05 +03:00
Trial97
d460986de0
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 01:20:05 +03:00
Sefa Eyeoglu
bdec11c501
Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2 2023-07-27 09:40:31 +02:00
Sefa Eyeoglu
b1aa9e5846
refactor: introduce internal Launcher_ENABLE_UPDATER variable 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-27 09:37:56 +02:00
seth
51bfda937d
chore: don't include sparkle when not enabled 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-27 02:19:21 -04:00
LostLuma
4a9ea832ff
Ignore cache files entirely, also apply to modpack export 
Signed-off-by: LostLuma <lilly@lostluma.net>
 2023-07-27 01:42:14 +02:00
seth
48e5040196
feat: disable sparkle when update url is empty 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 19:01:39 -04:00
Trial97
62aa7a52c4
fiexed conflicts 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-27 00:07:38 +03:00
Trial97
3c472fd7e0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2 2023-07-27 00:05:59 +03:00
Trial97
b15f689ccf
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 2023-07-27 00:03:42 +03:00
Trial97
1e82cb6a7c
fix: add support for QByteArray inifile 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-26 23:56:01 +03:00
Alexandru Ionut Tripon
31b62203a7
Update launcher/ui/MainWindow.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-26 23:44:35 +03:00
seth
af59c41713
fix: typo in task.h 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 16:20:30 -04:00
Trial97
e6b4fc9182
removed quilt warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-26 21:36:40 +03:00
TheKodeToad
719d87de3b
Update MainWindow.ui 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-26 17:21:12 +01:00
TheKodeToad
816acc9c76 Open catpak folder action 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-26 17:19:39 +01:00
LostLuma
a9fefb2eeb
Address review comments 
Signed-off-by: LostLuma <lilly@lostluma.net>
 2023-07-26 15:22:22 +02:00
TheKodeToad
ce2d2c9f32
Merge pull request #1427 from tjw123hh/develop 
Add some missing strings to translations
 2023-07-26 13:41:54 +01:00