build: rebase patches onto v0.21.9
This commit is contained in:
1 parent
e3148d82d3
commit
559d5c7300
22 files changed
+579
-576
No files matched your search
@@ -49,10 +49,10 @@ index 5f863d5..32a86a3 100644
|
|||||||
macos: {
|
macos: {
|
||||||
id: 'app.settings.operating-system.macos',
|
id: 'app.settings.operating-system.macos',
|
||||||
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
|
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
|
||||||
index 8f3a5d0..721dd32 100644
|
index 3a6f744..62c49c2 100644
|
||||||
--- a/apps/app-frontend/src/locales/en-US/index.json
|
--- a/apps/app-frontend/src/locales/en-US/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/en-US/index.json
|
+++ b/apps/app-frontend/src/locales/en-US/index.json
|
||||||
@@ -1626,7 +1626,7 @@
|
@@ -1638,7 +1638,7 @@
|
||||||
"message": "Oldest"
|
"message": "Oldest"
|
||||||
},
|
},
|
||||||
"app.settings.app-version": {
|
"app.settings.app-version": {
|
||||||
|
|||||||
@@ -302,10 +302,10 @@ index bb20aa9..46a9749 100644
|
|||||||
+ void router
|
+ void router
|
||||||
}
|
}
|
||||||
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
|
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
|
||||||
index 721dd32..6c48b86 100644
|
index 62c49c2..4b645ad 100644
|
||||||
--- a/apps/app-frontend/src/locales/en-US/index.json
|
--- a/apps/app-frontend/src/locales/en-US/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/en-US/index.json
|
+++ b/apps/app-frontend/src/locales/en-US/index.json
|
||||||
@@ -2745,7 +2745,7 @@
|
@@ -2757,7 +2757,7 @@
|
||||||
"message": "Discord Rich Presence"
|
"message": "Discord Rich Presence"
|
||||||
},
|
},
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
@@ -454,10 +454,10 @@ index 415af27..4e46190 100644
|
|||||||
Ok(())
|
Ok(())
|
||||||
};
|
};
|
||||||
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
|
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
|
||||||
index 9ccd656..065aad6 100644
|
index d96c14d..b69ee85 100644
|
||||||
--- a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
|
--- a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
|
||||||
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
|
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
|
||||||
@@ -906,11 +906,9 @@ function showSurvey() {
|
@@ -965,11 +965,9 @@ function showSurvey() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadTallyScript() {
|
function loadTallyScript() {
|
||||||
|
|||||||
@@ -50,10 +50,10 @@ which offered Microsoft and nothing else:
|
|||||||
create mode 100644 apps/app-frontend/src/components/ui/OfflineAccountModal.vue
|
create mode 100644 apps/app-frontend/src/components/ui/OfflineAccountModal.vue
|
||||||
|
|
||||||
diff --git a/Cargo.lock b/Cargo.lock
|
diff --git a/Cargo.lock b/Cargo.lock
|
||||||
index a3ffa8f..e17ace5 100644
|
index 5f4b5ef..44a7d6c 100644
|
||||||
--- a/Cargo.lock
|
--- a/Cargo.lock
|
||||||
+++ b/Cargo.lock
|
+++ b/Cargo.lock
|
||||||
@@ -12376,6 +12376,7 @@ dependencies = [
|
@@ -12469,6 +12469,7 @@ dependencies = [
|
||||||
"indicatif",
|
"indicatif",
|
||||||
"itertools 0.14.0",
|
"itertools 0.14.0",
|
||||||
"json5",
|
"json5",
|
||||||
@@ -426,7 +426,7 @@ index 94bd13e..cb7319a 100644
|
|||||||
* Retrieves the default user
|
* Retrieves the default user
|
||||||
* @return {Promise<UUID | undefined>}
|
* @return {Promise<UUID | undefined>}
|
||||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||||
index 653f423..7806b4b 100644
|
index ee79209..c8ac37a 100644
|
||||||
--- a/apps/app/build.rs
|
--- a/apps/app/build.rs
|
||||||
+++ b/apps/app/build.rs
|
+++ b/apps/app/build.rs
|
||||||
@@ -14,6 +14,7 @@ fn main() {
|
@@ -14,6 +14,7 @@ fn main() {
|
||||||
|
|||||||
@@ -403,7 +403,7 @@ index cb7319a..57580ff 100644
|
|||||||
* Retrieves the default user
|
* Retrieves the default user
|
||||||
* @return {Promise<UUID | undefined>}
|
* @return {Promise<UUID | undefined>}
|
||||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||||
index 7806b4b..24db197 100644
|
index c8ac37a..6f29181 100644
|
||||||
--- a/apps/app/build.rs
|
--- a/apps/app/build.rs
|
||||||
+++ b/apps/app/build.rs
|
+++ b/apps/app/build.rs
|
||||||
@@ -15,6 +15,7 @@ fn main() {
|
@@ -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>> {
|
pub async fn get_default_user() -> crate::Result<Option<uuid::Uuid>> {
|
||||||
let state = State::get().await?;
|
let state = State::get().await?;
|
||||||
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
|
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
|
||||||
index 0d5c08d..fd11a46 100644
|
index f783b20..90a9b9f 100644
|
||||||
--- a/packages/app-lib/src/launcher/mod.rs
|
--- a/packages/app-lib/src/launcher/mod.rs
|
||||||
+++ b/packages/app-lib/src/launcher/mod.rs
|
+++ b/packages/app-lib/src/launcher/mod.rs
|
||||||
@@ -1133,6 +1133,22 @@ pub async fn launch_minecraft(
|
@@ -1141,6 +1141,22 @@ pub async fn launch_minecraft(
|
||||||
command.arg("--add-opens=jdk.internal/jdk.internal.misc=ALL-UNNAMED");
|
command.arg("--add-opens=jdk.internal/jdk.internal.misc=ALL-UNNAMED");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -420,7 +420,7 @@ index 57580ff..9b2408e 100644
|
|||||||
* Adds an offline account with the given username and makes it the active one.
|
* Adds an offline account with the given username and makes it the active one.
|
||||||
*
|
*
|
||||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||||
index 24db197..3dbf3dc 100644
|
index 6f29181..dcd94b5 100644
|
||||||
--- a/apps/app/build.rs
|
--- a/apps/app/build.rs
|
||||||
+++ b/apps/app/build.rs
|
+++ b/apps/app/build.rs
|
||||||
@@ -14,6 +14,8 @@ fn main() {
|
@@ -14,6 +14,8 @@ fn main() {
|
||||||
@@ -563,10 +563,10 @@ index 2d18da3..fba473f 100644
|
|||||||
/// makes it the active account.
|
/// makes it the active account.
|
||||||
///
|
///
|
||||||
diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs
|
diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs
|
||||||
index 320112f..ba6c342 100644
|
index 5fddc74..47d6f11 100644
|
||||||
--- a/packages/app-lib/src/api/mod.rs
|
--- a/packages/app-lib/src/api/mod.rs
|
||||||
+++ b/packages/app-lib/src/api/mod.rs
|
+++ b/packages/app-lib/src/api/mod.rs
|
||||||
@@ -28,12 +28,12 @@ pub mod data {
|
@@ -29,12 +29,12 @@ pub mod data {
|
||||||
InstanceInstallCandidate, InstanceInstallTarget,
|
InstanceInstallCandidate, InstanceInstallTarget,
|
||||||
InstanceLaunchOverridesPatch, InstanceLink, InstanceMetadata,
|
InstanceLaunchOverridesPatch, InstanceLink, InstanceMetadata,
|
||||||
InstanceSyncedOption, InstanceSyncedOptions, InstanceTabVisibility,
|
InstanceSyncedOption, InstanceSyncedOptions, InstanceTabVisibility,
|
||||||
|
|||||||
@@ -291,7 +291,7 @@ index 0000000..a0eb40d
|
|||||||
+ return await invoke('plugin:ely-skins|ely_remove_skin', { skinId })
|
+ return await invoke('plugin:ely-skins|ely_remove_skin', { skinId })
|
||||||
+}
|
+}
|
||||||
diff --git a/apps/app-frontend/src/pages/Skins.vue b/apps/app-frontend/src/pages/Skins.vue
|
diff --git a/apps/app-frontend/src/pages/Skins.vue b/apps/app-frontend/src/pages/Skins.vue
|
||||||
index 8240b8b..bcd79ec 100644
|
index 783eff6..3dfe5b1 100644
|
||||||
--- a/apps/app-frontend/src/pages/Skins.vue
|
--- a/apps/app-frontend/src/pages/Skins.vue
|
||||||
+++ b/apps/app-frontend/src/pages/Skins.vue
|
+++ b/apps/app-frontend/src/pages/Skins.vue
|
||||||
@@ -4,6 +4,7 @@ import {
|
@@ -4,6 +4,7 @@ import {
|
||||||
@@ -333,7 +333,7 @@ index 8240b8b..bcd79ec 100644
|
|||||||
equip_skin,
|
equip_skin,
|
||||||
filterDefaultSkins,
|
filterDefaultSkins,
|
||||||
filterSavedSkins,
|
filterSavedSkins,
|
||||||
@@ -200,6 +216,27 @@ const messages = defineMessages({
|
@@ -212,6 +228,27 @@ const messages = defineMessages({
|
||||||
id: 'app.skins.sign-in.button',
|
id: 'app.skins.sign-in.button',
|
||||||
defaultMessage: 'Sign in to Microsoft',
|
defaultMessage: 'Sign in to Microsoft',
|
||||||
},
|
},
|
||||||
@@ -361,7 +361,7 @@ index 8240b8b..bcd79ec 100644
|
|||||||
})
|
})
|
||||||
|
|
||||||
const editSkinModal = useTemplateRef('editSkinModal')
|
const editSkinModal = useTemplateRef('editSkinModal')
|
||||||
@@ -335,10 +372,12 @@ const skinTexture = computedAsync(async () => {
|
@@ -347,10 +384,12 @@ const skinTexture = computedAsync(async () => {
|
||||||
const capeTexture = computed(() => currentCape.value?.texture)
|
const capeTexture = computed(() => currentCape.value?.texture)
|
||||||
const skinVariant = computed(() => selectedSkin.value?.variant)
|
const skinVariant = computed(() => selectedSkin.value?.variant)
|
||||||
const skinNametag = computed(() => (appSettings.hideNametagSkinsPage ? undefined : username.value))
|
const skinNametag = computed(() => (appSettings.hideNametagSkinsPage ? undefined : username.value))
|
||||||
@@ -378,7 +378,7 @@ index 8240b8b..bcd79ec 100644
|
|||||||
)
|
)
|
||||||
const hasPendingSkinChange = computed(
|
const hasPendingSkinChange = computed(
|
||||||
() => !skinsMatch(selectedSkin.value, originalSelectedSkin.value),
|
() => !skinsMatch(selectedSkin.value, originalSelectedSkin.value),
|
||||||
@@ -861,7 +900,8 @@ function isSkinFileDrag(event: DragEvent) {
|
@@ -879,7 +918,8 @@ function isSkinFileDrag(event: DragEvent) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function isPositionOverAddSkinButton(position: { x: number; y: number }) {
|
function isPositionOverAddSkinButton(position: { x: number; y: number }) {
|
||||||
@@ -388,7 +388,7 @@ index 8240b8b..bcd79ec 100644
|
|||||||
|
|
||||||
if (!element) {
|
if (!element) {
|
||||||
return false
|
return false
|
||||||
@@ -973,6 +1013,11 @@ async function setupAddSkinDragDropListener() {
|
@@ -991,6 +1031,11 @@ async function setupAddSkinDragDropListener() {
|
||||||
async function processSkinFileBuffer(buffer: Uint8Array | ArrayBuffer) {
|
async function processSkinFileBuffer(buffer: Uint8Array | ArrayBuffer) {
|
||||||
if (isSkinManagementReadOnly.value) return
|
if (isSkinManagementReadOnly.value) return
|
||||||
|
|
||||||
@@ -400,7 +400,7 @@ index 8240b8b..bcd79ec 100644
|
|||||||
const fakeEvent = new MouseEvent('click')
|
const fakeEvent = new MouseEvent('click')
|
||||||
const originalSkinTexUrl = `data:image/png;base64,` + arrayBufferToBase64(buffer)
|
const originalSkinTexUrl = `data:image/png;base64,` + arrayBufferToBase64(buffer)
|
||||||
try {
|
try {
|
||||||
@@ -987,6 +1032,308 @@ async function processSkinFileBuffer(buffer: Uint8Array | ArrayBuffer) {
|
@@ -1005,6 +1050,308 @@ async function processSkinFileBuffer(buffer: Uint8Array | ArrayBuffer) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -709,7 +709,7 @@ index 8240b8b..bcd79ec 100644
|
|||||||
watch(
|
watch(
|
||||||
() => selectedSkin.value?.cape_id,
|
() => selectedSkin.value?.cape_id,
|
||||||
() => {},
|
() => {},
|
||||||
@@ -1045,8 +1392,8 @@ async function checkUserChanges() {
|
@@ -1063,8 +1410,8 @@ async function checkUserChanges() {
|
||||||
if (defaultId !== currentUserId.value) {
|
if (defaultId !== currentUserId.value) {
|
||||||
await accountsCard.value?.refreshValues()
|
await accountsCard.value?.refreshValues()
|
||||||
await loadCurrentUser()
|
await loadCurrentUser()
|
||||||
@@ -720,7 +720,7 @@ index 8240b8b..bcd79ec 100644
|
|||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (currentUser.value && error instanceof Error) {
|
if (currentUser.value && error instanceof Error) {
|
||||||
@@ -1055,8 +1402,8 @@ async function checkUserChanges() {
|
@@ -1073,8 +1420,8 @@ async function checkUserChanges() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -731,7 +731,7 @@ index 8240b8b..bcd79ec 100644
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@@ -1081,8 +1428,29 @@ await loadSkins()
|
@@ -1099,8 +1446,29 @@ await loadSkins()
|
||||||
:proceed-label="formatMessage(commonMessages.deleteLabel)"
|
:proceed-label="formatMessage(commonMessages.deleteLabel)"
|
||||||
@proceed="deleteSkin"
|
@proceed="deleteSkin"
|
||||||
/>
|
/>
|
||||||
@@ -762,7 +762,7 @@ index 8240b8b..bcd79ec 100644
|
|||||||
<div class="sticky top-6 self-start p-2 pt-0">
|
<div class="sticky top-6 self-start p-2 pt-0">
|
||||||
<h1 class="m-0 text-2xl font-bold flex items-center gap-2">
|
<h1 class="m-0 text-2xl font-bold flex items-center gap-2">
|
||||||
{{ formatMessage(appMessages.skinSelectorLabel) }}
|
{{ formatMessage(appMessages.skinSelectorLabel) }}
|
||||||
@@ -1260,6 +1628,80 @@ await loadSkins()
|
@@ -1278,6 +1646,80 @@ await loadSkins()
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -844,7 +844,7 @@ index 8240b8b..bcd79ec 100644
|
|||||||
<div v-if="!currentUser" class="sticky w-full bottom-0 z-20 p-4 pt-0">
|
<div v-if="!currentUser" class="sticky w-full bottom-0 z-20 p-4 pt-0">
|
||||||
<div
|
<div
|
||||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||||
index 3dbf3dc..c1f27a4 100644
|
index dcd94b5..2d18e0a 100644
|
||||||
--- a/apps/app/build.rs
|
--- a/apps/app/build.rs
|
||||||
+++ b/apps/app/build.rs
|
+++ b/apps/app/build.rs
|
||||||
@@ -27,6 +27,23 @@ fn main() {
|
@@ -27,6 +27,23 @@ fn main() {
|
||||||
@@ -1271,10 +1271,10 @@ index 693bc86..15a5c1e 100644
|
|||||||
pub mod install;
|
pub mod install;
|
||||||
pub mod instance;
|
pub mod instance;
|
||||||
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
|
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
|
||||||
index 352b181..5e582b5 100644
|
index 8500c92..04be546 100644
|
||||||
--- a/apps/app/src/main.rs
|
--- a/apps/app/src/main.rs
|
||||||
+++ b/apps/app/src/main.rs
|
+++ b/apps/app/src/main.rs
|
||||||
@@ -250,6 +250,7 @@ fn main() {
|
@@ -306,6 +306,7 @@ fn main() {
|
||||||
|
|
||||||
builder = builder
|
builder = builder
|
||||||
.plugin(api::auth::init())
|
.plugin(api::auth::init())
|
||||||
@@ -1416,12 +1416,13 @@ index 0000000..574183b
|
|||||||
+ Ok(bytes.to_vec())
|
+ Ok(bytes.to_vec())
|
||||||
+}
|
+}
|
||||||
diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs
|
diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs
|
||||||
index ba6c342..a175675 100644
|
index 47d6f11..d9cb8d8 100644
|
||||||
--- a/packages/app-lib/src/api/mod.rs
|
--- a/packages/app-lib/src/api/mod.rs
|
||||||
+++ b/packages/app-lib/src/api/mod.rs
|
+++ b/packages/app-lib/src/api/mod.rs
|
||||||
@@ -1,5 +1,6 @@
|
@@ -1,6 +1,7 @@
|
||||||
//! API for interacting with Theseus
|
//! API for interacting with Theseus
|
||||||
pub mod cache;
|
pub mod cache;
|
||||||
|
pub mod debug_info;
|
||||||
+pub mod ely_skins;
|
+pub mod ely_skins;
|
||||||
pub mod friends;
|
pub mod friends;
|
||||||
pub mod handler;
|
pub mod handler;
|
||||||
|
|||||||
@@ -214,31 +214,31 @@ index f6e99d3..f06e812 100644
|
|||||||
export async function showInstanceInFolder(instanceId) {
|
export async function showInstanceInFolder(instanceId) {
|
||||||
const fullPath = await get_full_path(instanceId)
|
const fullPath = await get_full_path(instanceId)
|
||||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||||
index c1f27a4..ab19b6c 100644
|
index 2d18e0a..e4b2f6b 100644
|
||||||
--- a/apps/app/build.rs
|
--- a/apps/app/build.rs
|
||||||
+++ b/apps/app/build.rs
|
+++ b/apps/app/build.rs
|
||||||
@@ -400,6 +400,7 @@ fn main() {
|
@@ -403,6 +403,7 @@ fn main() {
|
||||||
"open_path",
|
|
||||||
"show_launcher_logs_folder",
|
|
||||||
"show_app_db_backups_folder",
|
"show_app_db_backups_folder",
|
||||||
|
"export_debug_info",
|
||||||
|
"cancel_debug_info_export",
|
||||||
+ "show_player_skins_folder",
|
+ "show_player_skins_folder",
|
||||||
"progress_bars_list",
|
"progress_bars_list",
|
||||||
"get_opening_command",
|
"get_opening_command",
|
||||||
"get_image_thumbnail",
|
"get_image_thumbnail",
|
||||||
diff --git a/apps/app/src/api/utils.rs b/apps/app/src/api/utils.rs
|
diff --git a/apps/app/src/api/utils.rs b/apps/app/src/api/utils.rs
|
||||||
index dce771b..4396696 100644
|
index 071f98c..120d8e2 100644
|
||||||
--- a/apps/app/src/api/utils.rs
|
--- a/apps/app/src/api/utils.rs
|
||||||
+++ b/apps/app/src/api/utils.rs
|
+++ b/apps/app/src/api/utils.rs
|
||||||
@@ -22,6 +22,7 @@ pub fn init<R: Runtime>() -> tauri::plugin::TauriPlugin<R> {
|
@@ -49,6 +49,7 @@ pub fn init<R: Runtime>() -> tauri::plugin::TauriPlugin<R> {
|
||||||
open_path,
|
|
||||||
show_launcher_logs_folder,
|
|
||||||
show_app_db_backups_folder,
|
show_app_db_backups_folder,
|
||||||
|
export_debug_info,
|
||||||
|
cancel_debug_info_export,
|
||||||
+ show_player_skins_folder,
|
+ show_player_skins_folder,
|
||||||
progress_bars_list,
|
progress_bars_list,
|
||||||
get_opening_command,
|
get_opening_command,
|
||||||
super::thumbnails::get_image_thumbnail,
|
super::thumbnails::get_image_thumbnail,
|
||||||
@@ -131,6 +132,19 @@ pub async fn show_app_db_backups_folder<R: Runtime>(
|
@@ -201,6 +202,19 @@ pub fn cancel_debug_info_export<R: Runtime>(
|
||||||
Ok(())
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+/// Opens the folder skins can be put in by hand, making it first if need be.
|
+/// Opens the folder skins can be put in by hand, making it first if need be.
|
||||||
@@ -2493,10 +2493,10 @@ index a482f66..76bedc7 100644
|
|||||||
if !arg.is_empty() {
|
if !arg.is_empty() {
|
||||||
parsed_arguments.push(arg);
|
parsed_arguments.push(arg);
|
||||||
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
|
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
|
||||||
index fd11a46..ed4c789 100644
|
index 90a9b9f..4038e7f 100644
|
||||||
--- a/packages/app-lib/src/launcher/mod.rs
|
--- a/packages/app-lib/src/launcher/mod.rs
|
||||||
+++ b/packages/app-lib/src/launcher/mod.rs
|
+++ b/packages/app-lib/src/launcher/mod.rs
|
||||||
@@ -1092,6 +1092,28 @@ pub async fn launch_minecraft(
|
@@ -1100,6 +1100,28 @@ pub async fn launch_minecraft(
|
||||||
|
|
||||||
let rpc_server = RpcServerBuilder::new().launch().await?;
|
let rpc_server = RpcServerBuilder::new().launch().await?;
|
||||||
|
|
||||||
@@ -2525,7 +2525,7 @@ index fd11a46..ed4c789 100644
|
|||||||
command.args(
|
command.args(
|
||||||
args::get_jvm_arguments(
|
args::get_jvm_arguments(
|
||||||
args.get(&d::minecraft::ArgumentType::Jvm)
|
args.get(&d::minecraft::ArgumentType::Jvm)
|
||||||
@@ -1118,6 +1140,7 @@ pub async fn launch_minecraft(
|
@@ -1126,6 +1148,7 @@ pub async fn launch_minecraft(
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.and_then(|x| x.get(&LoggingSide::Client)),
|
.and_then(|x| x.get(&LoggingSide::Client)),
|
||||||
rpc_server.address(),
|
rpc_server.address(),
|
||||||
|
|||||||
@@ -268,7 +268,7 @@ index 843e572..44d07d5 100644
|
|||||||
+ return await invoke('plugin:logs|logs_clear_live_log_buffer_for_process', { processUuid })
|
+ return await invoke('plugin:logs|logs_clear_live_log_buffer_for_process', { processUuid })
|
||||||
+}
|
+}
|
||||||
diff --git a/apps/app-frontend/src/pages/instance/components/page-header/index.vue b/apps/app-frontend/src/pages/instance/components/page-header/index.vue
|
diff --git a/apps/app-frontend/src/pages/instance/components/page-header/index.vue b/apps/app-frontend/src/pages/instance/components/page-header/index.vue
|
||||||
index ce4b436..31a6ded 100644
|
index 1aa3ec9..5390355 100644
|
||||||
--- a/apps/app-frontend/src/pages/instance/components/page-header/index.vue
|
--- a/apps/app-frontend/src/pages/instance/components/page-header/index.vue
|
||||||
+++ b/apps/app-frontend/src/pages/instance/components/page-header/index.vue
|
+++ b/apps/app-frontend/src/pages/instance/components/page-header/index.vue
|
||||||
@@ -144,6 +144,19 @@
|
@@ -144,6 +144,19 @@
|
||||||
@@ -440,15 +440,16 @@ index c0eb80e..b9d5eeb 100644
|
|||||||
|
|
||||||
function normalizeInstallProgress(value: unknown): WireObject {
|
function normalizeInstallProgress(value: unknown): WireObject {
|
||||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||||
index ab19b6c..8aff73d 100644
|
index e4b2f6b..7246c65 100644
|
||||||
--- a/apps/app/build.rs
|
--- a/apps/app/build.rs
|
||||||
+++ b/apps/app/build.rs
|
+++ b/apps/app/build.rs
|
||||||
@@ -110,7 +110,9 @@ fn main() {
|
@@ -110,8 +110,10 @@ fn main() {
|
||||||
"logs_delete_logs_by_filename",
|
"logs_delete_logs_by_filename",
|
||||||
"logs_get_latest_log_cursor",
|
"logs_get_latest_log_cursor",
|
||||||
"logs_get_live_log_buffer",
|
"logs_get_live_log_buffer",
|
||||||
+ "logs_get_live_log_buffer_for_process",
|
+ "logs_get_live_log_buffer_for_process",
|
||||||
"logs_clear_live_log_buffer",
|
"logs_clear_live_log_buffer",
|
||||||
|
"logs_log_webview",
|
||||||
+ "logs_clear_live_log_buffer_for_process",
|
+ "logs_clear_live_log_buffer_for_process",
|
||||||
])
|
])
|
||||||
.default_permission(
|
.default_permission(
|
||||||
@@ -479,20 +480,21 @@ index e0ba5c2..09534e2 100644
|
|||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
diff --git a/apps/app/src/api/logs.rs b/apps/app/src/api/logs.rs
|
diff --git a/apps/app/src/api/logs.rs b/apps/app/src/api/logs.rs
|
||||||
index e938efa..5150b00 100644
|
index 8104b3e..a956d17 100644
|
||||||
--- a/apps/app/src/api/logs.rs
|
--- a/apps/app/src/api/logs.rs
|
||||||
+++ b/apps/app/src/api/logs.rs
|
+++ b/apps/app/src/api/logs.rs
|
||||||
@@ -22,7 +22,9 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
|
@@ -23,8 +23,10 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
|
||||||
logs_delete_logs_by_filename,
|
logs_delete_logs_by_filename,
|
||||||
logs_get_latest_log_cursor,
|
logs_get_latest_log_cursor,
|
||||||
logs_get_live_log_buffer,
|
logs_get_live_log_buffer,
|
||||||
+ logs_get_live_log_buffer_for_process,
|
+ logs_get_live_log_buffer_for_process,
|
||||||
logs_clear_live_log_buffer,
|
logs_clear_live_log_buffer,
|
||||||
|
logs_log_webview,
|
||||||
+ logs_clear_live_log_buffer_for_process,
|
+ logs_clear_live_log_buffer_for_process,
|
||||||
])
|
])
|
||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
@@ -91,9 +93,26 @@ pub async fn logs_get_live_log_buffer(
|
@@ -117,9 +119,26 @@ pub async fn logs_get_live_log_buffer(
|
||||||
Ok(logs::get_live_log_buffer(instance_id).await?)
|
Ok(logs::get_live_log_buffer(instance_id).await?)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -636,10 +638,10 @@ index 4ce0c57..3382b5b 100644
|
|||||||
|
|
||||||
#[tracing::instrument]
|
#[tracing::instrument]
|
||||||
diff --git a/packages/app-lib/src/event/mod.rs b/packages/app-lib/src/event/mod.rs
|
diff --git a/packages/app-lib/src/event/mod.rs b/packages/app-lib/src/event/mod.rs
|
||||||
index 722d94f..d3a597a 100644
|
index 04fadf0..b6afa3a 100644
|
||||||
--- a/packages/app-lib/src/event/mod.rs
|
--- a/packages/app-lib/src/event/mod.rs
|
||||||
+++ b/packages/app-lib/src/event/mod.rs
|
+++ b/packages/app-lib/src/event/mod.rs
|
||||||
@@ -527,6 +527,8 @@ mod log_types {
|
@@ -532,6 +532,8 @@ mod log_types {
|
||||||
#[serde_binhum::serde_binhum]
|
#[serde_binhum::serde_binhum]
|
||||||
pub struct LogPayload {
|
pub struct LogPayload {
|
||||||
pub instance_id: String,
|
pub instance_id: String,
|
||||||
@@ -649,7 +651,7 @@ index 722d94f..d3a597a 100644
|
|||||||
#[cfg_attr(feature = "export-ts", ts(flatten))]
|
#[cfg_attr(feature = "export-ts", ts(flatten))]
|
||||||
pub event: LogEvent,
|
pub event: LogEvent,
|
||||||
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
|
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
|
||||||
index ed4c789..3a81499 100644
|
index 4038e7f..a11ee2d 100644
|
||||||
--- a/packages/app-lib/src/launcher/mod.rs
|
--- a/packages/app-lib/src/launcher/mod.rs
|
||||||
+++ b/packages/app-lib/src/launcher/mod.rs
|
+++ b/packages/app-lib/src/launcher/mod.rs
|
||||||
@@ -886,6 +886,9 @@ pub async fn launch_minecraft(
|
@@ -886,6 +886,9 @@ pub async fn launch_minecraft(
|
||||||
@@ -705,7 +707,7 @@ index ed4c789..3a81499 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
if let Some(path) = download::missing_runtime_file(
|
if let Some(path) = download::missing_runtime_file(
|
||||||
@@ -1239,7 +1248,10 @@ pub async fn launch_minecraft(
|
@@ -1265,7 +1274,10 @@ pub async fn launch_minecraft(
|
||||||
let _store_lease = state.content_store.lease().await;
|
let _store_lease = state.content_store.lease().await;
|
||||||
state.content_store.recover(Some(&instance.id)).await?;
|
state.content_store.recover(Some(&instance.id)).await?;
|
||||||
// state.content_store.validate_instance(instance).await?;
|
// state.content_store.validate_instance(instance).await?;
|
||||||
@@ -717,7 +719,7 @@ index ed4c789..3a81499 100644
|
|||||||
return Err(crate::ErrorKind::LauncherError(format!(
|
return Err(crate::ErrorKind::LauncherError(format!(
|
||||||
"Instance {} is already running",
|
"Instance {} is already running",
|
||||||
instance.id
|
instance.id
|
||||||
@@ -1286,6 +1298,8 @@ pub async fn launch_minecraft(
|
@@ -1312,6 +1324,8 @@ pub async fn launch_minecraft(
|
||||||
&instance.id,
|
&instance.id,
|
||||||
&instance.path,
|
&instance.path,
|
||||||
&instance.name,
|
&instance.name,
|
||||||
|
|||||||
@@ -880,7 +880,7 @@ index e2a59fd..4fcddea 100644
|
|||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||||
index 8aff73d..85bd5b8 100644
|
index 7246c65..e690c51 100644
|
||||||
--- a/apps/app/build.rs
|
--- a/apps/app/build.rs
|
||||||
+++ b/apps/app/build.rs
|
+++ b/apps/app/build.rs
|
||||||
@@ -44,6 +44,17 @@ fn main() {
|
@@ -44,6 +44,17 @@ fn main() {
|
||||||
@@ -970,10 +970,10 @@ index 15a5c1e..565a39f 100644
|
|||||||
pub mod import;
|
pub mod import;
|
||||||
pub mod install;
|
pub mod install;
|
||||||
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
|
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
|
||||||
index 5e582b5..8429e4c 100644
|
index 04be546..8231367 100644
|
||||||
--- a/apps/app/src/main.rs
|
--- a/apps/app/src/main.rs
|
||||||
+++ b/apps/app/src/main.rs
|
+++ b/apps/app/src/main.rs
|
||||||
@@ -251,6 +251,7 @@ fn main() {
|
@@ -307,6 +307,7 @@ fn main() {
|
||||||
builder = builder
|
builder = builder
|
||||||
.plugin(api::auth::init())
|
.plugin(api::auth::init())
|
||||||
.plugin(api::ely_skins::init())
|
.plugin(api::ely_skins::init())
|
||||||
@@ -2075,13 +2075,13 @@ index 0000000..9a6f7e8
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs
|
diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs
|
||||||
index a175675..4daf723 100644
|
index d9cb8d8..fd1c47f 100644
|
||||||
--- a/packages/app-lib/src/api/mod.rs
|
--- a/packages/app-lib/src/api/mod.rs
|
||||||
+++ b/packages/app-lib/src/api/mod.rs
|
+++ b/packages/app-lib/src/api/mod.rs
|
||||||
@@ -1,5 +1,6 @@
|
@@ -1,5 +1,6 @@
|
||||||
//! API for interacting with Theseus
|
//! API for interacting with Theseus
|
||||||
pub mod cache;
|
pub mod cache;
|
||||||
+pub mod crash_analysis;
|
+pub mod crash_analysis;
|
||||||
|
pub mod debug_info;
|
||||||
pub mod ely_skins;
|
pub mod ely_skins;
|
||||||
pub mod friends;
|
pub mod friends;
|
||||||
pub mod handler;
|
|
||||||
@@ -757,7 +757,7 @@ index 0000000..ea86e86
|
|||||||
+ return listen<SitePage | null>('skin-browser-page', (event) => handler(event.payload))
|
+ return listen<SitePage | null>('skin-browser-page', (event) => handler(event.payload))
|
||||||
+}
|
+}
|
||||||
diff --git a/apps/app-frontend/src/pages/Skins.vue b/apps/app-frontend/src/pages/Skins.vue
|
diff --git a/apps/app-frontend/src/pages/Skins.vue b/apps/app-frontend/src/pages/Skins.vue
|
||||||
index bcd79ec..9a10f0e 100644
|
index 3dfe5b1..7bdd7cd 100644
|
||||||
--- a/apps/app-frontend/src/pages/Skins.vue
|
--- a/apps/app-frontend/src/pages/Skins.vue
|
||||||
+++ b/apps/app-frontend/src/pages/Skins.vue
|
+++ b/apps/app-frontend/src/pages/Skins.vue
|
||||||
@@ -5,6 +5,7 @@ import {
|
@@ -5,6 +5,7 @@ import {
|
||||||
@@ -792,7 +792,7 @@ index bcd79ec..9a10f0e 100644
|
|||||||
import type { Cape, Skin, SkinModel, SkinTextureUrl } from '@/helpers/skins.ts'
|
import type { Cape, Skin, SkinModel, SkinTextureUrl } from '@/helpers/skins.ts'
|
||||||
import {
|
import {
|
||||||
determineModelType,
|
determineModelType,
|
||||||
@@ -237,6 +241,18 @@ const messages = defineMessages({
|
@@ -249,6 +253,18 @@ const messages = defineMessages({
|
||||||
id: 'app.skins.ely.failed.title',
|
id: 'app.skins.ely.failed.title',
|
||||||
defaultMessage: 'Ely.by did not take the change',
|
defaultMessage: 'Ely.by did not take the change',
|
||||||
},
|
},
|
||||||
@@ -811,7 +811,7 @@ index bcd79ec..9a10f0e 100644
|
|||||||
})
|
})
|
||||||
|
|
||||||
const editSkinModal = useTemplateRef('editSkinModal')
|
const editSkinModal = useTemplateRef('editSkinModal')
|
||||||
@@ -1032,6 +1048,28 @@ async function processSkinFileBuffer(buffer: Uint8Array | ArrayBuffer) {
|
@@ -1050,6 +1066,28 @@ async function processSkinFileBuffer(buffer: Uint8Array | ArrayBuffer) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -840,7 +840,7 @@ index bcd79ec..9a10f0e 100644
|
|||||||
/*
|
/*
|
||||||
* Ely.by accounts. Ely.by keeps an account's skins in its public catalogue and
|
* Ely.by accounts. Ely.by keeps an account's skins in its public catalogue and
|
||||||
* has no API to change one, so the grid shows that catalogue, and changes are
|
* has no API to change one, so the grid shows that catalogue, and changes are
|
||||||
@@ -1459,16 +1497,16 @@ await loadAccountSkins()
|
@@ -1477,16 +1515,16 @@ await loadAccountSkins()
|
||||||
class="ml-5 mt-4 flex h-[calc(80vh-1rem)] items-center justify-center max-[700px]:h-[calc(50vh-1rem)]"
|
class="ml-5 mt-4 flex h-[calc(80vh-1rem)] items-center justify-center max-[700px]:h-[calc(50vh-1rem)]"
|
||||||
>
|
>
|
||||||
<SkinPreviewRenderer
|
<SkinPreviewRenderer
|
||||||
@@ -862,7 +862,7 @@ index bcd79ec..9a10f0e 100644
|
|||||||
<div
|
<div
|
||||||
class="flex items-center justify-center gap-1.5 rounded-full border border-solid border-brand-blue bg-bg-blue px-3 py-1 text-base font-semibold leading-6 text-brand-blue"
|
class="flex items-center justify-center gap-1.5 rounded-full border border-solid border-brand-blue bg-bg-blue px-3 py-1 text-base font-semibold leading-6 text-brand-blue"
|
||||||
>
|
>
|
||||||
@@ -1482,7 +1520,26 @@ await loadAccountSkins()
|
@@ -1500,7 +1538,26 @@ await loadAccountSkins()
|
||||||
:class="{ 'has-ears-features': selectedSkinHasEarsFeatures }"
|
:class="{ 'has-ears-features': selectedSkinHasEarsFeatures }"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
@@ -890,7 +890,7 @@ index bcd79ec..9a10f0e 100644
|
|||||||
class="skin-preview-actions flex w-full items-center justify-center gap-1.5"
|
class="skin-preview-actions flex w-full items-center justify-center gap-1.5"
|
||||||
:class="selectedSkinHasEarsFeatures ? 'flex-nowrap' : 'flex-wrap'"
|
:class="selectedSkinHasEarsFeatures ? 'flex-nowrap' : 'flex-wrap'"
|
||||||
>
|
>
|
||||||
@@ -1607,7 +1664,15 @@ await loadAccountSkins()
|
@@ -1625,7 +1682,15 @@ await loadAccountSkins()
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="pt-2">
|
<div class="pt-2">
|
||||||
@@ -906,7 +906,7 @@ index bcd79ec..9a10f0e 100644
|
|||||||
ref="skinSectionList"
|
ref="skinSectionList"
|
||||||
:saved-skins="savedSkins"
|
:saved-skins="savedSkins"
|
||||||
:default-skin-sections="defaultSkinSections"
|
:default-skin-sections="defaultSkinSections"
|
||||||
@@ -1638,13 +1703,13 @@ await loadAccountSkins()
|
@@ -1656,13 +1721,13 @@ await loadAccountSkins()
|
||||||
class="ml-5 mt-4 flex h-[calc(80vh-1rem)] items-center justify-center max-[700px]:h-[calc(50vh-1rem)]"
|
class="ml-5 mt-4 flex h-[calc(80vh-1rem)] items-center justify-center max-[700px]:h-[calc(50vh-1rem)]"
|
||||||
>
|
>
|
||||||
<SkinPreviewRenderer
|
<SkinPreviewRenderer
|
||||||
@@ -924,7 +924,7 @@ index bcd79ec..9a10f0e 100644
|
|||||||
<div
|
<div
|
||||||
class="flex items-center justify-center gap-1.5 rounded-full border border-solid border-brand-blue bg-bg-blue px-3 py-1 text-base font-semibold leading-6 text-brand-blue"
|
class="flex items-center justify-center gap-1.5 rounded-full border border-solid border-brand-blue bg-bg-blue px-3 py-1 text-base font-semibold leading-6 text-brand-blue"
|
||||||
>
|
>
|
||||||
@@ -1654,7 +1719,26 @@ await loadAccountSkins()
|
@@ -1672,7 +1737,26 @@ await loadAccountSkins()
|
||||||
</template>
|
</template>
|
||||||
<template #subtitle>
|
<template #subtitle>
|
||||||
<div
|
<div
|
||||||
@@ -952,7 +952,7 @@ index bcd79ec..9a10f0e 100644
|
|||||||
class="flex w-full flex-wrap items-center justify-center gap-1.5"
|
class="flex w-full flex-wrap items-center justify-center gap-1.5"
|
||||||
>
|
>
|
||||||
<Button type="base" size="lg" :disabled="elyBusy" @click="elyPending = null">
|
<Button type="base" size="lg" :disabled="elyBusy" @click="elyPending = null">
|
||||||
@@ -1679,6 +1763,14 @@ await loadAccountSkins()
|
@@ -1697,6 +1781,14 @@ await loadAccountSkins()
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="pt-2">
|
<div class="pt-2">
|
||||||
@@ -967,7 +967,7 @@ index bcd79ec..9a10f0e 100644
|
|||||||
<p v-if="!elyLoading && !elyCatalogue.length" class="m-0 mb-4 text-secondary">
|
<p v-if="!elyLoading && !elyCatalogue.length" class="m-0 mb-4 text-secondary">
|
||||||
{{ formatMessage(messages.elySkinsEmpty) }}
|
{{ formatMessage(messages.elySkinsEmpty) }}
|
||||||
</p>
|
</p>
|
||||||
@@ -1700,6 +1792,7 @@ await loadAccountSkins()
|
@@ -1718,6 +1810,7 @@ await loadAccountSkins()
|
||||||
@add-skin-dragleave="onAddSkinDragLeave"
|
@add-skin-dragleave="onAddSkinDragLeave"
|
||||||
@add-skin-drop="onAddSkinDrop"
|
@add-skin-drop="onAddSkinDrop"
|
||||||
/>
|
/>
|
||||||
@@ -976,7 +976,7 @@ index bcd79ec..9a10f0e 100644
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||||
index 85bd5b8..2c8f2b9 100644
|
index e690c51..12d08ab 100644
|
||||||
--- a/apps/app/build.rs
|
--- a/apps/app/build.rs
|
||||||
+++ b/apps/app/build.rs
|
+++ b/apps/app/build.rs
|
||||||
@@ -44,6 +44,19 @@ fn main() {
|
@@ -44,6 +44,19 @@ fn main() {
|
||||||
@@ -1153,10 +1153,10 @@ index 0000000..cfd0d8c
|
|||||||
+ .into()
|
+ .into()
|
||||||
+}
|
+}
|
||||||
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
|
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
|
||||||
index 8429e4c..04eedbd 100644
|
index 8231367..96cc15a 100644
|
||||||
--- a/apps/app/src/main.rs
|
--- a/apps/app/src/main.rs
|
||||||
+++ b/apps/app/src/main.rs
|
+++ b/apps/app/src/main.rs
|
||||||
@@ -252,6 +252,7 @@ fn main() {
|
@@ -308,6 +308,7 @@ fn main() {
|
||||||
.plugin(api::auth::init())
|
.plugin(api::auth::init())
|
||||||
.plugin(api::ely_skins::init())
|
.plugin(api::ely_skins::init())
|
||||||
.plugin(api::crash_analysis::init())
|
.plugin(api::crash_analysis::init())
|
||||||
@@ -1165,10 +1165,10 @@ index 8429e4c..04eedbd 100644
|
|||||||
.plugin(api::onboarding_checklist::init())
|
.plugin(api::onboarding_checklist::init())
|
||||||
.plugin(api::import::init())
|
.plugin(api::import::init())
|
||||||
diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs
|
diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs
|
||||||
index 4daf723..e64a606 100644
|
index fd1c47f..de1f927 100644
|
||||||
--- a/packages/app-lib/src/api/mod.rs
|
--- a/packages/app-lib/src/api/mod.rs
|
||||||
+++ b/packages/app-lib/src/api/mod.rs
|
+++ b/packages/app-lib/src/api/mod.rs
|
||||||
@@ -17,6 +17,7 @@ pub mod process;
|
@@ -18,6 +18,7 @@ pub mod process;
|
||||||
pub mod reports;
|
pub mod reports;
|
||||||
pub mod server_address;
|
pub mod server_address;
|
||||||
pub mod settings;
|
pub mod settings;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Windows and macOS already use the native pickers.
|
|||||||
1 file changed, 10 insertions(+)
|
1 file changed, 10 insertions(+)
|
||||||
|
|
||||||
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
|
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
|
||||||
index 04eedbd..4c269a3 100644
|
index 96cc15a..6ca3c2b 100644
|
||||||
--- a/apps/app/src/main.rs
|
--- a/apps/app/src/main.rs
|
||||||
+++ b/apps/app/src/main.rs
|
+++ b/apps/app/src/main.rs
|
||||||
@@ -115,6 +115,16 @@ async fn set_restart_after_pending_update(
|
@@ -115,6 +115,16 @@ async fn set_restart_after_pending_update(
|
||||||
@@ -34,6 +34,6 @@ index 04eedbd..4c269a3 100644
|
|||||||
+ unsafe { std::env::set_var("GTK_USE_PORTAL", "1") };
|
+ unsafe { std::env::set_var("GTK_USE_PORTAL", "1") };
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
#[cfg(feature = "export-app-events")]
|
let runtime = tokio::runtime::Builder::new_multi_thread()
|
||||||
theseus::export_app_event_bindings(
|
.enable_all()
|
||||||
std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
|
.build()
|
||||||
@@ -15,7 +15,7 @@ who set it, or WEBKIT_DISABLE_DMABUF_RENDERER, keeps their value.
|
|||||||
1 file changed, 14 insertions(+)
|
1 file changed, 14 insertions(+)
|
||||||
|
|
||||||
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
|
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
|
||||||
index 4c269a3..5cdab91 100644
|
index 6ca3c2b..e4e9ae9 100644
|
||||||
--- a/apps/app/src/main.rs
|
--- a/apps/app/src/main.rs
|
||||||
+++ b/apps/app/src/main.rs
|
+++ b/apps/app/src/main.rs
|
||||||
@@ -125,6 +125,20 @@ fn main() {
|
@@ -125,6 +125,20 @@ fn main() {
|
||||||
@@ -36,6 +36,6 @@ index 4c269a3..5cdab91 100644
|
|||||||
+ unsafe { std::env::set_var("WEBKIT_DMABUF_RENDERER_FORCE_SHM", "1") };
|
+ unsafe { std::env::set_var("WEBKIT_DMABUF_RENDERER_FORCE_SHM", "1") };
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
#[cfg(feature = "export-app-events")]
|
let runtime = tokio::runtime::Builder::new_multi_thread()
|
||||||
theseus::export_app_event_bindings(
|
.enable_all()
|
||||||
std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
|
.build()
|
||||||
@@ -105,7 +105,7 @@ index 0a55cb4..9679884 100644
|
|||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('Failed to check for updates:', e)
|
console.error('Failed to check for updates:', e)
|
||||||
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
|
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
|
||||||
index 5cdab91..1deb12f 100644
|
index e4e9ae9..3ad2f7b 100644
|
||||||
--- a/apps/app/src/main.rs
|
--- a/apps/app/src/main.rs
|
||||||
+++ b/apps/app/src/main.rs
|
+++ b/apps/app/src/main.rs
|
||||||
@@ -77,6 +77,25 @@ fn is_dev() -> bool {
|
@@ -77,6 +77,25 @@ fn is_dev() -> bool {
|
||||||
@@ -134,7 +134,7 @@ index 5cdab91..1deb12f 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "updater")]
|
#[cfg(feature = "updater")]
|
||||||
@@ -187,6 +206,17 @@ fn main() {
|
@@ -193,6 +212,17 @@ fn main() {
|
||||||
HeaderValue::from_str(&launcher_user_agent()).unwrap(),
|
HeaderValue::from_str(&launcher_user_agent()).unwrap(),
|
||||||
)
|
)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
@@ -152,7 +152,7 @@ index 5cdab91..1deb12f 100644
|
|||||||
.build(),
|
.build(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -303,6 +333,8 @@ fn main() {
|
@@ -359,6 +389,8 @@ fn main() {
|
||||||
initialize_state,
|
initialize_state,
|
||||||
is_dev,
|
is_dev,
|
||||||
are_updates_enabled,
|
are_updates_enabled,
|
||||||
|
|||||||
@@ -847,7 +847,7 @@ index 9b2408e..f4d24a1 100644
|
|||||||
* Retrieves the default user
|
* Retrieves the default user
|
||||||
* @return {Promise<UUID | undefined>}
|
* @return {Promise<UUID | undefined>}
|
||||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||||
index 2c8f2b9..3726ef5 100644
|
index 12d08ab..31f5716 100644
|
||||||
--- a/apps/app/build.rs
|
--- a/apps/app/build.rs
|
||||||
+++ b/apps/app/build.rs
|
+++ b/apps/app/build.rs
|
||||||
@@ -18,6 +18,8 @@ fn main() {
|
@@ -18,6 +18,8 @@ fn main() {
|
||||||
@@ -1014,10 +1014,10 @@ index fba473f..fe95027 100644
|
|||||||
|
|
||||||
#[tracing::instrument]
|
#[tracing::instrument]
|
||||||
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
|
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
|
||||||
index 3a81499..9b40d34 100644
|
index a11ee2d..ee01ef5 100644
|
||||||
--- a/packages/app-lib/src/launcher/mod.rs
|
--- a/packages/app-lib/src/launcher/mod.rs
|
||||||
+++ b/packages/app-lib/src/launcher/mod.rs
|
+++ b/packages/app-lib/src/launcher/mod.rs
|
||||||
@@ -1165,10 +1165,11 @@ pub async fn launch_minecraft(
|
@@ -1173,10 +1173,11 @@ pub async fn launch_minecraft(
|
||||||
command.arg("--add-opens=jdk.internal/jdk.internal.misc=ALL-UNNAMED");
|
command.arg("--add-opens=jdk.internal/jdk.internal.misc=ALL-UNNAMED");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1033,7 +1033,7 @@ index 3a81499..9b40d34 100644
|
|||||||
let injector = crate::util::authlib_injector::get_authlib_injector(
|
let injector = crate::util::authlib_injector::get_authlib_injector(
|
||||||
&state.directories,
|
&state.directories,
|
||||||
)
|
)
|
||||||
@@ -1177,7 +1178,7 @@ pub async fn launch_minecraft(
|
@@ -1185,7 +1186,7 @@ pub async fn launch_minecraft(
|
||||||
command.arg(format!(
|
command.arg(format!(
|
||||||
"-javaagent:{}={}",
|
"-javaagent:{}={}",
|
||||||
injector.to_string_lossy(),
|
injector.to_string_lossy(),
|
||||||
|
|||||||
@@ -159,10 +159,10 @@ index ee32e2e..7d9b78d 100644
|
|||||||
await loadPreviewSkin()
|
await loadPreviewSkin()
|
||||||
|
|
||||||
diff --git a/apps/app-frontend/src/pages/Skins.vue b/apps/app-frontend/src/pages/Skins.vue
|
diff --git a/apps/app-frontend/src/pages/Skins.vue b/apps/app-frontend/src/pages/Skins.vue
|
||||||
index 9a10f0e..3b58ea9 100644
|
index 7bdd7cd..d12d3f3 100644
|
||||||
--- a/apps/app-frontend/src/pages/Skins.vue
|
--- a/apps/app-frontend/src/pages/Skins.vue
|
||||||
+++ b/apps/app-frontend/src/pages/Skins.vue
|
+++ b/apps/app-frontend/src/pages/Skins.vue
|
||||||
@@ -1448,6 +1448,7 @@ await loadAccountSkins()
|
@@ -1466,6 +1466,7 @@ await loadAccountSkins()
|
||||||
<EditSkinModal
|
<EditSkinModal
|
||||||
ref="editSkinModal"
|
ref="editSkinModal"
|
||||||
:capes="capes"
|
:capes="capes"
|
||||||
|
|||||||
@@ -334,7 +334,7 @@ index f4d24a1..f93f4e9 100644
|
|||||||
* Retrieves the default user
|
* Retrieves the default user
|
||||||
* @return {Promise<UUID | undefined>}
|
* @return {Promise<UUID | undefined>}
|
||||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||||
index 3726ef5..e33a52d 100644
|
index 31f5716..634448f 100644
|
||||||
--- a/apps/app/build.rs
|
--- a/apps/app/build.rs
|
||||||
+++ b/apps/app/build.rs
|
+++ b/apps/app/build.rs
|
||||||
@@ -20,6 +20,8 @@ fn main() {
|
@@ -20,6 +20,8 @@ fn main() {
|
||||||
|
|||||||
@@ -417,7 +417,7 @@ index ea86e86..e3c4b21 100644
|
|||||||
return await invoke('plugin:skin-browser|skin_browser_site_skin', { site, id })
|
return await invoke('plugin:skin-browser|skin_browser_site_skin', { site, id })
|
||||||
}
|
}
|
||||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||||
index e33a52d..ac124d9 100644
|
index 634448f..8b01928 100644
|
||||||
--- a/apps/app/build.rs
|
--- a/apps/app/build.rs
|
||||||
+++ b/apps/app/build.rs
|
+++ b/apps/app/build.rs
|
||||||
@@ -54,6 +54,8 @@ fn main() {
|
@@ -54,6 +54,8 @@ fn main() {
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ index 851e44d..752832c 100644
|
|||||||
return (await get_importable_instances(launcherName, path)) ?? []
|
return (await get_importable_instances(launcherName, path)) ?? []
|
||||||
},
|
},
|
||||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||||
index ac124d9..c9eebb7 100644
|
index 8b01928..6c95c0e 100644
|
||||||
--- a/apps/app/build.rs
|
--- a/apps/app/build.rs
|
||||||
+++ b/apps/app/build.rs
|
+++ b/apps/app/build.rs
|
||||||
@@ -108,6 +108,7 @@ fn main() {
|
@@ -108,6 +108,7 @@ fn main() {
|
||||||
@@ -173,7 +173,7 @@ index 773fcb2..cda652f 100644
|
|||||||
/// None if it can't be found or doesn't exist
|
/// None if it can't be found or doesn't exist
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
diff --git a/packages/app-lib/src/api/pack/import/mod.rs b/packages/app-lib/src/api/pack/import/mod.rs
|
diff --git a/packages/app-lib/src/api/pack/import/mod.rs b/packages/app-lib/src/api/pack/import/mod.rs
|
||||||
index 52707bc..62ee673 100644
|
index 357002a..5bd986c 100644
|
||||||
--- a/packages/app-lib/src/api/pack/import/mod.rs
|
--- a/packages/app-lib/src/api/pack/import/mod.rs
|
||||||
+++ b/packages/app-lib/src/api/pack/import/mod.rs
|
+++ b/packages/app-lib/src/api/pack/import/mod.rs
|
||||||
@@ -247,36 +247,130 @@ async fn import_instance_inner(
|
@@ -247,36 +247,130 @@ async fn import_instance_inner(
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -75,10 +75,10 @@ index d31e8c5..5061572 100644
|
|||||||
'Modrinth Enhanced collects no analytics or usage data and sends no crash reports, so there is nothing here to turn off.',
|
'Modrinth Enhanced collects no analytics or usage data and sends no crash reports, so there is nothing here to turn off.',
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
|
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
|
||||||
index 1dae5a6..5238f19 100644
|
index 3a179d4..967bb9d 100644
|
||||||
--- a/apps/app-frontend/src/locales/de-CH/index.json
|
--- a/apps/app-frontend/src/locales/de-CH/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/de-CH/index.json
|
+++ b/apps/app-frontend/src/locales/de-CH/index.json
|
||||||
@@ -3245,6 +3245,9 @@
|
@@ -3254,6 +3254,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth sammelt anonymisierte Analyse- und Nutzungsdaten, um unsere Nutzererfahrung zu verbessern und deine Erfahrung anzupassen. Wenn du diese Option deaktivierst, entscheidest du dich dagegen und deine Daten werden nicht mehr gesammelt."
|
"message": "Modrinth sammelt anonymisierte Analyse- und Nutzungsdaten, um unsere Nutzererfahrung zu verbessern und deine Erfahrung anzupassen. Wenn du diese Option deaktivierst, entscheidest du dich dagegen und deine Daten werden nicht mehr gesammelt."
|
||||||
},
|
},
|
||||||
@@ -88,7 +88,7 @@ index 1dae5a6..5238f19 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Telemetrie"
|
"message": "Telemetrie"
|
||||||
},
|
},
|
||||||
@@ -5177,6 +5180,12 @@
|
@@ -5195,6 +5198,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraft erforderlich"
|
"message": "Minecraft erforderlich"
|
||||||
},
|
},
|
||||||
@@ -102,10 +102,10 @@ index 1dae5a6..5238f19 100644
|
|||||||
"message": "Oder melde dich mit Ely.by oder einem eigenen Server an – oder spiele Einzelspieler und Offline-Server ganz ohne Account."
|
"message": "Oder melde dich mit Ely.by oder einem eigenen Server an – oder spiele Einzelspieler und Offline-Server ganz ohne Account."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
|
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
|
||||||
index f3e3d9d..76a27ab 100644
|
index 71b941e..52d8e11 100644
|
||||||
--- a/apps/app-frontend/src/locales/de-DE/index.json
|
--- a/apps/app-frontend/src/locales/de-DE/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/de-DE/index.json
|
+++ b/apps/app-frontend/src/locales/de-DE/index.json
|
||||||
@@ -3245,6 +3245,9 @@
|
@@ -3254,6 +3254,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth sammelt anonymisierte Analyse- und Nutzungsdaten, um unsere Nutzererfahrung zu verbessern und deine Erfahrung anzupassen. Wenn du diese Option deaktivierst, entscheidest du dich dagegen und deine Daten werden nicht mehr gesammelt."
|
"message": "Modrinth sammelt anonymisierte Analyse- und Nutzungsdaten, um unsere Nutzererfahrung zu verbessern und deine Erfahrung anzupassen. Wenn du diese Option deaktivierst, entscheidest du dich dagegen und deine Daten werden nicht mehr gesammelt."
|
||||||
},
|
},
|
||||||
@@ -115,7 +115,7 @@ index f3e3d9d..76a27ab 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Telemetrie"
|
"message": "Telemetrie"
|
||||||
},
|
},
|
||||||
@@ -5177,6 +5180,12 @@
|
@@ -5195,6 +5198,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraft erforderlich"
|
"message": "Minecraft erforderlich"
|
||||||
},
|
},
|
||||||
@@ -129,10 +129,10 @@ index f3e3d9d..76a27ab 100644
|
|||||||
"message": "Oder melde dich mit Ely.by oder einem eigenen Server an – oder spiele Einzelspieler und Offline-Server ganz ohne Account."
|
"message": "Oder melde dich mit Ely.by oder einem eigenen Server an – oder spiele Einzelspieler und Offline-Server ganz ohne Account."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
|
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
|
||||||
index 0ba9ee0..b0ad1f6 100644
|
index d014ad1..cc48a45 100644
|
||||||
--- a/apps/app-frontend/src/locales/es-419/index.json
|
--- a/apps/app-frontend/src/locales/es-419/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/es-419/index.json
|
+++ b/apps/app-frontend/src/locales/es-419/index.json
|
||||||
@@ -3245,6 +3245,9 @@
|
@@ -3254,6 +3254,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth recolecta datos analíticos anónimos y datos de uso para mejorar la experiencia de nuestros usuarios y para personalizar tu experiencia. Al desactivar esta opción, tus datos dejarán de ser recolectados."
|
"message": "Modrinth recolecta datos analíticos anónimos y datos de uso para mejorar la experiencia de nuestros usuarios y para personalizar tu experiencia. Al desactivar esta opción, tus datos dejarán de ser recolectados."
|
||||||
},
|
},
|
||||||
@@ -142,7 +142,7 @@ index 0ba9ee0..b0ad1f6 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Telemetría"
|
"message": "Telemetría"
|
||||||
},
|
},
|
||||||
@@ -5177,6 +5180,12 @@
|
@@ -5195,6 +5198,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraft requerido"
|
"message": "Minecraft requerido"
|
||||||
},
|
},
|
||||||
@@ -156,10 +156,10 @@ index 0ba9ee0..b0ad1f6 100644
|
|||||||
"message": "O inicia sesión con Ely.by o con un servidor personalizado, o juega en un jugador y en servidores sin conexión sin ninguna cuenta."
|
"message": "O inicia sesión con Ely.by o con un servidor personalizado, o juega en un jugador y en servidores sin conexión sin ninguna cuenta."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
|
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
|
||||||
index 115ae56..8504901 100644
|
index 3209ce8..003f966 100644
|
||||||
--- a/apps/app-frontend/src/locales/es-ES/index.json
|
--- a/apps/app-frontend/src/locales/es-ES/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/es-ES/index.json
|
+++ b/apps/app-frontend/src/locales/es-ES/index.json
|
||||||
@@ -3242,6 +3242,9 @@
|
@@ -3254,6 +3254,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth recopila análisis y datos de uso anónimos para mejorar la experiencia de usuario y personalizar tu experiencia. Deshabilitando esta opción sus datos dejarán de ser recopilados."
|
"message": "Modrinth recopila análisis y datos de uso anónimos para mejorar la experiencia de usuario y personalizar tu experiencia. Deshabilitando esta opción sus datos dejarán de ser recopilados."
|
||||||
},
|
},
|
||||||
@@ -169,7 +169,7 @@ index 115ae56..8504901 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Telemetría"
|
"message": "Telemetría"
|
||||||
},
|
},
|
||||||
@@ -5174,6 +5177,12 @@
|
@@ -5186,6 +5189,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraft requerido"
|
"message": "Minecraft requerido"
|
||||||
},
|
},
|
||||||
@@ -183,10 +183,10 @@ index 115ae56..8504901 100644
|
|||||||
"message": "O inicia sesión con Ely.by o con un servidor personalizado, o juega en un jugador y en servidores sin conexión sin ninguna cuenta."
|
"message": "O inicia sesión con Ely.by o con un servidor personalizado, o juega en un jugador y en servidores sin conexión sin ninguna cuenta."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
|
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
|
||||||
index aeed85e..6f6a4bb 100644
|
index 57a64c5..c6c2c7a 100644
|
||||||
--- a/apps/app-frontend/src/locales/fr-FR/index.json
|
--- a/apps/app-frontend/src/locales/fr-FR/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
|
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
|
||||||
@@ -2915,6 +2915,9 @@
|
@@ -3251,6 +3251,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth collecte des données d'analyse et d'utilisation anonymes afin d'améliorer l'expérience utilisateur et de personnaliser votre expérience. En désactivant cette option, vous choisissez de ne plus participer et vos données ne seront plus collectées."
|
"message": "Modrinth collecte des données d'analyse et d'utilisation anonymes afin d'améliorer l'expérience utilisateur et de personnaliser votre expérience. En désactivant cette option, vous choisissez de ne plus participer et vos données ne seront plus collectées."
|
||||||
},
|
},
|
||||||
@@ -196,7 +196,7 @@ index aeed85e..6f6a4bb 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Télémétrie"
|
"message": "Télémétrie"
|
||||||
},
|
},
|
||||||
@@ -4457,6 +4460,12 @@
|
@@ -4934,6 +4937,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraft requis"
|
"message": "Minecraft requis"
|
||||||
},
|
},
|
||||||
@@ -210,10 +210,10 @@ index aeed85e..6f6a4bb 100644
|
|||||||
"message": "Ou connectez-vous avec Ely.by ou un serveur personnalisé, ou jouez en solo et sur des serveurs en mode hors ligne sans aucun compte."
|
"message": "Ou connectez-vous avec Ely.by ou un serveur personnalisé, ou jouez en solo et sur des serveurs en mode hors ligne sans aucun compte."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
|
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
|
||||||
index e6b0ddf..66952d4 100644
|
index 03a20d4..19c557f 100644
|
||||||
--- a/apps/app-frontend/src/locales/hu-HU/index.json
|
--- a/apps/app-frontend/src/locales/hu-HU/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
|
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
|
||||||
@@ -3197,6 +3197,9 @@
|
@@ -3254,6 +3254,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "A Modrinth névtelen használati és telemetriai adatokat gyűjt a felhasználói élmény javítása és személyre szabása érdekében. Ha kikapcsolod ezt a beállítást, leiratkozol erről, és a rendszer többé nem gyűjti az adataidat."
|
"message": "A Modrinth névtelen használati és telemetriai adatokat gyűjt a felhasználói élmény javítása és személyre szabása érdekében. Ha kikapcsolod ezt a beállítást, leiratkozol erről, és a rendszer többé nem gyűjti az adataidat."
|
||||||
},
|
},
|
||||||
@@ -223,7 +223,7 @@ index e6b0ddf..66952d4 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Telemetria"
|
"message": "Telemetria"
|
||||||
},
|
},
|
||||||
@@ -5069,6 +5072,12 @@
|
@@ -5195,6 +5198,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraft szükséges"
|
"message": "Minecraft szükséges"
|
||||||
},
|
},
|
||||||
@@ -237,10 +237,10 @@ index e6b0ddf..66952d4 100644
|
|||||||
"message": "Vagy jelentkezz be Ely.byjal vagy saját szerverrel, vagy játssz egyjátékos módban és offline szervereken bármilyen fiók nélkül."
|
"message": "Vagy jelentkezz be Ely.byjal vagy saját szerverrel, vagy játssz egyjátékos módban és offline szervereken bármilyen fiók nélkül."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
|
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
|
||||||
index 93dab40..db542bd 100644
|
index 2d0334c..9c425cc 100644
|
||||||
--- a/apps/app-frontend/src/locales/it-IT/index.json
|
--- a/apps/app-frontend/src/locales/it-IT/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/it-IT/index.json
|
+++ b/apps/app-frontend/src/locales/it-IT/index.json
|
||||||
@@ -3239,6 +3239,9 @@
|
@@ -3248,6 +3248,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth raccoglie dati anonimizzati di analisi e utilizzo per migliorare l'esperienza utente e personalizzarla. Disabilitando questa opzione neghi il consenso e i tuoi dati non saranno più raccolti."
|
"message": "Modrinth raccoglie dati anonimizzati di analisi e utilizzo per migliorare l'esperienza utente e personalizzarla. Disabilitando questa opzione neghi il consenso e i tuoi dati non saranno più raccolti."
|
||||||
},
|
},
|
||||||
@@ -250,7 +250,7 @@ index 93dab40..db542bd 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Telemetria"
|
"message": "Telemetria"
|
||||||
},
|
},
|
||||||
@@ -5171,6 +5174,12 @@
|
@@ -5189,6 +5192,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraft richiesto"
|
"message": "Minecraft richiesto"
|
||||||
},
|
},
|
||||||
@@ -264,10 +264,10 @@ index 93dab40..db542bd 100644
|
|||||||
"message": "Oppure accedi con Ely.by o con un server personalizzato, o gioca in singolo e sui server in modalità offline senza alcun account."
|
"message": "Oppure accedi con Ely.by o con un server personalizzato, o gioca in singolo e sui server in modalità offline senza alcun account."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
|
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
|
||||||
index 7805ff0..51b7174 100644
|
index 57e636c..8b50e58 100644
|
||||||
--- a/apps/app-frontend/src/locales/ja-JP/index.json
|
--- a/apps/app-frontend/src/locales/ja-JP/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
|
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
|
||||||
@@ -2303,6 +2303,9 @@
|
@@ -2654,6 +2654,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinthはユーザー体験の向上および最適化のために、匿名化されたアナリティクスと利用データを収集しています。このオプションをオフにすることで無効化(オプトアウト)され、以降データの収集は行われません。"
|
"message": "Modrinthはユーザー体験の向上および最適化のために、匿名化されたアナリティクスと利用データを収集しています。このオプションをオフにすることで無効化(オプトアウト)され、以降データの収集は行われません。"
|
||||||
},
|
},
|
||||||
@@ -277,7 +277,7 @@ index 7805ff0..51b7174 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "テレメトリ"
|
"message": "テレメトリ"
|
||||||
},
|
},
|
||||||
@@ -3809,6 +3812,12 @@
|
@@ -4199,6 +4202,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraftが必要です"
|
"message": "Minecraftが必要です"
|
||||||
},
|
},
|
||||||
@@ -291,10 +291,10 @@ index 7805ff0..51b7174 100644
|
|||||||
"message": "Ely.by やカスタムサーバーでサインインすることも、アカウントなしでシングルプレイやオフラインモードのサーバーで遊ぶこともできます。"
|
"message": "Ely.by やカスタムサーバーでサインインすることも、アカウントなしでシングルプレイやオフラインモードのサーバーで遊ぶこともできます。"
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json
|
diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json
|
||||||
index 2d3892f..e3b7aa4 100644
|
index a1c1091..b8772f1 100644
|
||||||
--- a/apps/app-frontend/src/locales/nl-NL/index.json
|
--- a/apps/app-frontend/src/locales/nl-NL/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
|
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
|
||||||
@@ -3125,6 +3125,9 @@
|
@@ -3188,6 +3188,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth verzamelt geanonimiseerde analyse- en gebruiksgegevens om de gebruikerservaring te verbeteren en uw ervaring te personaliseren. Door deze optie uit te schakelen, meldt u zich af en worden uw gegevens niet langer verzameld."
|
"message": "Modrinth verzamelt geanonimiseerde analyse- en gebruiksgegevens om de gebruikerservaring te verbeteren en uw ervaring te personaliseren. Door deze optie uit te schakelen, meldt u zich af en worden uw gegevens niet langer verzameld."
|
||||||
},
|
},
|
||||||
@@ -304,7 +304,7 @@ index 2d3892f..e3b7aa4 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Telemetrie"
|
"message": "Telemetrie"
|
||||||
},
|
},
|
||||||
@@ -4724,6 +4727,12 @@
|
@@ -4787,6 +4790,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraft vereist"
|
"message": "Minecraft vereist"
|
||||||
},
|
},
|
||||||
@@ -318,10 +318,10 @@ index 2d3892f..e3b7aa4 100644
|
|||||||
"message": "Of log in met Ely.by of een eigen server, of speel singleplayer en servers in offlinemodus zonder enig account."
|
"message": "Of log in met Ely.by of een eigen server, of speel singleplayer en servers in offlinemodus zonder enig account."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json
|
diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json
|
||||||
index 42d3acd..2d3daf1 100644
|
index b7f9f77..372a805 100644
|
||||||
--- a/apps/app-frontend/src/locales/pl-PL/index.json
|
--- a/apps/app-frontend/src/locales/pl-PL/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
|
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
|
||||||
@@ -3233,6 +3233,9 @@
|
@@ -3242,6 +3242,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth zbiera anonimowe dane analityczne i użytkowania, aby poprawić komfort naszych użytkowników i dostosować Twoje doświadczenia. Wyłączając tę opcję, rezygnujesz i Twoje dane nie będą już gromadzone."
|
"message": "Modrinth zbiera anonimowe dane analityczne i użytkowania, aby poprawić komfort naszych użytkowników i dostosować Twoje doświadczenia. Wyłączając tę opcję, rezygnujesz i Twoje dane nie będą już gromadzone."
|
||||||
},
|
},
|
||||||
@@ -331,7 +331,7 @@ index 42d3acd..2d3daf1 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Telemetria"
|
"message": "Telemetria"
|
||||||
},
|
},
|
||||||
@@ -5165,6 +5168,12 @@
|
@@ -5183,6 +5186,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraft wymagany"
|
"message": "Minecraft wymagany"
|
||||||
},
|
},
|
||||||
@@ -345,10 +345,10 @@ index 42d3acd..2d3daf1 100644
|
|||||||
"message": "Albo zaloguj się przez Ely.by lub własny serwer, albo graj w trybie jednoosobowym i na serwerach offline zupełnie bez konta."
|
"message": "Albo zaloguj się przez Ely.by lub własny serwer, albo graj w trybie jednoosobowym i na serwerach offline zupełnie bez konta."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
|
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
|
||||||
index 24e6af6..e01bf82 100644
|
index 94d74f2..cc78407 100644
|
||||||
--- a/apps/app-frontend/src/locales/pt-BR/index.json
|
--- a/apps/app-frontend/src/locales/pt-BR/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
|
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
|
||||||
@@ -3245,6 +3245,9 @@
|
@@ -3254,6 +3254,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "O Modrinth coleta analíticas anonimizadas e uso de dados para aprimorar nossa experiência de usuário e personalizar sua experiência. Ao desativar esta opção, você negará e seus dados não serão mais coletados."
|
"message": "O Modrinth coleta analíticas anonimizadas e uso de dados para aprimorar nossa experiência de usuário e personalizar sua experiência. Ao desativar esta opção, você negará e seus dados não serão mais coletados."
|
||||||
},
|
},
|
||||||
@@ -358,7 +358,7 @@ index 24e6af6..e01bf82 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Telemetria"
|
"message": "Telemetria"
|
||||||
},
|
},
|
||||||
@@ -5177,6 +5180,12 @@
|
@@ -5195,6 +5198,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraft necessário"
|
"message": "Minecraft necessário"
|
||||||
},
|
},
|
||||||
@@ -372,10 +372,10 @@ index 24e6af6..e01bf82 100644
|
|||||||
"message": "Ou entre com o Ely.by ou com um servidor personalizado, ou jogue sozinho e em servidores offline sem conta nenhuma."
|
"message": "Ou entre com o Ely.by ou com um servidor personalizado, ou jogue sozinho e em servidores offline sem conta nenhuma."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
|
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
|
||||||
index e27fc6c..d010ced 100644
|
index 2556c98..126b5a5 100644
|
||||||
--- a/apps/app-frontend/src/locales/ru-RU/index.json
|
--- a/apps/app-frontend/src/locales/ru-RU/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
|
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
|
||||||
@@ -3224,6 +3224,9 @@
|
@@ -3233,6 +3233,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth собирает анонимные данные об использовании для персонализации и улучшения сервиса. Отключите этот параметр, чтобы отказаться от сбора данных."
|
"message": "Modrinth собирает анонимные данные об использовании для персонализации и улучшения сервиса. Отключите этот параметр, чтобы отказаться от сбора данных."
|
||||||
},
|
},
|
||||||
@@ -385,7 +385,7 @@ index e27fc6c..d010ced 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Телеметрия"
|
"message": "Телеметрия"
|
||||||
},
|
},
|
||||||
@@ -5153,6 +5156,12 @@
|
@@ -5171,6 +5174,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Требуется Minecraft"
|
"message": "Требуется Minecraft"
|
||||||
},
|
},
|
||||||
@@ -399,10 +399,10 @@ index e27fc6c..d010ced 100644
|
|||||||
"message": "Или войдите через Ely.by либо свой сервер — или играйте в одиночной игре и на офлайн-серверах вообще без учётной записи."
|
"message": "Или войдите через Ely.by либо свой сервер — или играйте в одиночной игре и на офлайн-серверах вообще без учётной записи."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
|
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
|
||||||
index efa9b5a..49b0f9f 100644
|
index 702d30d..1090e0c 100644
|
||||||
--- a/apps/app-frontend/src/locales/sv-SE/index.json
|
--- a/apps/app-frontend/src/locales/sv-SE/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
|
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
|
||||||
@@ -2624,6 +2624,9 @@
|
@@ -2954,6 +2954,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth samlar in anonymiserad statistik och användningsdata för att förbättra vår användarupplevelse och anpassa din upplevelse. Genom att inaktivera det här alternativet avanmäler du dig och din data kommer inte längre samlas in."
|
"message": "Modrinth samlar in anonymiserad statistik och användningsdata för att förbättra vår användarupplevelse och anpassa din upplevelse. Genom att inaktivera det här alternativet avanmäler du dig och din data kommer inte längre samlas in."
|
||||||
},
|
},
|
||||||
@@ -412,7 +412,7 @@ index efa9b5a..49b0f9f 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Telemetri"
|
"message": "Telemetri"
|
||||||
},
|
},
|
||||||
@@ -4175,6 +4178,12 @@
|
@@ -4652,6 +4655,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraft krävs"
|
"message": "Minecraft krävs"
|
||||||
},
|
},
|
||||||
@@ -426,10 +426,10 @@ index efa9b5a..49b0f9f 100644
|
|||||||
"message": "Eller logga in med Ely.by eller en egen server, eller spela ensamspelarvärldar och servrar i offlineläge helt utan konto."
|
"message": "Eller logga in med Ely.by eller en egen server, eller spela ensamspelarvärldar och servrar i offlineläge helt utan konto."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
|
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
|
||||||
index a8c7802..5f0dfe0 100644
|
index ae12426..65fb343 100644
|
||||||
--- a/apps/app-frontend/src/locales/tr-TR/index.json
|
--- a/apps/app-frontend/src/locales/tr-TR/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
|
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
|
||||||
@@ -2708,6 +2708,9 @@
|
@@ -2963,6 +2963,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth kullanıcı deneyimimizi geliştirmek için ve deneyiminizi kişiselleştirmek için anonimleştirilmiş analiz ve kullanım verilerini toplar. Bu seçeneği devre dışı bırakarak, bundan vazgeçmiş olursunuz ve verileriniz artık toplanmayacaktır."
|
"message": "Modrinth kullanıcı deneyimimizi geliştirmek için ve deneyiminizi kişiselleştirmek için anonimleştirilmiş analiz ve kullanım verilerini toplar. Bu seçeneği devre dışı bırakarak, bundan vazgeçmiş olursunuz ve verileriniz artık toplanmayacaktır."
|
||||||
},
|
},
|
||||||
@@ -439,7 +439,7 @@ index a8c7802..5f0dfe0 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Telemetri"
|
"message": "Telemetri"
|
||||||
},
|
},
|
||||||
@@ -4217,6 +4220,12 @@
|
@@ -4472,6 +4475,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Minecraft gereklidir"
|
"message": "Minecraft gereklidir"
|
||||||
},
|
},
|
||||||
@@ -453,10 +453,10 @@ index a8c7802..5f0dfe0 100644
|
|||||||
"message": "Ya da Ely.by veya özel bir sunucuyla oturum açın; ya da hiçbir hesap olmadan tek oyunculu ve çevrimdışı sunucularda oynayın."
|
"message": "Ya da Ely.by veya özel bir sunucuyla oturum açın; ya da hiçbir hesap olmadan tek oyunculu ve çevrimdışı sunucularda oynayın."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
|
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
|
||||||
index d38df4c..ab6596e 100644
|
index a3eeb2a..fab8b16 100644
|
||||||
--- a/apps/app-frontend/src/locales/uk-UA/index.json
|
--- a/apps/app-frontend/src/locales/uk-UA/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
|
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
|
||||||
@@ -3236,6 +3236,9 @@
|
@@ -3245,6 +3245,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth збирає анонімізовану аналітику та дані про використання для покращення зручності та адаптації сервісу. Вимкнувши цю опцію, ви відмовляєтеся від збору, і ваші дані більше не збиратимуться."
|
"message": "Modrinth збирає анонімізовану аналітику та дані про використання для покращення зручності та адаптації сервісу. Вимкнувши цю опцію, ви відмовляєтеся від збору, і ваші дані більше не збиратимуться."
|
||||||
},
|
},
|
||||||
@@ -466,7 +466,7 @@ index d38df4c..ab6596e 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "Телеметрія"
|
"message": "Телеметрія"
|
||||||
},
|
},
|
||||||
@@ -5168,6 +5171,12 @@
|
@@ -5186,6 +5189,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "Потрібний Minecraft"
|
"message": "Потрібний Minecraft"
|
||||||
},
|
},
|
||||||
@@ -480,10 +480,10 @@ index d38df4c..ab6596e 100644
|
|||||||
"message": "Або увійдіть через Ely.by чи власний сервер — або грайте в одиночній грі та на офлайн-серверах узагалі без облікового запису."
|
"message": "Або увійдіть через Ely.by чи власний сервер — або грайте в одиночній грі та на офлайн-серверах узагалі без облікового запису."
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
|
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
|
||||||
index 2a763fb..5449c62 100644
|
index b759fb8..901e2f0 100644
|
||||||
--- a/apps/app-frontend/src/locales/zh-CN/index.json
|
--- a/apps/app-frontend/src/locales/zh-CN/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
|
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
|
||||||
@@ -3245,6 +3245,9 @@
|
@@ -3254,6 +3254,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth 收集匿名分析和使用数据,以提升用户体验并为您提供个性化服务。若禁用此选项,即表示您选择退出,您的数据将不再被收集。"
|
"message": "Modrinth 收集匿名分析和使用数据,以提升用户体验并为您提供个性化服务。若禁用此选项,即表示您选择退出,您的数据将不再被收集。"
|
||||||
},
|
},
|
||||||
@@ -493,7 +493,7 @@ index 2a763fb..5449c62 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "遥测"
|
"message": "遥测"
|
||||||
},
|
},
|
||||||
@@ -5177,6 +5180,12 @@
|
@@ -5195,6 +5198,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "需要 Minecraft"
|
"message": "需要 Minecraft"
|
||||||
},
|
},
|
||||||
@@ -507,10 +507,10 @@ index 2a763fb..5449c62 100644
|
|||||||
"message": "也可以使用 Ely.by 或自定义服务器登录,或者不用任何账户,直接玩单人游戏和离线模式服务器。"
|
"message": "也可以使用 Ely.by 或自定义服务器登录,或者不用任何账户,直接玩单人游戏和离线模式服务器。"
|
||||||
},
|
},
|
||||||
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
|
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
|
||||||
index 81d505d..7cf751d 100644
|
index 5d789fe..36d5997 100644
|
||||||
--- a/apps/app-frontend/src/locales/zh-TW/index.json
|
--- a/apps/app-frontend/src/locales/zh-TW/index.json
|
||||||
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
|
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
|
||||||
@@ -3245,6 +3245,9 @@
|
@@ -3254,6 +3254,9 @@
|
||||||
"app.settings.privacy.telemetry.description": {
|
"app.settings.privacy.telemetry.description": {
|
||||||
"message": "Modrinth 會收集匿名化的分析與使用資料,以提升使用者體驗並提供客製化服務。若停用此選項,即表示你選擇退出,你的資料將不再被收集。"
|
"message": "Modrinth 會收集匿名化的分析與使用資料,以提升使用者體驗並提供客製化服務。若停用此選項,即表示你選擇退出,你的資料將不再被收集。"
|
||||||
},
|
},
|
||||||
@@ -520,7 +520,7 @@ index 81d505d..7cf751d 100644
|
|||||||
"app.settings.privacy.telemetry.title": {
|
"app.settings.privacy.telemetry.title": {
|
||||||
"message": "遙測"
|
"message": "遙測"
|
||||||
},
|
},
|
||||||
@@ -5177,6 +5180,12 @@
|
@@ -5195,6 +5198,12 @@
|
||||||
"minecraft-required.header": {
|
"minecraft-required.header": {
|
||||||
"message": "需要 Minecraft"
|
"message": "需要 Minecraft"
|
||||||
},
|
},
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
v0.21.6
|
v0.21.9
|
||||||
+1
-1
@@ -1 +1 @@
|
|||||||
v0.21.6
|
v0.21.9
|
||||||
Reference in new issue
Block a user