ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity
9,236 Commits 4 Branches 5 Tags 40 MiB
develop
Commit Graph

1030 Commits

Author SHA1 Message Date
Evan Goode
3e7b747926 Merge branch 'unmojang/8.2' into develop 2024-05-03 19:10:19 -04:00
Evan Goode
8acd7168dd Actually fix offline accounts on 1.16.4, 1.16.5 2024-05-03 19:07:44 -04:00
Evan Goode
614615a5fd Merge branch 'unmojang/fix-1.20' into develop 2024-05-03 17:44:15 -04:00
Evan Goode
d0550e998d Merge branch 'unmojang/fix-1.16-offline' into develop 2024-05-03 17:31:39 -04:00
Evan Goode
c0dc59ecfb whitespace 2024-05-03 17:31:00 -04:00
Evan Goode
e0796e5260 Merge remote-tracking branch 'furokku/develop' into develop 2024-05-03 17:28:03 -04:00
TheKodeToad
d2568333ed
Merge pull request #2048 from erikLundstedt/develop 
fix a minor spelling error in Mod.cpp
 2024-04-29 18:22:22 +01:00
BatteredBunny
1d2590b024 Clean up 
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
 2024-04-25 11:40:01 +03:00
Trial97
e07e182e95
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-04-24 23:51:43 +03:00
Trial97
3a4f82ffd1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-24 00:21:39 +03:00
TheKodeToad
7960282e07 Support neoforge.mods.toml 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 252406ba3e)
 2024-04-20 07:50:01 +00:00
TheKodeToad
252406ba3e
Support neoforge.mods.toml 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-19 21:19:36 +01:00
Trial97
b2cca30cd9 Moved getPathNameInLocal8bit inside FileSystem namespace 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3ddcadcdd1)
 2024-04-06 12:40:35 +00:00
Trial97
3e5e131a94 Moved the creation of natives folder in ExtractNatives task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 8ecab305ac)
 2024-04-06 12:40:35 +00:00
Trial97
1e5a29c423 Fixed crash on non-latin instance name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 450b73328e)
 2024-04-06 12:40:35 +00:00
Trial97
3ddcadcdd1
Moved getPathNameInLocal8bit inside FileSystem namespace 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-04 18:01:24 +03:00
Trial97
8ecab305ac
Moved the creation of natives folder in ExtractNatives task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-04 13:49:27 +03:00
Trial97
450b73328e
Fixed crash on non-latin instance name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-03 19:34:35 +03:00
Trial97
a0eba1ace6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-31 21:15:49 +03:00
Trial97
28cfd31269
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-29 10:30:42 +02:00
Alexandru Ionut Tripon
99203cbd9b
Merge pull request #2253 from Trial97/manual_backport 
Manual backport to 8.x
 2024-03-28 14:47:45 +02:00
Alexandru Ionut Tripon
7c2a9df98e
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-03-28 14:43:49 +02:00
Alexandru Ionut Tripon
b854c56c8c
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-03-28 14:43:40 +02:00
Trial97
2c864a4aad
added more microsoft error codes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-28 14:43:30 +02:00
Trial97
b255c8b17f
Changed the trait name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-28 14:39:32 +02:00
Tayou
0f178270be
Merge pull request #1786 from Trial97/deps_improve 
Make dependency checking more lax
 2024-03-27 20:42:26 +01:00
Tayou
0e5727315b
Merge pull request #2243 from Trial97/quick-play2 
Allow joining servers to work on 1.20 take 2
 2024-03-27 18:20:22 +01:00
Trial97
f6572c1244
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2024-03-27 18:55:34 +02:00
Alexandru Ionut Tripon
5117b21262
Merge pull request #1769 from Trial97/error_codes 
added more microsoft error codes
 2024-03-27 16:19:31 +02:00
