Commit Graph

4896 Commits

Author SHA1 Message Date
41c49c7ca0
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: sneedium <sneed@sneedmc.org>
2024-06-20 16:37:06 -04:00
Lenny McLennington
b0bf7bd108
Merge pull request #1661 from hustlerone/develop
Include JDK 21 into the nix derivation
2024-06-20 12:52:26 +01:00
Hustler One
2adf3db7bc
DCO Remediation Commit for Hustler One <nine-ball@tutanota.com>
I, Hustler One <nine-ball@tutanota.com>, hereby add my Signed-off-by to this commit: 1b8d45d04f

Signed-off-by: Hustler One <nine-ball@tutanota.com>
2024-06-19 12:06:57 +02:00
Hustler One
1b8d45d04f
fix small oversight for new minecraft versions (JDK 21 is now mandatory for 1.20.5+) 2024-06-19 11:48:43 +02:00
Lenny McLennington
0e73bff14c
Merge pull request #1652 from LordMZTE/nix-wayland
Fix nix package on wayland
2024-06-08 00:14:39 +01:00
Lenny McLennington
62fd3d436a
Merge pull request #1651 from ZebulanStanphill/fix-metainfo
Fix circular dependency and typos in metainfo.
2024-05-02 22:23:24 +01:00
LordMZTE
f2f38691e7
Fix nix package on wayland
The nix package was missing the dependencies required for qtwayland to
work. This has been fixed.

Signed-off-by: LordMZTE <lord@mzte.de>
2024-05-02 16:41:21 +02:00
Zebulan Stanphill
19d34dd302 Fix capitalization and add Oxford commas in metainfo.
Signed-off-by: Zebulan Stanphill <zebulanstanphill@protonmail.com>
2024-04-28 14:51:13 -05:00
Zebulan Stanphill
15df4bb751 Fix recursive dependency in metainfo.
Signed-off-by: Zebulan Stanphill <zebulanstanphill@protonmail.com>
2024-04-28 14:50:29 -05:00
Lenny McLennington
d9760a16f5
Merge pull request #1649 from LordMZTE/nix-fix
fix nix build
2024-04-22 09:05:08 +01:00
LordMZTE
4bbc7bad4c
Fix nix meta
Signed-off-by: LordMZTE <lord@mzte.de>
2024-04-13 14:22:13 +02:00
LordMZTE
1aec41faa1
fix nix build
Signed-off-by: LordMZTE <lord@mzte.de>
2024-04-13 14:21:00 +02: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
Lenny McLennington
ffcb0c3f41
Merge pull request #1635 from Nik-mmzd/asdf-support
Improve SDKMAN support; add ASDF support
2024-01-11 22:44:29 +00: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
aeac0eb9ba
Merge pull request #1629 from HeyaGlitz/storagelegendfix
Fix storage page chart legend not respecting theme
2024-01-06 13:49:44 +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
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