build: rebase patches onto v0.21.6
This commit is contained in:
1 parent
0a80cadbc0
commit
47aeca9b20
29 files changed
+733
-597
No files matched your search
@@ -403,7 +403,7 @@ index cb7319a..57580ff 100644
|
||||
* Retrieves the default user
|
||||
* @return {Promise<UUID | undefined>}
|
||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||
index 68a02aa..0f62dd8 100644
|
||||
index 7806b4b..24db197 100644
|
||||
--- a/apps/app/build.rs
|
||||
+++ b/apps/app/build.rs
|
||||
@@ -15,6 +15,7 @@ fn main() {
|
||||
@@ -488,10 +488,10 @@ index a7fac4a..2d18da3 100644
|
||||
pub async fn get_default_user() -> crate::Result<Option<uuid::Uuid>> {
|
||||
let state = State::get().await?;
|
||||
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
|
||||
index 17d20af..93cfd20 100644
|
||||
index 0d5c08d..fd11a46 100644
|
||||
--- a/packages/app-lib/src/launcher/mod.rs
|
||||
+++ b/packages/app-lib/src/launcher/mod.rs
|
||||
@@ -1072,6 +1072,22 @@ pub async fn launch_minecraft(
|
||||
@@ -1133,6 +1133,22 @@ pub async fn launch_minecraft(
|
||||
command.arg("--add-opens=jdk.internal/jdk.internal.misc=ALL-UNNAMED");
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user