Trial97
765bdf67c9
Changed the trait name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-27 00:56:12 +02:00
Trial97
23bdccc91d
Merge branch 'develop' of github.com:Trial97/PrismLauncher into quick-play 2024-03-26 23:58:56 +02:00
Trial97
3c12e27226
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-23 23:53:25 +02:00
Trial97
1a6dfd04d6
Made tar.gz parser 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-21 19:46:57 +02:00
Evan Goode
96b4933326 Merge Prism Launcher 8.2 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-03-21 10:59:32 -04:00
Alexandru Ionut Tripon
93f19bda6e
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-03-21 00:07:06 +02:00
Trial97
1c809f0fb1
Added more logs for auto java install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-20 17:39:10 +02:00
Trial97
09c2c6793b
Improve UI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-20 00:15:02 +02:00
Evan Goode
8f254cb63b Use either authlib-injector or system properties, not both 
Resolves https://github.com/fn2006/PollyMC/issues/154

In 1.20+, authlib-injector wants to intercept
https://api.minecraftservices.com/publickeys [0], but if we override the
services server using -Dminecraft.api.services.host, the request does
not get intercepted.

That's not an issue for API servers that implement the /publickeys
route, but Ely.by does not. A decent solution is to not set these
-Dminecraft.api.*.host system properties when authlib-injector is
available, since authlib-injector expects authlib to make requests to
Mojang's API servers.

[0] 18a0ce2669
 2024-03-18 13:05:46 -04:00
Trial97
1322277ae6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-03-17 20:57:53 +02:00
Evan Goode
639a7820fe Fix offline multiplayer in 1.16.4-1.16.5 
Resolves https://github.com/fn2006/PollyMC/issues/150

If the game is launched in offline mode, pass invalid API servers via
the -Dminecraft.api.* system properties. This workaround is mentioned
here:
https://github.com/FabricMC/fabric-loom/issues/915#issuecomment-1609154390

I think this change is appropriate to make here in PollyMC even though
the Fabric developers decided against using it there. If a user wants to
override the API servers back to the vanilla values (in order to use
Auth Me or something), they can do so by setting the following custom
JVM args on the instance:

-Dminecraft.api.env=PROD
-Dminecraft.api.auth.host=https://authserver.mojang.com
-Dminecraft.api.account.host=https://api.mojang.com
-Dminecraft.api.session.host=https://sessionserver.mojang.com
-Dminecraft.api.services.host=https://api.minecraftservices.com

Previously, auth args would override any user-specified args, but this
patch also changes that behavior so user-specified args are now passed
last.
 2024-03-04 21:53:58 -05:00
furokku floc
d4635c1a04
forgot a thing 2024-03-03 23:08:22 +02:00
furokku floc
6e29802de9
change tabs to spaces 2024-03-03 23:06:12 +02:00
Trial97
a288779790
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-02-18 16:49:35 +02:00
DioEgizio
44327980db feat: add "use zink" button 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-18 13:30:55 +01:00
Trial97
b4f3a969b3
Updated strings that are displayed to user 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 14:30:38 +02:00
Trial97
5232b3cd89
Added some logs and fixed natives extraction 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-17 12:17:00 +02:00
Trial97
ea2adf909d
Added progeess dialog to autodownload java 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-17 11:14:32 +02:00
Echo J
6da36140eb Use absolute path to load MangoHUD library 
This should finally fix the Arch Linux Java symbol issue with MangoHUD
enabled: https://bugs.archlinux.org/task/77183

Signed-off-by: Echo J <tcg96nougat@gmail.com>
(cherry picked from commit 01180c20e1)
 2024-02-17 00:57:29 +00:00
Trial97
2941307581
Added basic java auto-detect and auto-download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-16 23:42:39 +02:00
Echo J
01180c20e1 Use absolute path to load MangoHUD library 
This should finally fix the Arch Linux Java symbol issue with MangoHUD
enabled: https://bugs.archlinux.org/task/77183

Signed-off-by: Echo J <tcg96nougat@gmail.com>
 2024-02-14 10:11:49 +02:00
Trial97
031a9f4738
Replaced QFile::remove with FS::deletePath 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-10 11:03:51 +02:00
TheKodeToad
25ba275230
Revert "[Backport release-8.x] Use minecraft instead of .minecraft for better accessibility" 2024-02-04 16:08:16 +00:00
furokku
2d2b082539 fixes #63 2024-02-03 23:42:19 +02:00
Trial97
82b15268bc
preparing java autodownload 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-03 00:11:05 +02:00
Trial97
3c58fb0677
Moving files around 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-02 15:51:32 +02:00
TheKodeToad
5e3b7d88ec Use minecraft instead of .minecraft for better accessibility 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit f54ac25614)
 2024-02-01 17:16:29 +00:00
