Commit Graph

1330 Commits

Author SHA1 Message Date
f30cfcd6a5
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: sneedium <sneed@sneedmc.org>
2024-09-03 20:25:51 -04:00
90
a2932ef8a8
Don't offset every existing ModAPI enum entry
Signed-off-by: 90 <hi@90.gripe>
2024-06-24 18:40:37 +01:00
bc357afd78
fix lack of include
Signed-off-by: sneedium <sneed@sneedmc.org>
2024-06-20 16:42:20 -04:00
90
5e56b8cc30
Add NeoForge support
Signed-off-by: 90 <hi@90.gripe>
2024-05-28 22:01:23 +01:00
bc1c592f41
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: sneedium <sneed@sneedmc.org>
2024-03-24 01:33:10 -04:00
McModder
02e6667761
Improve SDKMAN Java installations support; introduce ASDF Java installations auto-detection
Signed-off-by: McModder <me@modder.pw>
2024-01-09 17:38:51 +03:00
Lenny McLennington
3f54396705
Merge pull request #1627 from HeyaGlitz/develop
Make Christmas cat last longer
2024-01-07 05:10:36 +00:00
Lenny McLennington
b72d486e84
Merge pull request #1633 from PolyMC/fix-instance-import-fr-this-time
Fix instance import fr this time
2024-01-06 16:12:35 +00:00
Lenny McLennington
ba2fba10c2
Merge pull request #1631 from HeyaGlitz/sdkmandetect
Make Java auto-detect find sdkman Java installations
2024-01-06 13:51:12 +00:00
Lenny McLennington
0a9801fb20
Fix instance import fr this time 2024-01-06 13:45:00 +00:00
HeyaGlitz
5e22009554 Fix Java auto-detect so it finds sdkman
Signed-off-by: HeyaGlitz <30732772+HeyaGlitz@users.noreply.github.com>
2024-01-05 15:42:42 +01:00
HeyaGlitz
87ea20df5a Fix storage page chart legend not respecting theme
Signed-off-by: HeyaGlitz <heyaglitz@waifu.club>
2024-01-02 00:20:50 +01:00
HeyaGlitz
0919630ed6 Make Christmas cat last longer
The cat will now last until January 6th, the actual end of Christmas

Signed-off-by: HeyaGlitz <30732772+HeyaGlitz@users.noreply.github.com>
2023-12-26 00:01:16 +01:00
Lenny McLennington
bce5a8df35
Merge pull request #1622 from PolyMC/consistent-uuids
Create offline mode accounts with consistent Uuids
2023-12-17 10:55:44 +00:00
Lenny McLennington
ff74d0d7ad
Create offline mode accounts with consistent Uuids
Uses basically what already exists in Qt, just modified so I can specify
an arbitrary length byte array for the namespace. Not really sure if it
needs to be the same as the way Minecraft generates it or if I could've
just used Uuid::createUuidV3. It would've still been consistent either
way, but whatever, this works.

Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-12-09 14:28:08 +00:00
Lenny McLennington
94b01a5f5c
Fix MSA profile fetching
This reverts commit 290ccebc29 for
launcher/minecraft/auth/steps/MinecraftProfileStep.cpp.

Oops.

Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-12-09 13:38:46 +00:00
Lenny McLennington
385eaea709
Merge pull request #1616 from LennyMcLennington/fix-hang
fix hang when importing certain modpacks
2023-11-25 02:03:38 +00:00
Lenny McLennington
6431265a73
Merge pull request #1598 from Kaydax/authlib
Add support for authlibinjector
2023-11-25 02:03:22 +00:00
Kaydax
53a4395d5b Fix Yggdrasil error messages when not using Mojang
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-11-12 23:37:35 +00:00
Lenny McLennington
290ccebc29 feature: Add support for authlibinjector
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-11-12 23:37:35 +00:00
Lenny McLennington
e2875ef9a5 fix hang when importing certain modpacks
Modified findFolderOfFileInZip to use a breadth-first search and support
searching for multiple file names in one pass. This should prevent or at
least make it less likely to hang while importing certain packs.

Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-11-12 23:34:14 +00:00
Lenny McLennington
d380c07d62 don't set arbitrary minimum for jvm memory
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-11-12 23:06:53 +00:00
swirl
c0ca8d21ca
Fix build on Qt 6.6.0
Closes #1611

