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 |
|
Trial97
|
09aca7a0b5
|
Added warning to settings page
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-22 10:52:35 +03:00 |
|
Trial97
|
45dad27a6d
|
fixed check
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-21 17:46:50 +03: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 |
|
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 |
|
Sefa Eyeoglu
|
3098aecf97
|
Merge pull request #1498 from Scrumplex/neoforge
|
2023-08-18 22:56:55 +02: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 |
|
Sefa Eyeoglu
|
e88418ab7f
|
Merge pull request #1392 from Scrumplex/feat-native-override
|
2023-08-17 16:09:16 +02: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
|
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
|
c22eec8f27
|
fixed crash on atlauncher pack install
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 17:03:51 +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
|
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 |
|
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 |
|