Trial97
81282bf7e0
Autodetect Java? 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-26 00:22:05 +02:00
Trial97
e897032383
Added java metadata 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-25 22:22:21 +02:00
BatteredBunny
187475e35f Adjusted AuthServerColumn to return authlibInjectorUrl instead of authServerUrl, make the column auto-resize 
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
 2024-01-23 22:38:41 +02:00
TheKodeToad
f54ac25614
Use minecraft instead of .minecraft for better accessibility 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-21 02:28:55 +00:00
erik.lundstedt
30913fdb2b fix a minor spelling misstake in Mod.cpp 
closes https://github.com/PrismLauncher/PrismLauncher/issues/2047

Signed-off-by: erik.lundstedt <erik@lundstedt.it>
 2024-01-21 00:31:00 +01:00
BatteredBunny
5c95f10f64 Add auth server column to account list 
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
 2024-01-19 00:40:35 +02:00
Alexandru Ionut Tripon
422135b2ab
Merge pull request #1771 from Trial97/account 
Try refreshing account on launch if needed
 2024-01-10 16:24:34 +02:00
Alexandru Ionut Tripon
dbdec15ddb
Merge pull request #1771 from Trial97/account 
Try refreshing account on launch if needed
 2024-01-10 16:07:09 +02:00
Trial97
a7d293b3f2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-10 09:17:52 +02:00
Trial97
57913f1943
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo 2024-01-07 22:31:25 +02:00
tildejustin
5f4e0dfc14 remove legacy processArguments code 
Signed-off-by: tildejustin <spacepepper3.14@gmail.com>
(cherry picked from commit eca5d88576)
 2024-01-05 12:27:13 +00:00
tildejustin
eca5d88576 remove legacy processArguments code 
Signed-off-by: tildejustin <spacepepper3.14@gmail.com>
 2023-12-24 22:20:06 -05:00
Trial97
13d29ac6f4
Updated the size sort code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-12-22 23:35:48 +02:00
lumiscosity
7568e90655 Update GetModDependenciesTask.cpp 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 8cbdecc454)
 2023-12-16 16:25:35 +00:00
lumiscosity
8cbdecc454
Update GetModDependenciesTask.cpp 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
 2023-12-16 12:52:59 +01:00
Trial97
763eab6b96
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-12-13 14:48:31 +02:00
Sefa Eyeoglu
426deb4454
Merge pull request #1694 from Trial97/concurrent 2023-12-11 11:20:17 +01:00
Trial97
463ff4c6ae
Removed assert permanantly 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-27 11:30:07 +02:00
Trial97
20e0cb43b9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-11-23 23:58:47 +02:00
Trial97
2db5677281
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-11-23 23:57:44 +02:00
Trial97
e0d776e551
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2023-11-23 23:29:10 +02:00
Trial97
af628be648
Merge branch 'error_codes' of github.com:Trial97/PrismLauncher into error_codes 2023-11-23 23:20:27 +02:00
Trial97
3c75d761a2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into error_codes 2023-11-23 23:11:11 +02:00
Trial97
b47ec7f2dc
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2023-11-23 17:14:50 +02:00
Trial97
3234bb5a8c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve 2023-11-23 17:05:37 +02:00
Trial97
2318a83881
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2023-11-23 16:33:57 +02:00
Trial97
be67067fa2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo 2023-11-23 16:23:56 +02:00
Trial97
944ed48a61
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into time4 2023-11-23 14:58:05 +02:00
Trial97
908072710a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-23 14:34:56 +02:00
Trial97
80383d237a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2023-11-23 13:38:11 +02:00
Trial97
9345416361
Fixed localization stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-23 12:36:40 +02:00
Sefa Eyeoglu
a2aa303770
Merge pull request #1843 from Trial97/fix_not_found_dep 2023-11-23 11:02:16 +01:00
Sefa Eyeoglu
a966289944
Merge pull request #1852 from Trial97/war_ning 2023-11-23 11:01:53 +01:00
Sefa Eyeoglu
7c9c3d2c5f
Merge pull request #1815 from Trial97/fix_mangohub 2023-11-23 11:00:57 +01:00
Sefa Eyeoglu
d60d089cbc
Merge pull request #1751 from LocalSpook/account_type 2023-11-23 10:27:06 +01:00
Trial97
670a0c1442
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2023-11-23 10:46:03 +02:00
Trial97
f18f7147b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into war_ning 2023-11-23 10:44:49 +02:00
Sefa Eyeoglu
b42434bcb6
Merge remote-tracking branch 'upstream/develop' into const-in-declarations 2023-11-23 09:06:23 +01:00
Trial97
e3af4f9a78
Fixed playtime recording 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-22 20:34:12 +02:00
Trial97
85b4e1f24f
Made column hidden by default 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-22 19:23:24 +02:00
Trial97
140a55810d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-11-22 14:20:30 +02:00
Trial97
54c308e5b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 21:15:12 +02:00
Trial97
26931475ae
made folder size reflect the number of elements 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 15:58:30 +02:00
Trial97
1a06a1424b
Added custom env vars to pre/post launch commands 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-18 10:53:38 +02:00
Evan Goode
bc709f8adc Fix authlib-injector not working w/other Java agents 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-18 00:46:15 -05:00
Trial97
6b777653a5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:38:17 +02:00
Trial97
2bfb5fc138
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:26:17 +02:00
Evan Goode
8f540a5af1 Correctly save Mojang account type 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-16 12:33:03 -05:00
Evan Goode
dcc2d77ebb Fix offline accounts 
Original authlib-injector work had a bug making offline accounts not
save correctly.
 2023-11-16 01:15:17 -05:00
