Commit Graph

4904 Commits

Author SHA1 Message Date
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
Lenny McLennington
c16cc2d8bb
Merge pull request #1538 from LennyMcLennington/fix-windows-build
fix windows ci builds
2023-02-04 12:08:32 +00:00
Lenny McLennington
20edcb1a2b
fix windows ci builds
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2023-02-04 11:21:52 +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
fe2624bf1a
Merge pull request #1531 from oluceps/fix-nixbuild
Fix build fail on nix flake
2023-01-13 00:10:20 +00:00
oluceps
eb390814d8
Fix build fail on nix flake.
This should fix nix build fail caused by introduced new qt module.

Signed-off-by: oluceps <i@oluceps.uk>
2023-01-05 21:55:05 +08: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
Lenny McLennington
7839bd0e54
Merge pull request #1508 from xslendix/move_pussy
Add a way to change the position of the cat.
2022-12-08 06:49:58 +00: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
Lenny McLennington
7f226eba9c
Merge pull request #1503 from jdpatdiscord/develop
fix recursive crash on win64
2022-12-06 00:28:15 +00:00
Lenny McLennington
3340d2c814
Merge pull request #1510 from xslendix/oh_yeah_big_floppa_time_sunglasses_emoji
Add Floppa :^)
2022-12-06 00:26:00 +00: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
90bbde3631
build: only increase stack size in non-debug builds
Signed-off-by: Lenny McLennington <lenny@sneed.church>
2022-11-24 18:20:18 +00: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
xSlendiX
cf317ca3d4 Add storage page to instances.
This patch adds a new page to instance settings which allows users to
manage storage. This commit represents the start of it. Right now, only
some base features are implemented.

Signed-off-by: xSlendiX <slendi@socopon.com>
2022-11-17 20:38:45 +02:00
Lenny McLennington
a3d1e88d44
Merge pull request #1499 from HeyaGlitz/develop
Add Jinx
2022-11-17 04:34:04 +00:00