From 6bcf142c56661b77313e3fa90a0d245c0f0b482d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-X=2E=20T=2E?= Date: Wed, 7 Jan 2026 19:54:37 -0500 Subject: [PATCH 1/4] Support default-user-jvm arguments type --- packages/daedalus/src/minecraft.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/daedalus/src/minecraft.rs b/packages/daedalus/src/minecraft.rs index 45488426c9..691f29cf6e 100644 --- a/packages/daedalus/src/minecraft.rs +++ b/packages/daedalus/src/minecraft.rs @@ -461,13 +461,15 @@ pub enum Argument { } #[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Hash, Clone, Copy)] -#[serde(rename_all = "snake_case")] +#[serde(rename_all = "kebab-case")] /// The type of argument pub enum ArgumentType { /// The argument is passed to the game Game, /// The argument is passed to the JVM Jvm, + /// Passed to JVM as well. Includes default arguments to the GC. + DefaultUserJvm, } #[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Hash)] From 2630012726c8837709d90d30d4a67271f1f9b2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-X=2E=20T=2E?= Date: Wed, 7 Jan 2026 19:58:30 -0500 Subject: [PATCH 2/4] Use this branch's container --- .github/workflows/daedalus-run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daedalus-run.yml b/.github/workflows/daedalus-run.yml index 56fbd9f824..ae50c944ad 100644 --- a/.github/workflows/daedalus-run.yml +++ b/.github/workflows/daedalus-run.yml @@ -48,4 +48,4 @@ jobs: -e CLOUDFLARE_INTEGRATION=$CLOUDFLARE_INTEGRATION \ -e CLOUDFLARE_TOKEN=$CLOUDFLARE_TOKEN \ -e CLOUDFLARE_ZONE_ID=$CLOUDFLARE_ZONE_ID \ - ghcr.io/modrinth/daedalus:main + ghcr.io/modrinth/daedalus:fetch-fix-daedalus From 3d1716d4e4b50600e99ec7f4c417d5646ed58dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-X=2E=20T=2E?= Date: Wed, 7 Jan 2026 20:32:12 -0500 Subject: [PATCH 3/4] Allow no rules in Ruled argument variant --- packages/daedalus/src/minecraft.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/daedalus/src/minecraft.rs b/packages/daedalus/src/minecraft.rs index 691f29cf6e..f31e08b171 100644 --- a/packages/daedalus/src/minecraft.rs +++ b/packages/daedalus/src/minecraft.rs @@ -454,6 +454,7 @@ pub enum Argument { /// An argument which is only applied if certain conditions are met Ruled { /// The rules deciding whether the argument(s) is used or not + #[serde(default)] rules: Vec, /// The container of the argument(s) that should be applied accordingly value: ArgumentValue, From de0abb75f1e77acf97b8cbbf943e13f413446533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-X=2E=20T=2E?= Date: Wed, 7 Jan 2026 20:42:01 -0500 Subject: [PATCH 4/4] Run main --- .github/workflows/daedalus-run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daedalus-run.yml b/.github/workflows/daedalus-run.yml index ae50c944ad..56fbd9f824 100644 --- a/.github/workflows/daedalus-run.yml +++ b/.github/workflows/daedalus-run.yml @@ -48,4 +48,4 @@ jobs: -e CLOUDFLARE_INTEGRATION=$CLOUDFLARE_INTEGRATION \ -e CLOUDFLARE_TOKEN=$CLOUDFLARE_TOKEN \ -e CLOUDFLARE_ZONE_ID=$CLOUDFLARE_ZONE_ID \ - ghcr.io/modrinth/daedalus:fetch-fix-daedalus + ghcr.io/modrinth/daedalus:main