Evan Goode
cdb2f09bd4 Merge branch 'unmojang' into unmojang-8.0 2023-11-15 21:23:01 -05:00
Evan Goode
be8c8ad9ad Auto migrate Ely.by accounts to authlib-injector 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-15 15:23:24 -05:00
Evan Goode
9430026192 Merge tag '8.0' into unmojang-8.0 
Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0

(Imcomplete) list of changes in 8.0 relevant to PollyMC:
- Prism has dropped support for Mojang accounts
  - https://github.com/PrismLauncher/PrismLauncher/pull/1656
  - Added it back to PollyMC primarily since the Mojang authentication
    code is also used for authlib-injector accounts. Some users may also
    still want to be able to log in to Mojang accounts for some reason:
    https://github.com/fn2006/PollyMC/issues/115#issuecomment-1805384658,
    even if they do not provide authentication to multiplayer servers.
  - To my surprise, I could still log in to a Mojang account, get its
    skin, and launch the game. Authentication to servers, of course, did
    not work.
  - Tested: logging into authlib-injector, Mojang, and MSA accounts and
    launching the game.
- Prism has added a built-in updater for Windows and Linux that I assume
  provides similar functionality to Sparkle on macOS:
  https://github.com/PrismLauncher/PrismLauncher/pull/1268. There is a
  Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies
  the repo checked by the updater. I have changed this to the PollyMC
  repository, and since PollyMC follows almost the same CI/release
  patterns as Prism Launcher, it might work with PollyMC, too, but I
  have not tested it yet.
- Add macOS support to Nix
  - https://github.com/PrismLauncher/PrismLauncher/pull/1485
  - Untested
- The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were
  renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their
  "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts.
- Removed Windows MSVC Legacy builds
- Removed Quilt Beacon toggle, the beacon is now always disabled:
  https://github.com/PrismLauncher/PrismLauncher/pull/1547,
  https://github.com/PrismLauncher/meta/pull/23
- Prism removed FTB support in 7.0, but I tested creating an FTB
  instance to make sure it still works in 8.0

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-15 14:37:14 -05:00
Evan Goode
b1738deffb authlib-injector: Mark correct account as in use 
Fixes a bug where the wrong account could be marked as "in use" when the
game is launched if there are multiple accounts that share the same
profile ID. This can lead to the launcher trying to refresh an account
that's currently in use by the game, leading to "Invalid session" errors
in-game.

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-15 12:11:12 -05:00
Trial97
215465e833
added subdirectories to iteration 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-15 14:11:34 +02:00
Trial97
4d93f4adb1
Fixed folder size 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-15 12:10:47 +02:00
Trial97
890965746f
Added warning on mods update while running 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-15 11:07:46 +02:00
Trial97
361329d5d1
Made resource columns resizable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-14 23:21:53 +02:00
Trial97
c05c001ab2
Remove the dep if it fails for any reason 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-13 23:49:49 +02:00
Trial97
50a4d61ded
Fixed demo mode 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-10 23:26:41 +02:00
Trial97
463608b289
fixed shader packs detection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-10 19:37:11 +02:00
Trial97
e4fecd1f97
Made sure mangoHub libs are present 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-08 11:55:38 +02:00
Trial97
7a0b2a316a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 23:19:58 +02:00
TheKodeToad
baa988ec81
Merge pull request #1739 from Trial97/mod_icons 
fixed squished mod icons
 2023-11-06 20:49:05 +00:00