Signed-off-by: swirl <swurl@swurl.xyz>
2023-11-07 21:32:41 -05:00
jdp_
93d868230f Allow compilation on 32-bit 2023-10-18 22:12:54 -04:00
Spongecade
1471d64d11 Update Minecraft Wiki links to new domain 2023-09-28 14:26:36 +00:00
Lenny McLennington
19673a7d59
Add CMake option to enable stricter DRM 2023-06-09 00:35:41 +01:00
jdp_
eabd225b06 Fix bug, fix more warnings (See commit description)
This ends my series of patches fixing warnings throughout the codebase. Now, there are NO warnings except for unused parameters, tested on GCC 13.1.1 and Clang 16.0.2 with -Wall -Wextra.

Fixed dark mode crashing on Windows 8.1, 8 and 7, and removed a need for an export by moving in the function.

Any people looking at the Windows code and asking why I didn't use official version querying API's, those typically have some sort of unwanted behavior, plus checking exports to determine versions is shorter.
2023-05-08 22:08:07 -04:00
jdp_
9cb6200081 Cleanup codebase
for FileSystem.cpp:
Instead of checking if Linux or FreeBSD, check if its not Windows and not OSX. Chances are other operating systems run a DE that adheres to the XDG Desktop standard (.desktop). The check isn't good enough anyways since alternative shells for Windows exist, it will never be an accurate check. In any case this function is unused.

WorldListPage.cpp:
Redo confusing switch statement plagued with fall throughs, now well defined.

LaunchController.cpp:
Remove cringe. Also fix warning and make the unimplemented case(s) more explicit.

VersionProxyModel.cpp:
Add fallthrough for warning suppression.

WorldListPage.cpp:
redo `mceditState`

TranslationsModel.cpp:
Move up definition of `column` variable to when it is needed, clear up switch cases

FlameInstanceCreationTask.cpp:
Fallthrough intentionally

SkinUpload.cpp:
Make `getVariant`

ResourcePack.cpp:
Add new values for 1.19.3+

meta/Index.cpp:
Make clear switch statement behavior

JavaWizardPage.cpp:
Fix case fallthrough

Yggdrasil.cpp:
Fix case fallthrough

AccountList.cpp:
Fix case fallthrough,

WinDarkmode.cpp:
Add an explanation and fix warnings due to FARPROC casts.

