Commit Graph

4833 Commits

Author SHA1 Message Date
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
24c471de88
Merge pull request #1621 from PolyMC/fix-msa-login
Fix MSA profile fetching
2023-12-17 10:54:51 +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
Lenny McLennington
f89a87e28a
Merge pull request #1615 from LennyMcLennington/relax-minimum-memory
don't set arbitrary minimum for jvm memory
2023-11-15 18:00:50 +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
Lenny McLennington
c4d68b7ccf
Merge pull request #1612 from PolyMC/fix-qt-6-6-0-build
Fix build on Qt 6.6.0
2023-11-08 04:03:40 +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
Lenny McLennington
7dff3e5afc
Merge pull request #1608 from jdpatdiscord/develop
Allow compilation on 32-bit
2023-10-19 10:44:36 +01:00
jdp_
93d868230f Allow compilation on 32-bit 2023-10-18 22:12:54 -04:00
Lenny McLennington
9bc2873b89
Merge pull request #1605 from Spongecade/develop
Update Minecraft Wiki links to new domain
2023-09-28 16:02:04 +01:00
Spongecade
1471d64d11 Update Minecraft Wiki links to new domain 2023-09-28 14:26:36 +00:00
Lenny McLennington
6a06bcc4ea
Merge pull request #1587 from HeyaGlitz/develop
Remove sponsors and CF API key terms
2023-09-06 05:24:52 +01:00
Lenny McLennington
b995074440
Merge pull request #1595 from LennyMcLennington/drm-flag
Add CMake option to enable stricter DRM
2023-08-10 11:31:46 +01:00
HeyaGlitz
a6089296ce
Remove key usage notice from CMakeLists
Signed-off-by: HeyaGlitz <30732772+HeyaGlitz@users.noreply.github.com>
2023-06-25 13:13:33 +02:00
HeyaGlitz
641f687043
Remove sponsors and CF API key terms
Signed-off-by: HeyaGlitz <30732772+HeyaGlitz@users.noreply.github.com>
2023-06-25 13:03:51 +02:00
Lenny McLennington
19673a7d59
Add CMake option to enable stricter DRM 2023-06-09 00:35:41 +01:00
Lenny McLennington
2358e6faa2
Merge pull request #1581 from HeyaGlitz/develop
Update to Java 8
2023-05-30 14:44:03 +01:00
HeyaGlitz
8e842d1b6e
Update to Java 8
Signed-off-by: HeyaGlitz <heyaglitz0x99@proton.me>
2023-05-30 07:45:08 +02:00
Lenny McLennington
9cf31f2c9b
Merge pull request #1576 from jdpatdiscord/develop
Fix bug, fix more warnings (See commit description)
2023-05-09 03:48:34 +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
Lenny McLennington
549cfa8833
Merge pull request #1575 from jdpatdiscord/develop
Clean up codebase and fix bug
2023-05-07 11:32:11 +01: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
Lenny McLennington
9b41a3bd48
Merge pull request #1555 from LennyMcLennington/fix-windows-builds-again-for-real-this-time
fix: change windows legacy builds to 64 bit
2023-02-19 05:16:39 +00:00
Lenny McLennington
e4211fea1a
fix: change windows legacy builds to 64 bit
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-02-19 05:15:49 +00:00
Lenny McLennington
a7d8cc6605
Merge pull request #1550 from PolyMC/bump-6.0
chore: bump version to 6.0
2023-02-18 06:07:27 +00:00
Lenny McLennington
9ee8f019e1
Merge pull request #1552 from PolyMC/fix_copy
Fix instance copy on Linux and macOS
2023-02-18 06:03:28 +00:00
flow
b4029553d4
chore(tests): add test for FS copy with dot folders/files
Signed-off-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-02-16 05:01:47 +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
3f2af124e7
chore: bump version to 6.0
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-02-15 03:23:00 +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
4398cb5dc5
Merge pull request #1546 from LennyMcLennington/fix/dont-unzip-invalid-filenames
fix(MMCZip): ignore invalid file paths in extractSubDir
2023-02-10 01:17:49 +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
7b547c842c
Merge pull request #1539 from LennyMcLennington/fix-windows-builds-for-real
Fix Windows Qt6 builds
2023-02-04 15:31:19 +00: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
01b52ea6be
Merge pull request #1537 from LennyMcLennington/security-fix
fix(ModrinthInstanceCreationTask): ignore files with invalid paths
2023-02-04 12:20:56 +00:00