Trial97
867e6223ce
Fixed mangoHub loading 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-05 23:48:26 +02:00
Trial97
f828ea8929
updated the texture pack tooltips 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-04 11:49:05 +02:00
Trial97
a4978946d5
disabled lax deps 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-04 00:07:51 +02:00
Trial97
2b6d8b8a2d
updated tooltip messages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 23:02:17 +02:00
Trial97
4081c51573
made dependency check more lax 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-02 23:52:12 +02:00
Trial97
3cbc63bb9f
added size column 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-02 12:18:24 +02:00
Alexandru Ionut Tripon
60fd7f0ae6
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-10-31 08:43:26 +02:00
Trial97
e42a2404a9
added more microsoft error codes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-30 22:55:23 +02:00
LocalSpook
0de4d8902e Remove top-level const qualifiers in function declarations 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-28 22:12:09 -07:00
Tayou
69c2720872
Merge pull request #1691 from Trial97/no_color 
Add no_color env variable
 2023-10-28 18:02:53 +02:00
Tayou
df2a92d5f4
Merge pull request #1742 from TayouVR/fix-resourcepack-crash 
fix switch/case fallthrough in resource parse tasks
 2023-10-28 12:44:40 +02:00
LocalSpook
9d972ccc63 Localize account type in account list 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-26 13:32:33 -07:00
Sefa Eyeoglu
3719ea21b0
Merge pull request #1355 from TheKodeToad/env-vars 
Custom environment variables
 2023-10-26 22:10:26 +02:00
Trial97
12d567a9b8
made env vars behave like the rest of the settings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 22:51:38 +03:00
Trial97
60a7628dbb
delete duplicate mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 20:43:26 +03:00
Trial97
3d84635b24
Remove file on mod duplication 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 20:09:12 +03:00
Trial97
321bbf1fa8
fixed asan stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 19:06:38 +03:00
Trial97
04acd27dab
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-10-26 13:45:47 +03:00
Trial97
8b8ea2d270
ensured that the variant is allways uppercase 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 13:37:25 +03:00
Trial97
44cdf3f697
Fixed skin variant 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 13:33:00 +03:00
Trial97
263dc5af67
Fixed remane and delete of selected skin 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-25 19:56:26 +03:00
Trial97
a5938a7de9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-25 19:26:05 +03:00
LocalSpook
5be80df1ee Replace typedef with using 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-24 01:36:27 -07:00
Sefa Eyeoglu
b376888f43
Merge pull request #1515 from TheKodeToad/sysprops 2023-10-22 21:57:11 +02:00
Tayou
0fe3241df6
remove now unneeded Q_ASSERTs 
Signed-off-by: Tayou <git@tayou.org>
 2023-10-22 21:25:06 +02:00
Tayou
7d5206818b
fix switch/case fallthrough 
Signed-off-by: Tayou <git@tayou.org>
 2023-10-22 21:25:00 +02:00
Sefa Eyeoglu
db19362a97
feat: add launcher brand and version props 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-10-22 21:19:44 +02:00
Trial97
a748f49362
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-10-22 11:34:55 +03:00
Trial97
932cd9e262
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-22 11:32:05 +03:00
Trial97
d151e97e3a
Fixed some headers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-21 22:40:37 +03:00
Trial97
35d62cc5f2
Updated dependencies 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-21 19:05:31 +03:00
Trial97
9aac8e389f
made release type visible 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-21 18:48:55 +03:00
Alexandru Ionut Tripon
2c4af7e793
Merge pull request #1290 from Trial97/refactor/NetActions 
Refactor ImgurUpload
 2023-10-21 12:32:16 +01:00