Signed-off-by: jdp_ <42700985+jdpatdiscord@users.noreply.github.com>
2023-05-07 06:20:16 -04:00
jdp_
1f4d9cc12f Avoid possible conflicts with C++20 requires keyword
from -Wc++20-compat
2023-05-07 01:26:15 -04:00
jdp_
4eb9085e71 Fix pack updating & Modrinth overrides
The mechanism that both pack updating and Modrinth overrides use utilize std::filesystem::copy, which with GCC's libstdc++ has a bug on Windows where `overwrite_existing` isn't obeyed. In addition, made it clear what `overrideFolder` does by renaming it and rewriting an error message.
2023-05-07 01:06:30 -04:00
glowiak
2a9bb95e1f
Fix compile error on FreeBSD (#1560)
* Update VerifyJavaInstall.cpp

Signed-off-by: glowiak <52356948+glowiak@users.noreply.github.com>

* Update VerifyJavaInstall.cpp

Signed-off-by: glowiak <52356948+glowiak@users.noreply.github.com>

* Update VerifyJavaInstall.cpp

Signed-off-by: glowiak <52356948+glowiak@users.noreply.github.com>

* Update VerifyJavaInstall.cpp

Signed-off-by: glowiak <52356948+glowiak@users.noreply.github.com>

* Update VerifyJavaInstall.cpp

Signed-off-by: glowiak <52356948+glowiak@users.noreply.github.com>

---------

Signed-off-by: glowiak <52356948+glowiak@users.noreply.github.com>
2023-02-26 16:14:04 +00:00
flow
3db09c5466
fix: include hidden files when copying instances
fixes instance ccopy on linux .-.

Signed-off-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-02-16 05:01:47 +00:00
Lenny McLennington
403f8a7d96
Merge pull request #1541 from KaspianDev/develop
Clean & Compress Floppas
2023-02-14 22:34:51 +00:00
Lenny McLennington
94e3b95b05
Merge pull request #1548 from LennyMcLennington/fix/mr-list-text-layout
fix: Make modrinth text layout not be weird
2023-02-14 22:34:32 +00:00
Lenny McLennington
252da9a3dc
Merge pull request #1526 from Doggermelon/copy-single-file
fix: handle single files in copy tasks
2023-02-10 02:25:22 +00:00
Lenny McLennington
9f457e0ce6
fix(MMCZip): ignore invalid file paths in extractSubDir
Ignores files that have an absolute path or a path beginning with ..

Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-02-09 20:04:24 +00:00
Lenny McLennington
dab0dc451c
fix: modrinth text layout is no longer weird
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-02-09 19:36:21 +00:00
Kaspian
cdcc7d0f16 Clear more pixels 2023-02-05 10:18:48 +01:00
Kaspian
71d4e66c32 Fix & Compress Floppas 2023-02-04 21:20:43 +01:00
Lenny McLennington
03552edbb7
Fix Windows Qt6 builds
- Fix warning about no return on main
- Fix program not starting when built with Qt6

Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-02-04 15:31:00 +00:00
Lenny McLennington
67bb016623
fix(ModrinthInstanceCreationTask): ignore files with invalid paths
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-02-04 00:10:54 +00:00
Lenny McLennington
21e6093520
Merge pull request #1504 from xslendix/storage
Add storage page to instances.
2023-01-04 20:23:12 +00:00
Kemonomodoki
928ff7826c fix: handle single files in copy tasks
This should fix FTB imported instances not having any mods installed.

Signed-off-by: Kemonomodoki <kemonomodoki@firemail.cc>
2022-12-29 07:30:28 -05:00
xSlendiX
91c7a700a9 Fix GitHub workflow broken.
This patch adds the needed QtCharts dependency to GitHub workflow.

Signed-off-by: xSlendiX <slendi@socopon.com>
2022-12-27 22:34:48 +02:00
xSlendiX
58bc61ccbd Add a way to change the position of the cat.
This simple commit adds the ability to further customize the cat by
allowing the user to change its position.

Signed-off-by: xSlendiX <slendi@socopon.com>
2022-12-06 15:25:09 +02:00
xSlendiX
59c280309d Add Floppa :^)
How can we have a cat selection combo box without a floppa option?!
This is unacceptable, and this patch fixes it. Now the launcher can flop
all day long :^)

Signed-off-by: xSlendiX <slendi@socopon.com>
2022-11-26 22:04:14 +02:00
xSlendiX
3187b5c1c2 Add pie chart to StoragePage and improve UX :^)
This patch adds a nice little pie chart to visually show which parts of
the instance take most space. It also refactors some code and improve
the UX a bit more.

Signed-off-by: xSlendiX <slendi@socopon.com>
2022-11-26 14:39:41 +02:00
xSlendiX
16a4a4f811 Add icon for storage page.
Signed-off-by: xSlendiX <slendi@socopon.com>
2022-11-24 20:46:50 +02:00
Lenny McLennington
211c423da1
Merge pull request #1493 from urFate/develop
Implement account per instance feature
2022-11-17 23:37:21 +00:00
Lenny McLennington
51de23d83c
Merge pull request #1505 from LennyMcLennington/fix-concurrenttask-stack-overflow
fix: prevent stack overflow in ConcurrentTask
2022-11-17 23:36:50 +00:00