Trial97
5d926582c7
added Image column size hint 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 19:08:56 +03:00
Trial97
7b62d14683
fixed squished mod icons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 17:15:12 +03:00
TheKodeToad
e9fd02baca
Fix code style 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-20 13:12:16 +01:00
TheKodeToad
cf33927f21
Merge remote-tracking branch 'upstream/develop' into sysprops 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-19 11:28:07 +01:00
Trial97
30f73a0696
Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into concurrent 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-18 18:08:31 +03:00
Trial97
fea4c4eba8
Updated filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-18 09:00:45 +03:00
Trial97
b54376062e
Added mcVersion column 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-17 19:25:01 +03:00
Trial97
9001d9eb75
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-10-17 18:32:18 +03:00
Trial97
869f654a10
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-16 22:46:11 +03:00
TheKodeToad
cc990c4f94
Merge branch 'develop' into env-vars 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-15 21:57:20 +01:00
TheKodeToad
c4882e7162
Merge pull request #443 from TheKodeToad/skinfix 
Add legacy skin fix
 2023-10-15 21:46:29 +01:00
Trial97
ca9b593483
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 2023-10-15 20:44:45 +03:00
Trial97
749975e8ef
made side and loaders visible to user 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-15 12:46:23 +03:00
Trial97
5f7513d61c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-10 19:49:40 +03:00
Trial97
0b6373e4df
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-10 19:46:27 +03:00
Alexandru Ionut Tripon
4eb8db16f1
Merge pull request #1543 from Trial97/packwiz 
refactor packwiz file write
 2023-10-10 16:16:57 +01:00
Alexandru Ionut Tripon
6150908025
Merge pull request #1658 from Trial97/neoforge_version 
Added version check for neoforge filter
 2023-10-10 16:16:21 +01:00
Trial97
8d0a53273f
Add no_color env variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-06 18:42:54 +03:00
Alexandru Ionut Tripon
bca5e8f395
Update launcher/minecraft/PackProfile.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-10-06 16:16:03 +03:00
Trial97
e913f61305
added a more strict condition for neoforge forge support 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-04 19:29:37 +03:00
Tayou
024c474658
Merge pull request #1678 from Trial97/release_order 
fixed quilt dependencies
 2023-10-04 10:28:45 +02:00
Sefa Eyeoglu
03ad430699
Merge pull request #1537 from Trial97/warnings 2023-10-04 09:40:38 +02:00
Trial97
ac38585a2a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into release_order 2023-10-04 09:41:49 +03:00
Trial97
3cba5adb5a
updated dependency cycle 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-04 09:41:40 +03:00
Sefa Eyeoglu
bfa9613373
Merge pull request #1657 from Trial97/shader_txt 2023-10-02 11:56:50 +02:00
cullvox
87f34f07d7
Merge branch 'develop' into components-resource-pack-fix 
Signed-off-by: cullvox <68567525+cadenmiller@users.noreply.github.com>
 2023-10-01 11:58:44 -04:00
Sefa Eyeoglu
eab1180f68
Merge pull request #1090 from Ryex/feat/acknowledge_release_type 2023-10-01 14:32:58 +02:00
Sefa Eyeoglu
e3a147f56d
Merge pull request #1656 from Trial97/remove_mojang2 2023-10-01 14:32:42 +02:00
Alexandru Ionut Tripon
317c7b5544
Update launcher/minecraft/auth/AccountList.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-10-01 00:32:17 +03:00
Trial97
2e4fcd6aa3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 23:26:15 +03:00
Trial97
4802f6950e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 23:06:18 +03:00
Sefa Eyeoglu
531b58093e
Merge pull request #1263 from Trial97/develop 2023-09-28 22:03:14 +02:00
Sefa Eyeoglu
2ff9ef0620
Merge pull request #1363 from Trial97/download_threads 2023-09-28 22:02:57 +02:00
Trial97
9acbf98f94
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 22:50:12 +03:00
seth
f370f0d749
chore: cleanup a few more mentions of mojang accounts 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-27 05:34:48 -04:00
Trial97
4ee6a6711d
Added version check for neoforge filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 23:04:21 +03:00
Trial97
86b47b3421
Do not display invalid shaders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 22:33:36 +03:00
Trial97
7c636d4608
Removed mojang 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 17:44:04 +03:00
alexia
1684cff7ac
Update links to Minecraft Wiki 
Minecraft Wiki has officially moved from Fandom to their own wiki.
I updated some links I found in comments.

Signed-off-by: alexia <me@alexia.lol>
 2023-09-25 15:49:12 +02:00
Evan Goode
aa589701ed Automatically install authlib-injector when missing 
Add MissingAuthlibInjectorBehavior setting to control this behavior

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-09-23 18:53:14 -04:00
Alexandru Ionut Tripon
81a3ba18bc
Update launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-09-20 18:45:23 +03:00
Trial97
0e41ceffc4
removed missed header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-16 19:18:58 +03:00
Trial97
01e98a6ce8
simplify the raw json parsing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Fixed Tests

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-16 19:12:09 +03:00
cullvox
e96d0b6caf DCO Remediation Commit for cullvox <cullvox@outlook.com> 
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: ee7016fa54

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-13 14:31:04 -04:00
cullvox
e1dda6c005 DCO Remediation Commit for cullvox <cullvox@outlook.com> 
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: ddf0c28b1b

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-12 21:50:33 -04:00
cullvox
ddf0c28b1b clang-format fixes 2023-09-12 21:45:29 -04:00
cullvox
a4e6530513 added tests, fixed issues with overriding/format 
In the documentation it states that child values can override the parent
values. Originally this code did not support that but now it does. Also
added in testing inspired by the previous tests.

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-12 21:34:42 -04:00
cullvox
df88ccd419 clean up and add review suggestions, links open 
Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-11 15:49:01 -04:00
cullvox
b16085f66c attempt to fix clang-format and ubuntu build. 
Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-11 02:05:05 -04:00
cullvox
fbe4043651 fix formatting and add more proper errors. 
Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-11 01:34:53 -04:00
cullvox
58bd6d929f added formatting with colors. 
This is somewhat dirty implementation and I will clean it up soon.
Using the HTML rich text features of Qt, made it much easier to
understand what was needed.

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-10 23:37:26 -04:00
Trial97
9445a555e4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packwiz 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-10 16:24:59 +03:00
Trial97
47d1f23568
added side for modrinth mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-10 16:22:57 +03:00
cullvox
7a7c3015f4 fix not properly reading json text. 
The text now displays properly in the GUI of Prism.

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-09 20:25:49 -04:00
cullvox
1261908ef7 remove space for clang-format 
Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-09 19:55:55 -04:00
cullvox
ef1dc2afac DCO Remediation Commit for cullvox <cullvox@outlook.com> 
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: 05f4214cc5

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-09 19:50:59 -04:00
cullvox
05f4214cc5 fix clang-format failing 2023-09-09 19:50:13 -04:00
cullvox
04aa0155bf DCO Remediation Commit for cullvox <cullvox@outlook.com> 
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: d2e662ddbb

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-09 19:45:30 -04:00
cullvox
093d09efe3 fix style, and use qWarning instead of throw. 
Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-09 19:03:33 -04:00
cullvox
d2e662ddbb added support for components in resource pack descriptions. 
Signed-off-by: Caden Miller <me@cadenmiller.dev>
 2023-09-09 12:35:34 -04:00
Trial97
6ec1cf6e49
made skin upload more generic 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-08 19:50:46 +03:00
fn2006
ca5574130f Only check migration eligibility for Mojang accounts 2023-09-05 21:47:37 +01:00
Trial97
8c8e4329d7
fix codeql 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-05 23:45:32 +03:00
Trial97
8bad255a91
added more import options 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-05 20:13:16 +03:00
Evan Goode
a980b4d537 Clean up authlib-injector merge, mostly clang-format 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-09-05 00:13:50 -04:00
Trial97
ab648e58ce
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2023-09-05 00:18:45 +03:00
Trial97
c86b8b0f70
added skin manage dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-05 00:18:36 +03:00
Evan Goode
9d442a0348 authlib-injector 
* 'Custom Yggdrasil' AccountType

Signed-off-by: Evan Goode <mail@evangoo.de>

* Allow multiple accounts with the same player UUID

Signed-off-by: Evan Goode <mail@evangoo.de>

* Use correct services server URL for SkinDelete

Signed-off-by: Evan Goode <mail@evangoo.de>

* Correctly use CustomYggdrasilRefresh, add warning message

Signed-off-by: Evan Goode <mail@evangoo.de>

* Custom Yggdrasil: Readability fixes

Also made the MinecraftEntitlement for Custom Yggdrasil accounts work
just like offline accounts---instead of checking the reply from the auth
server, Custom Yggdrasil accounts are granted canPlayMinecraft and
ownsMinecraft when they are created, in MinecraftAccount.cpp.

Signed-off-by: Evan Goode <mail@evangoo.de>

* Custom Yggdrasil: Add extra confirmation dialog

Signed-off-by: Evan Goode <mail@evangoo.de>

* Add install authlib-injector button

Signed-off-by: Evan Goode <mail@evangoo.de>

* authlib-injector accounts

Signed-off-by: Evan Goode <mail@evangoo.de>

* Suggest installing authlib-injector when needed

Signed-off-by: Evan Goode <mail@evangoo.de>

* Use Unmojang metadata

Signed-off-by: Evan Goode <mail@evangoo.de>

* Use std::string for MANAGED_AGENTS, not QString

---------

Signed-off-by: Evan Goode <mail@evangoo.de>

Resolve X-Authlib-Injector-API-Location

Signed-off-by: Evan Goode <mail@evangoo.de>

Prefetch authlib-injector metadata

Resolves https://github.com/unmojang/PrismLauncher/issues/4

See https://github-com.translate.goog/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83?_x_tr_sl=auto&_x_tr_tl=en&_x_tr_hl=en-US#%E9%85%8D%E7%BD%AE%E9%A2%84%E8%8E%B7%E5%8F%96

Signed-off-by: Evan Goode <mail@evangoo.de>

drag-and-drop authlib-injector URL, clang-format

Resolves https://github.com/unmojang/PrismLauncher/issues/2

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-09-04 19:00:18 +01:00
Sefa Eyeoglu
d483b613b1
Merge pull request #1578 from TheKodeToad/antialiasing 2023-09-04 17:05:29 +02:00
Sefa Eyeoglu
546d49e183
Merge pull request #1530 from Trial97/metadata_delete 2023-09-04 17:02:52 +02:00
fn2006
65821b54e6 Remove current Ely.by implementation 2023-09-04 01:35:37 +01:00
fn2006
be1d2a6070 Merge remote-tracking branch 'upstream/develop' into develop 2023-09-04 00:45:11 +01:00
fn2006
70e6f323fe fix regressions 2023-09-04 00:43:23 +01:00
fn2006
b6904ba50a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-09-04 00:39:20 +01:00
TheKodeToad
347228a246
Legacy settings override default -> false 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:29:26 +01:00
TheKodeToad
1213a5ab46
Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:27:57 +01:00
Trial97
abbac5c26c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 22:28:59 +03:00
Trial97
609eaa67ab
refactored skin apis 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 21:23:51 +03:00
TheKodeToad
f23a8e4b4b
Enable antialiasing for mod and pack icons 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-29 23:34:19 +01:00
Sefa Eyeoglu
fbf6833124
Merge pull request #1519 from TheKodeToad/better-export-pack 2023-08-28 10:29:32 +02:00
Trial97
0680d2dceb
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 20:41:56 +03:00
TheKodeToad
9110fbf282
Merge pull request #1560 from Trial97/curse_multiple_loaders2 
Add suport for flame multiple loaders
 2023-08-27 18:21:14 +01:00
TheKodeToad
e3b04d10cf
Merge pull request #1536 from Trial97/time3 
Allow showing playtime in hours
 2023-08-27 18:14:04 +01:00
Trial97
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
Sefa Eyeoglu
df14f88307
Merge pull request #1532 from Trial97/curseforge-url-handle 2023-08-27 12:26:57 +02:00
TheKodeToad
d1566f2610
Merge branch 'develop' into env-vars 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-26 23:12:02 +01:00
Trial97
abfd1a4205
minor dependency crash fix 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-25 18:35:25 +03:00
Trial97
6178e5a975
reverted change for optional 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 13:55:38 +03: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
4704c522e0
moved modloaderTypes to ModPlatform 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 10:26:57 +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
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
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
ab6301d5a1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-19 00:38:40 +03:00