Felitendo/Modrinth-Enhanced
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

build: rebase patches onto v0.21.6

Browse Source
This commit is contained in:
Felitendo committed 2026-09-29 09:14:48 +02:00
1 parent 0a80cadbc0
commit 47aeca9b20
29 files changed
+733 -597
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

patches/0001-Rename-the-app-to-Modrinth-Enhanced.patch
+1 -1
View File
@@ -49,7 +49,7 @@ index 5f863d5..32a86a3 100644
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
index 09f98ec..b03a35d 100644
index 8f3a5d0..721dd32 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1626,7 +1626,7 @@
patches/0002-Remove-advertising-and-Modrinth-upsells.patch
+4 -4
View File
@@ -27,7 +27,7 @@ ads and these prompts were shown, and nothing more.
2 files changed, 29 insertions(+), 91 deletions(-)
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 5faea7c..447f636 100644
index 564be92..4cd09f9 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -9,7 +9,6 @@ import {
@@ -102,7 +102,7 @@ index 5faea7c..447f636 100644
news: {
id: 'app.news.title',
defaultMessage: 'News',
@@ -1529,16 +1513,6 @@ const modrinthAccountMenuOptions = computed(() => [
@@ -1548,16 +1532,6 @@ const modrinthAccountMenuOptions = computed(() => [
icon: UserIcon,
action: () => router.push(`/user/${encodeURIComponent(credentials.value.user.username)}`),
},
@@ -119,7 +119,7 @@ index 5faea7c..447f636 100644
{
id: 'add-friend',
label: formatMessage(messages.addFriend),
@@ -2484,13 +2458,11 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@@ -2503,13 +2477,11 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
</RouterView>
</div>
<div
@@ -134,7 +134,7 @@ index 5faea7c..447f636 100644
data-overlayscrollbars-initialize
>
<OnboardingChecklist
@@ -2552,17 +2524,6 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@@ -2571,17 +2543,6 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
</div>
</div>
</div>
patches/0003-Remove-telemetry.patch
+4 -4
View File
@@ -108,7 +108,7 @@ index 8773f8f..d31e8c5 100644
<div class="mt-4 flex items-center justify-between gap-4">
diff --git a/apps/app-frontend/src/helpers/analytics.ts b/apps/app-frontend/src/helpers/analytics.ts
index b3d2c0a..c9f4846 100644
index 6118ac3..5ba7d5d 100644
--- a/apps/app-frontend/src/helpers/analytics.ts
+++ b/apps/app-frontend/src/helpers/analytics.ts
@@ -1,4 +1,16 @@
@@ -129,7 +129,7 @@ index b3d2c0a..c9f4846 100644
interface InstanceProperties {
loader: string
@@ -43,72 +55,13 @@ type AnalyticsEventMap = {
@@ -42,72 +54,13 @@ type AnalyticsEventMap = {
export type AnalyticsEvent = keyof AnalyticsEventMap
@@ -206,7 +206,7 @@ index b3d2c0a..c9f4846 100644
type OptionalArgs<T> = Record<string, never> extends T ? [properties?: T] : [properties: T]
@@ -116,10 +69,6 @@ export const trackEvent = <E extends AnalyticsEvent>(
@@ -115,10 +68,6 @@ export const trackEvent = <E extends AnalyticsEvent>(
eventName: E,
...args: OptionalArgs<AnalyticsEventMap[E]>
) => {
@@ -302,7 +302,7 @@ index bb20aa9..46a9749 100644
+ void router
}
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index b03a35d..2a589bd 100644
index 721dd32..6c48b86 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -2745,7 +2745,7 @@
patches/0004-Add-offline-accounts.patch
+5 -5
View File
@@ -50,10 +50,10 @@ which offered Microsoft and nothing else:
create mode 100644 apps/app-frontend/src/components/ui/OfflineAccountModal.vue
diff --git a/Cargo.lock b/Cargo.lock
index 28231e3..f94d0fe 100644
index a3ffa8f..e17ace5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12361,6 +12361,7 @@ dependencies = [
@@ -12376,6 +12376,7 @@ dependencies = [
"indicatif",
"itertools 0.14.0",
"json5",
@@ -62,10 +62,10 @@ index 28231e3..f94d0fe 100644
"notify",
"notify-debouncer-mini",
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 447f636..d750a5f 100644
index 4cd09f9..c5d4703 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -2467,15 +2467,17 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@@ -2486,15 +2486,17 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
>
<OnboardingChecklist
@create-instance="installationModal?.show()"
@@ -426,7 +426,7 @@ index 94bd13e..cb7319a 100644
* Retrieves the default user
* @return {Promise<UUID | undefined>}
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 926cab4..68a02aa 100644
index 653f423..7806b4b 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -14,6 +14,7 @@ fn main() {
patches/0005-Make-the-sidebars-foldable.patch
+54 -37
View File
@@ -32,13 +32,13 @@ bar button - so nothing there promises anything.
---
apps/app-frontend/src/App.vue | 180 ++++++++++++++++--
.../ui/settings/display/BehaviorSettings.vue | 18 --
.../ui/settings/display/FeaturesSettings.vue | 28 +++
.../ui/settings/display/FeaturesSettings.vue | 38 +++-
.../src/composables/use-app-settings.ts | 4 +
packages/app-lib/src/state/settings.rs | 4 +
5 files changed, 201 insertions(+), 33 deletions(-)
5 files changed, 210 insertions(+), 34 deletions(-)
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index d750a5f..76da736 100644
index c5d4703..f9dd80a 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -10,6 +10,8 @@ import {
@@ -160,7 +160,7 @@ index d750a5f..76da736 100644
updateDownloadMissingVersion: {
id: 'app.update.download-error.missing-version',
defaultMessage: 'Failed to download update: no version available',
@@ -2252,6 +2320,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@@ -2271,6 +2339,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
<ImageIcon />
</NavButton>
<NavButton
@@ -168,7 +168,7 @@ index d750a5f..76da736 100644
v-tooltip.right="formatMessage(messages.modrinthHosting)"
to="/hosting/manage"
:is-primary="(r) => r.path === '/hosting/manage' || r.path === '/hosting/manage/'"
@@ -2377,16 +2446,42 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@@ -2396,16 +2465,42 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
<Breadcrumbs />
</div>
<section data-tauri-drag-region class="flex shrink-0 ml-auto items-center">
@@ -220,7 +220,7 @@ index d750a5f..76da736 100644
<div class="flex mr-3">
<Suspense>
<AppActionBar />
@@ -2502,10 +2597,18 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@@ -2521,10 +2616,18 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
class="p-4 border-0 border-b-[1px] border-[--brand-gradient-border] border-solid"
/>
<div v-if="news && news.length > 0" class="p-4 flex flex-col items-center">
@@ -242,7 +242,7 @@ index d750a5f..76da736 100644
<NewsArticleCard
v-for="(item, index) in news"
:key="`news-${index}`"
@@ -2531,6 +2634,21 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@@ -2550,6 +2653,21 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
<I18nDebugPanel />
<NotificationPanel :has-sidebar="sidebarVisible" />
<PopupNotificationPanel :has-sidebar="sidebarVisible" />
@@ -264,7 +264,7 @@ index d750a5f..76da736 100644
<ErrorModal ref="errorModal" />
<MinecraftAuthErrorModal ref="minecraftAuthErrorModal" />
<MinecraftRequiredModal ref="minecraftRequiredModal" />
@@ -2743,6 +2861,38 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@@ -2762,6 +2880,38 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
display: contents;
}
@@ -304,10 +304,10 @@ index d750a5f..76da736 100644
.nav-button-animated-enter-active {
transition: all 0.5s cubic-bezier(0.15, 1.4, 0.64, 0.96);
diff --git a/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue b/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
index 55622d7..6c6ba20 100644
index db502ad..c433de6 100644
--- a/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
@@ -80,14 +80,6 @@ const messages = defineMessages({
@@ -79,14 +79,6 @@ const messages = defineMessages({
id: 'app.appearance-settings.default-landing-page.library',
defaultMessage: 'Library',
},
@@ -322,9 +322,9 @@ index 55622d7..6c6ba20 100644
compactModeTitle: {
id: 'app.appearance-settings.compact-mode.title',
defaultMessage: 'Compact mode',
@@ -288,16 +280,6 @@ onBeforeUnmount(() => {
</div>
<Toggle id="minimize-launcher" v-model="current.minimizeApp" />
@@ -298,16 +290,6 @@ onBeforeUnmount(() => {
aria-describedby="refocus-on-game-close-description"
/>
</div>
-
- <div class="flex items-center justify-between gap-4">
@@ -340,18 +340,32 @@ index 55622d7..6c6ba20 100644
</section>
diff --git a/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue b/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
index 1d3e379..ae88550 100644
index 6ba67a9..2edfeb8 100644
--- a/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
@@ -43,6 +43,7 @@ const quickInstances = useQuickInstanceLimit()
@@ -12,7 +12,11 @@ import {
import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
import { inject, onBeforeUnmount, onMounted } from 'vue'
-import { useAppSettings } from '@/composables/use-app-settings.ts'
+import {
+ DEFAULT_FEATURE_FLAGS,
+ type FeatureFlag,
+ useAppSettings,
+} from '@/composables/use-app-settings.ts'
import {
QUICK_INSTANCE_LIMIT_MAX,
useQuickInstanceLimit,
@@ -38,6 +42,8 @@ const settingsModal = inject(appSettingsModalContextKey, null)
const quickInstances = useQuickInstanceLimit()
const queryClient = useQueryClient()
const showJumpInFlag: FeatureFlag = 'worlds_in_home'
+const showHostingFlag: FeatureFlag = 'show_hosting_in_sidebar'
+
const messages = defineMessages({
syncAcrossDevicesTitle: {
@@ -95,6 +96,15 @@ const messages = defineMessages({
id: 'app.features-settings.sync-across-devices.title',
@@ -89,6 +95,15 @@ const messages = defineMessages({
id: 'app.features-settings.show-skin-selector.description',
defaultMessage: 'Show a button in the left sidebar to open the skin selector.',
},
@@ -367,7 +381,7 @@ index 1d3e379..ae88550 100644
quickInstancesTitle: {
id: 'app.features-settings.quick-instances.title',
defaultMessage: 'Quick instances in sidebar',
@@ -125,6 +135,7 @@ type FeaturesSettingsState = {
@@ -119,6 +134,7 @@ type FeaturesSettingsState = {
showScreenshotsTab: boolean
showAllScreenshots: boolean
showSkinSelector: boolean
@@ -375,31 +389,34 @@ index 1d3e379..ae88550 100644
quickInstanceCount: number
showJumpIn: boolean
}
@@ -144,6 +155,7 @@ function getFeaturesSettingsState(
@@ -138,6 +154,7 @@ function getFeaturesSettingsState(
showScreenshotsTab: settings.show_screenshots_tab_in_instances,
showAllScreenshots: globalSyncedOptions.screenshots,
showSkinSelector: settings.show_skin_selector_in_sidebar,
+ showHosting: settings.feature_flags[showHostingFlag] ?? DEFAULT_FEATURE_FLAGS[showHostingFlag],
quickInstanceCount: quickInstances.limit.value ?? QUICK_INSTANCE_LIMIT_MAX,
showJumpIn: settings.feature_flags[showJumpInFlag] ?? DEFAULT_FEATURE_FLAGS[showJumpInFlag],
showJumpIn: settings.show_jump_in,
}
@@ -184,6 +196,7 @@ const settingsMutation = useMutation({
feature_flags: {
...latestSettings.feature_flags,
[showJumpInFlag]: value.showJumpIn,
@@ -176,6 +193,10 @@ const settingsMutation = useMutation({
show_screenshots_tab_in_instances: value.showScreenshotsTab,
show_skin_selector_in_sidebar: value.showSkinSelector,
show_jump_in: value.showJumpIn,
+ feature_flags: {
+ ...latestSettings.feature_flags,
+ [showHostingFlag]: value.showHosting,
},
+ },
}
@@ -206,6 +219,7 @@ const settingsMutation = useMutation({
const screenshotsChanged =
@@ -197,6 +218,7 @@ const settingsMutation = useMutation({
appSettings.showScreenshotsTabInInstances = value.showScreenshotsTab
appSettings.showSkinSelectorInSidebar = value.showSkinSelector
appSettings.featureFlags[showJumpInFlag] = value.showJumpIn
appSettings.showJumpIn = value.showJumpIn
+ appSettings.featureFlags[showHostingFlag] = value.showHosting
if (updateQuickInstanceCount) {
quickInstances.setLimit(value.quickInstanceCount)
@@ -366,6 +380,20 @@ onBeforeUnmount(() => {
@@ -357,6 +379,20 @@ onBeforeUnmount(() => {
/>
</div>
@@ -421,12 +438,12 @@ index 1d3e379..ae88550 100644
<h3 class="m-0 text-lg font-semibold text-contrast">
{{ formatMessage(messages.quickInstancesTitle) }}
diff --git a/apps/app-frontend/src/composables/use-app-settings.ts b/apps/app-frontend/src/composables/use-app-settings.ts
index 0d58903..28c78c3 100644
index dceec83..bce1f20 100644
--- a/apps/app-frontend/src/composables/use-app-settings.ts
+++ b/apps/app-frontend/src/composables/use-app-settings.ts
@@ -24,6 +24,10 @@ export const DEFAULT_FEATURE_FLAGS = {
friends_pending_collapsed: true,
dismissed_photosensitivity_filter_warning: false,
@@ -11,6 +11,10 @@ export const DEFAULT_FEATURE_FLAGS = {
pride_fundraiser: true,
i18n_debug: false,
localhost_sign_in: false,
+ show_hosting_in_sidebar: true,
+ news_collapsed: false,
@@ -436,12 +453,12 @@ index 0d58903..28c78c3 100644
export type FeatureFlag = keyof typeof DEFAULT_FEATURE_FLAGS
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 20601b8..b5f2ec6 100644
index 47490ad..7797e78 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -88,6 +88,10 @@ pub enum FeatureFlag {
FriendsPendingCollapsed,
DismissedPhotosensitivityFilterWarning,
@@ -104,6 +104,10 @@ pub enum FeatureFlag {
ServerProjectQa,
I18nDebug,
LocalhostSignIn,
+ ShowHostingInSidebar,
+ NewsCollapsed,
patches/0006-Add-Ely.by-accounts.patch
+3 -3
View File
@@ -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");
}
patches/0007-Sign-in-to-Microsoft-in-the-player-s-own-browser.patch
+1 -1
View File
@@ -420,7 +420,7 @@ index 57580ff..9b2408e 100644
* 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
index 0f62dd8..919c91a 100644
index 24db197..3dbf3dc 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -14,6 +14,8 @@ fn main() {
patches/0008-Round-the-window-corners-on-Linux.patch
+1 -1
View File
@@ -11,7 +11,7 @@ Subject: [PATCH] Round the window corners on Linux
4 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 76da736..dcae1f1 100644
index f9dd80a..288549d 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -543,6 +543,16 @@ watch([os, isFullscreen], ([osName, fullscreen]) => {
patches/0009-Scroll-with-the-middle-mouse-button.patch
+1 -1
View File
@@ -11,7 +11,7 @@ Subject: [PATCH] Scroll with the middle mouse button
create mode 100644 apps/app-frontend/src/helpers/autoscroll.ts
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index dcae1f1..e18904b 100644
index 288549d..4283ebd 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -126,6 +126,7 @@ import {
patches/0010-Manage-Ely.by-skins-from-the-skin-page.patch
+1 -1
View File
@@ -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
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 919c91a..1e44522 100644
index 3dbf3dc..c1f27a4 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -27,6 +27,23 @@ fn main() {
patches/0011-Show-every-player-s-skin-on-offline-servers.patch
+22 -22
View File
@@ -52,7 +52,7 @@ The agent code comes from Noctrinth (https://github.com/Everelsu/Noctrinth).
create mode 100644 packages/app-lib/java/src/main/java/com/modrinth/theseus/agent/transformers/SessionServiceTransformer.java
diff --git a/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue b/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
index ae88550..9a9e8ef 100644
index 2edfeb8..4e55cdd 100644
--- a/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
@@ -1,5 +1,7 @@
@@ -71,15 +71,15 @@ index ae88550..9a9e8ef 100644
import { screenshotKeys } from '@/pages/instance/query-options.ts'
import { appSettingsModalContextKey } from '@/providers/app-settings-modal'
@@ -44,6 +47,7 @@ const queryClient = useQueryClient()
@@ -43,6 +46,7 @@ const quickInstances = useQuickInstanceLimit()
const queryClient = useQueryClient()
const showJumpInFlag: FeatureFlag = 'worlds_in_home'
const showHostingFlag: FeatureFlag = 'show_hosting_in_sidebar'
+const universalSkinsFlag: FeatureFlag = 'universal_skins'
const messages = defineMessages({
syncAcrossDevicesTitle: {
@@ -126,6 +130,32 @@ const messages = defineMessages({
@@ -125,6 +129,32 @@ const messages = defineMessages({
id: 'app.features-settings.show-jump-in.description',
defaultMessage: 'Show recently played worlds and instances at the top of the Play page.',
},
@@ -112,7 +112,7 @@ index ae88550..9a9e8ef 100644
})
type FeaturesSettingsState = {
@@ -136,6 +166,7 @@ type FeaturesSettingsState = {
@@ -135,6 +165,7 @@ type FeaturesSettingsState = {
showAllScreenshots: boolean
showSkinSelector: boolean
showHosting: boolean
@@ -120,32 +120,32 @@ index ae88550..9a9e8ef 100644
quickInstanceCount: number
showJumpIn: boolean
}
@@ -156,6 +187,8 @@ function getFeaturesSettingsState(
@@ -155,6 +186,8 @@ function getFeaturesSettingsState(
showAllScreenshots: globalSyncedOptions.screenshots,
showSkinSelector: settings.show_skin_selector_in_sidebar,
showHosting: settings.feature_flags[showHostingFlag] ?? DEFAULT_FEATURE_FLAGS[showHostingFlag],
+ universalSkins:
+ settings.feature_flags[universalSkinsFlag] ?? DEFAULT_FEATURE_FLAGS[universalSkinsFlag],
quickInstanceCount: quickInstances.limit.value ?? QUICK_INSTANCE_LIMIT_MAX,
showJumpIn: settings.feature_flags[showJumpInFlag] ?? DEFAULT_FEATURE_FLAGS[showJumpInFlag],
showJumpIn: settings.show_jump_in,
}
@@ -197,6 +230,7 @@ const settingsMutation = useMutation({
@@ -196,6 +229,7 @@ const settingsMutation = useMutation({
feature_flags: {
...latestSettings.feature_flags,
[showJumpInFlag]: value.showJumpIn,
[showHostingFlag]: value.showHosting,
+ [universalSkinsFlag]: value.universalSkins,
},
}
@@ -220,6 +254,7 @@ const settingsMutation = useMutation({
@@ -219,6 +253,7 @@ const settingsMutation = useMutation({
appSettings.showSkinSelectorInSidebar = value.showSkinSelector
appSettings.featureFlags[showJumpInFlag] = value.showJumpIn
appSettings.showJumpIn = value.showJumpIn
appSettings.featureFlags[showHostingFlag] = value.showHosting
+ appSettings.featureFlags[universalSkinsFlag] = value.universalSkins
if (updateQuickInstanceCount) {
quickInstances.setLimit(value.quickInstanceCount)
@@ -413,6 +448,40 @@ onBeforeUnmount(() => {
@@ -412,6 +447,40 @@ onBeforeUnmount(() => {
</div>
</section>
@@ -187,10 +187,10 @@ index ae88550..9a9e8ef 100644
<h2 class="m-0 text-xl font-semibold text-contrast">
{{ formatMessage(messages.playPageTitle) }}
diff --git a/apps/app-frontend/src/composables/use-app-settings.ts b/apps/app-frontend/src/composables/use-app-settings.ts
index 28c78c3..e0c0a89 100644
index bce1f20..8d6e6f7 100644
--- a/apps/app-frontend/src/composables/use-app-settings.ts
+++ b/apps/app-frontend/src/composables/use-app-settings.ts
@@ -28,6 +28,7 @@ export const DEFAULT_FEATURE_FLAGS = {
@@ -15,6 +15,7 @@ export const DEFAULT_FEATURE_FLAGS = {
news_collapsed: false,
sidebar_fold_explained: false,
right_sidebar_collapsed: false,
@@ -214,10 +214,10 @@ index f6e99d3..f06e812 100644
export async function showInstanceInFolder(instanceId) {
const fullPath = await get_full_path(instanceId)
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 1e44522..f5af028 100644
index c1f27a4..ab19b6c 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -399,6 +399,7 @@ fn main() {
@@ -400,6 +400,7 @@ fn main() {
"open_path",
"show_launcher_logs_folder",
"show_app_db_backups_folder",
@@ -2493,10 +2493,10 @@ index a482f66..76bedc7 100644
if !arg.is_empty() {
parsed_arguments.push(arg);
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 93cfd20..5378b99 100644
index fd11a46..ed4c789 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -1031,6 +1031,28 @@ pub async fn launch_minecraft(
@@ -1092,6 +1092,28 @@ pub async fn launch_minecraft(
let rpc_server = RpcServerBuilder::new().launch().await?;
@@ -2525,7 +2525,7 @@ index 93cfd20..5378b99 100644
command.args(
args::get_jvm_arguments(
args.get(&d::minecraft::ArgumentType::Jvm)
@@ -1057,6 +1079,7 @@ pub async fn launch_minecraft(
@@ -1118,6 +1140,7 @@ pub async fn launch_minecraft(
.as_ref()
.and_then(|x| x.get(&LoggingSide::Client)),
rpc_server.address(),
@@ -2560,7 +2560,7 @@ index b4fb7e2..fe37974 100644
#[inline]
pub fn instance_logs_dir(&self, instance_path: &str) -> PathBuf {
diff --git a/packages/app-lib/src/state/dirs/move_app_directory.rs b/packages/app-lib/src/state/dirs/move_app_directory.rs
index 7418675..a25a7fd 100644
index 3d0abc7..352336d 100644
--- a/packages/app-lib/src/state/dirs/move_app_directory.rs
+++ b/packages/app-lib/src/state/dirs/move_app_directory.rs
@@ -11,13 +11,14 @@ use sqlx::SqlitePool;
@@ -2580,10 +2580,10 @@ index 7418675..a25a7fd 100644
pub(crate) async fn relocate_tree(from: &Path, to: &Path) -> crate::Result<()> {
if !fs::try_exists(from).await? {
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index b5f2ec6..69fc7ff 100644
index 7797e78..2a86714 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -92,6 +92,7 @@ pub enum FeatureFlag {
@@ -108,6 +108,7 @@ pub enum FeatureFlag {
NewsCollapsed,
SidebarFoldExplained,
RightSidebarCollapsed,
patches/0012-Launch-a-running-instance-again-on-another-account.patch
+23 -23
View File
@@ -206,10 +206,10 @@ index 977bf82..c390c4c 100644
+ */
+process_uuid: string, } & ({ "type": "log4j" } & Log4jEvent | { "type": "legacy", message: string, });
diff --git a/apps/app-frontend/src/generated/app-events/postcard/index.d.ts b/apps/app-frontend/src/generated/app-events/postcard/index.d.ts
index e763358..149f9ef 100644
index 9fd4962..8f632c9 100644
--- a/apps/app-frontend/src/generated/app-events/postcard/index.d.ts
+++ b/apps/app-frontend/src/generated/app-events/postcard/index.d.ts
@@ -50,7 +50,7 @@ export type FriendPayload = { tag: "friend_request", value: { from: string } } |
@@ -48,7 +48,7 @@ export type FriendPayload = { tag: "friend_request", value: { from: string } } |
export type FriendStatusPayload = { user_id: string, profile_name: string | undefined, last_update: string }
export type SharedInstanceUnavailableReason = { tag: "deleted" } | { tag: "access_revoked" } | { tag: "quarantined" }
export type LogEvent = { tag: "log4j", value: Log4jEvent } | { tag: "legacy", value: { message: string } }
@@ -219,10 +219,10 @@ index e763358..149f9ef 100644
export type Log4jEvent = { timestamp_millis: i64 | undefined, logger_name: string | undefined, level: string | undefined, thread_name: string | undefined, message: string | undefined, throwable: string | undefined }
export type ModLoader = { tag: "vanilla" } | { tag: "forge" } | { tag: "fabric" } | { tag: "quilt" } | { tag: "neoforge" }
diff --git a/apps/app-frontend/src/generated/app-events/postcard/index.js b/apps/app-frontend/src/generated/app-events/postcard/index.js
index 2407d7d..1b343a0 100644
index 1393f04..e69e456 100644
--- a/apps/app-frontend/src/generated/app-events/postcard/index.js
+++ b/apps/app-frontend/src/generated/app-events/postcard/index.js
@@ -475,6 +475,7 @@ function deserialize_LOG_EVENT(d) {
@@ -434,6 +434,7 @@ function deserialize_LOG_EVENT(d) {
function deserialize_LOG_PAYLOAD(d) {
return {
instance_id: d.deserialize_string(),
@@ -231,7 +231,7 @@ index 2407d7d..1b343a0 100644
};
}
diff --git a/apps/app-frontend/src/helpers/instance.ts b/apps/app-frontend/src/helpers/instance.ts
index a0c0b56..817a63c 100644
index 46de853..c0162e2 100644
--- a/apps/app-frontend/src/helpers/instance.ts
+++ b/apps/app-frontend/src/helpers/instance.ts
@@ -601,11 +601,13 @@ export async function get_pack_export_candidates(
@@ -311,7 +311,7 @@ index ce4b436..31a6ded 100644
settings: []
openFolder: []
diff --git a/apps/app-frontend/src/pages/instance/layout.vue b/apps/app-frontend/src/pages/instance/layout.vue
index 7ec73ca..fcd5802 100644
index 441dafe..3f8af81 100644
--- a/apps/app-frontend/src/pages/instance/layout.vue
+++ b/apps/app-frontend/src/pages/instance/layout.vue
@@ -46,6 +46,7 @@
@@ -322,7 +322,7 @@ index 7ec73ca..fcd5802 100644
@play-server="() => handlePlayServer()"
@settings="() => settingsModal?.show()"
@open-folder="() => instance && showInstanceInFolder(instance.id)"
@@ -558,6 +559,30 @@ const launchInstance = async (context: string) => {
@@ -595,6 +596,30 @@ const launchInstance = async (context: string) => {
})
}
@@ -427,10 +427,10 @@ index 2aacfe0..e2a59fd 100644
liveConsole.clear()
invalidate()
diff --git a/apps/app-frontend/src/providers/setup/app-event-codec.ts b/apps/app-frontend/src/providers/setup/app-event-codec.ts
index 638386d..3cccc8a 100644
index c0eb80e..b9d5eeb 100644
--- a/apps/app-frontend/src/providers/setup/app-event-codec.ts
+++ b/apps/app-frontend/src/providers/setup/app-event-codec.ts
@@ -122,7 +122,7 @@ function normalizeLogPayload(value: unknown): WireObject {
@@ -112,7 +112,7 @@ function normalizeLogPayload(value: unknown): WireObject {
event.timestamp_millis = number(event.timestamp_millis)
}
@@ -440,7 +440,7 @@ index 638386d..3cccc8a 100644
function normalizeInstallProgress(value: unknown): WireObject {
diff --git a/apps/app/build.rs b/apps/app/build.rs
index f5af028..f98395e 100644
index ab19b6c..8aff73d 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -110,7 +110,9 @@ fn main() {
@@ -454,10 +454,10 @@ index f5af028..f98395e 100644
.default_permission(
DefaultPermissionRule::AllowAllCommands,
diff --git a/apps/app/src/api/instance.rs b/apps/app/src/api/instance.rs
index 2861594..2a512dd 100644
index e0ba5c2..09534e2 100644
--- a/apps/app/src/api/instance.rs
+++ b/apps/app/src/api/instance.rs
@@ -1324,12 +1324,19 @@ pub async fn instance_get_pack_export_candidates(
@@ -1323,12 +1323,19 @@ pub async fn instance_get_pack_export_candidates(
pub async fn instance_run(
instance_id: &str,
server_address: Option<String>,
@@ -520,11 +520,11 @@ index e938efa..5150b00 100644
+ Ok(())
+}
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index 8a0040f..46cc47a 100644
index 9f7b215..d750bdf 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -59,7 +59,8 @@ pub use self::projects::{
update_managed_modrinth_version, update_project,
@@ -58,7 +58,8 @@ pub use self::projects::{
toggle_disable_project, update_managed_modrinth_version, update_project,
};
pub use self::run::{
- QuickPlayType, kill, run, try_update_playtime_by_instance_id,
@@ -636,10 +636,10 @@ index 4ce0c57..3382b5b 100644
#[tracing::instrument]
diff --git a/packages/app-lib/src/event/mod.rs b/packages/app-lib/src/event/mod.rs
index 833349d..84b9a87 100644
index 722d94f..d3a597a 100644
--- a/packages/app-lib/src/event/mod.rs
+++ b/packages/app-lib/src/event/mod.rs
@@ -559,6 +559,8 @@ mod log_types {
@@ -527,6 +527,8 @@ mod log_types {
#[serde_binhum::serde_binhum]
pub struct LogPayload {
pub instance_id: String,
@@ -649,10 +649,10 @@ index 833349d..84b9a87 100644
#[cfg_attr(feature = "export-ts", ts(flatten))]
pub event: LogEvent,
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 5378b99..4199bff 100644
index ed4c789..3a81499 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -825,6 +825,9 @@ pub async fn launch_minecraft(
@@ -886,6 +886,9 @@ pub async fn launch_minecraft(
post_exit_hook: Option<String>,
context: &InstanceLaunchContext,
mut quick_play_type: QuickPlayType,
@@ -662,7 +662,7 @@ index 5378b99..4199bff 100644
) -> crate::Result<ProcessMetadata> {
let instance = &context.instance;
let content_set = &context.applied_content_set;
@@ -954,21 +957,27 @@ pub async fn launch_minecraft(
@@ -1015,21 +1018,27 @@ pub async fn launch_minecraft(
let env_args = Vec::from(env_args);
@@ -705,7 +705,7 @@ index 5378b99..4199bff 100644
}
if let Some(path) = download::missing_runtime_file(
@@ -1178,7 +1187,10 @@ pub async fn launch_minecraft(
@@ -1239,7 +1248,10 @@ pub async fn launch_minecraft(
let _store_lease = state.content_store.lease().await;
state.content_store.recover(Some(&instance.id)).await?;
// state.content_store.validate_instance(instance).await?;
@@ -717,7 +717,7 @@ index 5378b99..4199bff 100644
return Err(crate::ErrorKind::LauncherError(format!(
"Instance {} is already running",
instance.id
@@ -1225,6 +1237,8 @@ pub async fn launch_minecraft(
@@ -1286,6 +1298,8 @@ pub async fn launch_minecraft(
&instance.id,
&instance.path,
&instance.name,
@@ -727,7 +727,7 @@ index 5378b99..4199bff 100644
post_exit_hook,
env_args,
diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs
index fb09842..e9aaa3a 100644
index 45471b9..4c9ea57 100644
--- a/packages/app-lib/src/state/process.rs
+++ b/packages/app-lib/src/state/process.rs
@@ -47,37 +47,74 @@ impl LogRingBuffer {
patches/0013-Explain-what-went-wrong-when-the-game-crashed.patch
+1 -1
View File
@@ -880,7 +880,7 @@ index e2a59fd..4fcddea 100644
})
</script>
diff --git a/apps/app/build.rs b/apps/app/build.rs
index f98395e..0fb53a5 100644
index 8aff73d..85bd5b8 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -44,6 +44,17 @@ fn main() {
patches/0014-Browse-skins-from-Ely.by-NameMC-laby.net-and-crafty..patch
+1 -1
View File
@@ -976,7 +976,7 @@ index bcd79ec..9a10f0e 100644
</div>
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 0fb53a5..f01ba91 100644
index 85bd5b8..2c8f2b9 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -44,6 +44,19 @@ fn main() {
patches/0016-Show-the-account-in-the-title-bar-when-the-sidebar-i.patch
+2 -2
View File
@@ -22,7 +22,7 @@ menu closing.
create mode 100644 apps/app-frontend/src/components/ui/TitleBarAccountSwitcher.vue
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index e18904b..4d95408 100644
index 4283ebd..0a55cb4 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -79,6 +79,7 @@ import { computed, nextTick, onMounted, onUnmounted, provide, ref, watch } from
@@ -33,7 +33,7 @@ index e18904b..4d95408 100644
import AppActionBar from '@/components/ui/AppActionBar.vue'
import Breadcrumbs from '@/components/ui/Breadcrumbs.vue'
import ErrorModal from '@/components/ui/ErrorModal.vue'
@@ -2505,6 +2506,13 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@@ -2524,6 +2525,13 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
<AppActionBar />
</Suspense>
</div>
patches/0018-Update-from-Modrinth-Enhanced-s-own-releases.patch
+3 -3
View File
@@ -19,10 +19,10 @@ get a notice with a button to the release on GitHub.
3 files changed, 76 insertions(+), 21 deletions(-)
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 4d95408..6539d4a 100644
index 0a55cb4..9679884 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -1884,9 +1884,13 @@ const updatePopupMessages = defineMessages({
@@ -1903,9 +1903,13 @@ const updatePopupMessages = defineMessages({
defaultMessage: `Modrinth App v{version} has finished downloading. Reload to update now, or automatically when you close Modrinth App.`,
},
linuxBody: {
@@ -38,7 +38,7 @@ index 4d95408..6539d4a 100644
},
reload: {
id: 'app.update-popup.reload',
@@ -2061,28 +2065,47 @@ async function checkUpdates() {
@@ -2080,28 +2084,47 @@ async function checkUpdates() {
)
}
patches/0019-Add-accounts-from-other-authlib-injector-servers.patch
+4 -4
View File
@@ -847,7 +847,7 @@ index 9b2408e..f4d24a1 100644
* Retrieves the default user
* @return {Promise<UUID | undefined>}
diff --git a/apps/app/build.rs b/apps/app/build.rs
index f01ba91..94f7a8e 100644
index 2c8f2b9..3726ef5 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -18,6 +18,8 @@ fn main() {
@@ -1014,10 +1014,10 @@ index fba473f..fe95027 100644
#[tracing::instrument]
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 4199bff..7b648b7 100644
index 3a81499..9b40d34 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -1104,10 +1104,11 @@ pub async fn launch_minecraft(
@@ -1165,10 +1165,11 @@ pub async fn launch_minecraft(
command.arg("--add-opens=jdk.internal/jdk.internal.misc=ALL-UNNAMED");
}
@@ -1033,7 +1033,7 @@ index 4199bff..7b648b7 100644
let injector = crate::util::authlib_injector::get_authlib_injector(
&state.directories,
)
@@ -1116,7 +1117,7 @@ pub async fn launch_minecraft(
@@ -1177,7 +1178,7 @@ pub async fn launch_minecraft(
command.arg(format!(
"-javaagent:{}={}",
injector.to_string_lossy(),
patches/0022-Sign-in-to-custom-servers-in-the-browser.patch
+1 -1
View File
@@ -334,7 +334,7 @@ index f4d24a1..f93f4e9 100644
* Retrieves the default user
* @return {Promise<UUID | undefined>}
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 94f7a8e..507ad2f 100644
index 3726ef5..e33a52d 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -20,6 +20,8 @@ fn main() {
patches/0023-Browse-LittleSkin-s-skin-library.patch
+1 -1
View File
@@ -417,7 +417,7 @@ index ea86e86..e3c4b21 100644
return await invoke('plugin:skin-browser|skin_browser_site_skin', { site, id })
}
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 507ad2f..8cb21f2 100644
index e33a52d..ac124d9 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -54,6 +54,8 @@ fn main() {
patches/0024-Offer-the-launchers-instances-can-be-imported-from.patch
+3 -3
View File
@@ -61,7 +61,7 @@ index 34cf250..bfc728e 100644
/// null if it can't be found or doesn't exist
/// eg: get_default_launcher_path("MultiMC")
diff --git a/apps/app-frontend/src/providers/setup/creation-modal.ts b/apps/app-frontend/src/providers/setup/creation-modal.ts
index 964b17c..53ba797 100644
index 31ad5aa..f4a13ce 100644
--- a/apps/app-frontend/src/providers/setup/creation-modal.ts
+++ b/apps/app-frontend/src/providers/setup/creation-modal.ts
@@ -113,7 +113,12 @@ export function setupCreationModal(
@@ -135,7 +135,7 @@ index 851e44d..752832c 100644
return (await get_importable_instances(launcherName, path)) ?? []
},
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 8cb21f2..8e8a0f8 100644
index ac124d9..c9eebb7 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -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
#[tauri::command]
diff --git a/packages/app-lib/src/api/pack/import/mod.rs b/packages/app-lib/src/api/pack/import/mod.rs
index 72f315d..15da6da 100644
index 52707bc..62ee673 100644
--- a/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(
patches/0025-Arrange-the-left-sidebar.patch
+6 -6
View File
@@ -26,7 +26,7 @@ where they belong; only the number of instances stays there.
create mode 100644 apps/app-frontend/src/composables/use-sidebar-layout.ts
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 6539d4a..871a8b9 100644
index 9679884..cb688fc 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -15,6 +15,7 @@ import {
@@ -162,7 +162,7 @@ index 6539d4a..871a8b9 100644
createNewInstance: {
id: 'app.nav.create-new-instance',
defaultMessage: 'Create new instance',
@@ -2327,52 +2409,15 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@@ -2346,52 +2428,15 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
class="app-grid-navbar bg-bg-raised flex flex-col p-[0.5rem] pt-0 gap-[0.25rem] w-[--left-bar-width]"
>
<NavButton
@@ -223,7 +223,7 @@ index 6539d4a..871a8b9 100644
</NavButton>
<suspense>
<QuickInstanceSwitcher>
@@ -2456,6 +2501,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@@ -2475,6 +2520,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
<LogInIcon class="text-brand" />
</NavButton>
</div>
@@ -293,10 +293,10 @@ index 32a86a3..e409510 100644
const { progress, version: downloadingVersion } = injectAppUpdateDownloadProgress()
diff --git a/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue b/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
index 9a9e8ef..7636c46 100644
index 4e55cdd..9bc7ce3 100644
--- a/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
@@ -83,32 +83,6 @@ const messages = defineMessages({
@@ -82,32 +82,6 @@ const messages = defineMessages({
id: 'app.features-settings.sidebar.title',
defaultMessage: 'Sidebar',
},
@@ -329,7 +329,7 @@ index 9a9e8ef..7636c46 100644
quickInstancesTitle: {
id: 'app.features-settings.quick-instances.title',
defaultMessage: 'Quick instances in sidebar',
@@ -385,50 +359,6 @@ onBeforeUnmount(() => {
@@ -384,50 +358,6 @@ onBeforeUnmount(() => {
{{ formatMessage(messages.sidebarTitle) }}
</h2>
<div class="mt-4 flex flex-col gap-6">
patches/0027-Make-an-instance-group-from-the-library-s-free-space.patch
+2 -2
View File
@@ -34,7 +34,7 @@ index 20000b6..1849835 100644
<template>
diff --git a/apps/app-frontend/src/pages/Index.vue b/apps/app-frontend/src/pages/Index.vue
index 1c5fb5d..074e709 100644
index cdad0e8..7aa6e89 100644
--- a/apps/app-frontend/src/pages/Index.vue
+++ b/apps/app-frontend/src/pages/Index.vue
@@ -1,5 +1,5 @@
@@ -78,7 +78,7 @@ index 1c5fb5d..074e709 100644
}
</script>
@@ -100,7 +112,7 @@ function openPageContextMenu(event: MouseEvent) {
v-if="recentInstances?.length > 0 && appSettings.getFeatureFlag('worlds_in_home')"
v-if="recentInstances?.length > 0 && appSettings.showJumpIn"
:recent-instances="recentInstances"
/>
- <LibrarySection :instances="instances" />
patches/0028-Start-in-the-language-the-system-is-set-to.patch
+2 -2
View File
@@ -16,7 +16,7 @@ and never over a language that was picked in the settings.
create mode 100644 apps/app-frontend/src/helpers/system-locale.ts
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 871a8b9..0bc4490 100644
index cb688fc..bb4aa89 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -166,6 +166,7 @@ import {
@@ -27,7 +27,7 @@ index 871a8b9..0bc4490 100644
import { get_user_preferences } from '@/helpers/user-preferences.ts'
import { parse_modrinth_user_link } from '@/helpers/users'
import {
@@ -938,9 +939,19 @@ async function setupApp() {
@@ -952,9 +953,19 @@ async function setupApp() {
pending_update_toast_for_version,
} = await traceStartupStep('Read startup settings', getSettings)
patches/0029-Translate-Modrinth-Enhanced-s-own-text.patch
+523 -403
View File
File diff suppressed because it is too large. Load diff
patches/0030-Keep-WebKit-s-own-menu-off-the-interface-s-own-image.patch
+2 -2
View File
@@ -9,10 +9,10 @@ Subject: [PATCH] Keep WebKit's own menu off the interface's own images
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 0bc4490..fcfb5e1 100644
index bb4aa89..2559f6a 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -2340,7 +2340,16 @@ function handleAuxClick(e) {
@@ -2359,7 +2359,16 @@ function handleAuxClick(e) {
function handleContextMenu(event) {
const target = event.target
if (target instanceof Element) {
patches/0033-Stay-behind-the-game-while-another-instance-is-runni.patch
+9 -10
View File
@@ -4,24 +4,23 @@ Date: Sat, 19 Sep 2026 02:22:32 +0200
Subject: [PATCH] Stay behind the game while another instance is running
---
packages/app-lib/src/state/process.rs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
packages/app-lib/src/state/process.rs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs
index e9aaa3a..a4b24d0 100644
index 4c9ea57..c242fea 100644
--- a/packages/app-lib/src/state/process.rs
+++ b/packages/app-lib/src/state/process.rs
@@ -1064,8 +1064,12 @@ impl Process {
@@ -1063,8 +1063,11 @@ impl Process {
let _ = state.friends_socket.update_status(None).await;
// If in tauri, window should show itself again after process exists if it was hidden
+ //
+ // Only once the last instance is gone, though: while another one is
+ // Refocus only once the last instance is gone: while another one is
+ // still being played, taking the screen back from it is the last thing
+ // the player wants.
#[cfg(feature = "tauri")]
- {
+ if state.process_manager.get_all().is_empty() {
let window = crate::EventState::get_main_window().await?;
if let Some(window) = window {
window.unminimize()?;
let settings = crate::state::Settings::get(&state.pool).await?;
if settings.refocus_on_game_close
&& let Some(window) =
patches/0035-Keep-Modrinth-s-translations-off-the-text-this-fork-.patch
+51 -51
View File
@@ -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.',
},
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
index 0488f04..7e88f9e 100644
index 1dae5a6..5238f19 100644
--- a/apps/app-frontend/src/locales/de-CH/index.json
+++ b/apps/app-frontend/src/locales/de-CH/index.json
@@ -3173,6 +3173,9 @@
@@ -3245,6 +3245,9 @@
"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."
},
@@ -88,7 +88,7 @@ index 0488f04..7e88f9e 100644
"app.settings.privacy.telemetry.title": {
"message": "Telemetrie"
},
@@ -5030,6 +5033,12 @@
@@ -5177,6 +5180,12 @@
"minecraft-required.header": {
"message": "Minecraft erforderlich"
},
@@ -102,10 +102,10 @@ index 0488f04..7e88f9e 100644
"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
index e84b362..cf8348e 100644
index f3e3d9d..76a27ab 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -3173,6 +3173,9 @@
@@ -3245,6 +3245,9 @@
"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."
},
@@ -115,7 +115,7 @@ index e84b362..cf8348e 100644
"app.settings.privacy.telemetry.title": {
"message": "Telemetrie"
},
@@ -5030,6 +5033,12 @@
@@ -5177,6 +5180,12 @@
"minecraft-required.header": {
"message": "Minecraft erforderlich"
},
@@ -129,10 +129,10 @@ index e84b362..cf8348e 100644
"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
index 20ca77b..0091df5 100644
index 0ba9ee0..b0ad1f6 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -3128,6 +3128,9 @@
@@ -3245,6 +3245,9 @@
"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."
},
@@ -142,7 +142,7 @@ index 20ca77b..0091df5 100644
"app.settings.privacy.telemetry.title": {
"message": "Telemetría"
},
@@ -4979,6 +4982,12 @@
@@ -5177,6 +5180,12 @@
"minecraft-required.header": {
"message": "Minecraft requerido"
},
@@ -156,10 +156,10 @@ index 20ca77b..0091df5 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."
},
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
index 3a542e3..2e1d85b 100644
index 115ae56..8504901 100644
--- a/apps/app-frontend/src/locales/es-ES/index.json
+++ b/apps/app-frontend/src/locales/es-ES/index.json
@@ -3101,6 +3101,9 @@
@@ -3242,6 +3242,9 @@
"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."
},
@@ -169,7 +169,7 @@ index 3a542e3..2e1d85b 100644
"app.settings.privacy.telemetry.title": {
"message": "Telemetría"
},
@@ -4952,6 +4955,12 @@
@@ -5174,6 +5177,12 @@
"minecraft-required.header": {
"message": "Minecraft requerido"
},
@@ -183,10 +183,10 @@ index 3a542e3..2e1d85b 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."
},
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
index d554017..c376646 100644
index aeed85e..6f6a4bb 100644
--- a/apps/app-frontend/src/locales/fr-FR/index.json
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
@@ -2726,6 +2726,9 @@
@@ -2915,6 +2915,9 @@
"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."
},
@@ -196,7 +196,7 @@ index d554017..c376646 100644
"app.settings.privacy.telemetry.title": {
"message": "Télémétrie"
},
@@ -4115,6 +4118,12 @@
@@ -4457,6 +4460,12 @@
"minecraft-required.header": {
"message": "Minecraft requis"
},
@@ -210,10 +210,10 @@ index d554017..c376646 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."
},
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
index 090daaa..70ab085 100644
index e6b0ddf..66952d4 100644
--- a/apps/app-frontend/src/locales/hu-HU/index.json
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
@@ -3170,6 +3170,9 @@
@@ -3197,6 +3197,9 @@
"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."
},
@@ -223,7 +223,7 @@ index 090daaa..70ab085 100644
"app.settings.privacy.telemetry.title": {
"message": "Telemetria"
},
@@ -5027,6 +5030,12 @@
@@ -5069,6 +5072,12 @@
"minecraft-required.header": {
"message": "Minecraft szükséges"
},
@@ -237,10 +237,10 @@ index 090daaa..70ab085 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."
},
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
index 4fbc1d0..c915929 100644
index 93dab40..db542bd 100644
--- a/apps/app-frontend/src/locales/it-IT/index.json
+++ b/apps/app-frontend/src/locales/it-IT/index.json
@@ -3167,6 +3167,9 @@
@@ -3239,6 +3239,9 @@
"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."
},
@@ -250,7 +250,7 @@ index 4fbc1d0..c915929 100644
"app.settings.privacy.telemetry.title": {
"message": "Telemetria"
},
@@ -5024,6 +5027,12 @@
@@ -5171,6 +5174,12 @@
"minecraft-required.header": {
"message": "Minecraft richiesto"
},
@@ -264,10 +264,10 @@ index 4fbc1d0..c915929 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."
},
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index 9b98f35..9d1581a 100644
index 7805ff0..51b7174 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -2099,6 +2099,9 @@
@@ -2303,6 +2303,9 @@
"app.settings.privacy.telemetry.description": {
"message": "Modrinthはユーザー体験の向上および最適化のために、匿名化されたアナリティクスと利用データを収集しています。このオプションをオフにすることで無効化（オプトアウト）され、以降データの収集は行われません。"
},
@@ -277,7 +277,7 @@ index 9b98f35..9d1581a 100644
"app.settings.privacy.telemetry.title": {
"message": "テレメトリ"
},
@@ -3605,6 +3608,12 @@
@@ -3809,6 +3812,12 @@
"minecraft-required.header": {
"message": "Minecraftが必要です"
},
@@ -291,10 +291,10 @@ index 9b98f35..9d1581a 100644
"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
index b153a78..8d634da 100644
index 2d3892f..e3b7aa4 100644
--- a/apps/app-frontend/src/locales/nl-NL/index.json
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
@@ -3035,6 +3035,9 @@
@@ -3125,6 +3125,9 @@
"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."
},
@@ -304,7 +304,7 @@ index b153a78..8d634da 100644
"app.settings.privacy.telemetry.title": {
"message": "Telemetrie"
},
@@ -4634,6 +4637,12 @@
@@ -4724,6 +4727,12 @@
"minecraft-required.header": {
"message": "Minecraft vereist"
},
@@ -318,10 +318,10 @@ index b153a78..8d634da 100644
"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
index 42122c9..6c8cf09 100644
index 42d3acd..2d3daf1 100644
--- a/apps/app-frontend/src/locales/pl-PL/index.json
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
@@ -3161,6 +3161,9 @@
@@ -3233,6 +3233,9 @@
"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."
},
@@ -331,7 +331,7 @@ index 42122c9..6c8cf09 100644
"app.settings.privacy.telemetry.title": {
"message": "Telemetria"
},
@@ -5018,6 +5021,12 @@
@@ -5165,6 +5168,12 @@
"minecraft-required.header": {
"message": "Minecraft wymagany"
},
@@ -345,10 +345,10 @@ index 42122c9..6c8cf09 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."
},
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
index ad277b3..a49acbe 100644
index 24e6af6..e01bf82 100644
--- a/apps/app-frontend/src/locales/pt-BR/index.json
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
@@ -3173,6 +3173,9 @@
@@ -3245,6 +3245,9 @@
"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."
},
@@ -358,7 +358,7 @@ index ad277b3..a49acbe 100644
"app.settings.privacy.telemetry.title": {
"message": "Telemetria"
},
@@ -5030,6 +5033,12 @@
@@ -5177,6 +5180,12 @@
"minecraft-required.header": {
"message": "Minecraft necessário"
},
@@ -372,10 +372,10 @@ index ad277b3..a49acbe 100644
"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
index 460fc40..526c357 100644
index e27fc6c..d010ced 100644
--- a/apps/app-frontend/src/locales/ru-RU/index.json
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
@@ -3149,6 +3149,9 @@
@@ -3224,6 +3224,9 @@
"app.settings.privacy.telemetry.description": {
"message": "Modrinth собирает анонимные данные об использовании для персонализации и улучшения сервиса. Отключите этот параметр, чтобы отказаться от сбора данных."
},
@@ -385,7 +385,7 @@ index 460fc40..526c357 100644
"app.settings.privacy.telemetry.title": {
"message": "Телеметрия"
},
@@ -5003,6 +5006,12 @@
@@ -5153,6 +5156,12 @@
"minecraft-required.header": {
"message": "Требуется Minecraft"
},
@@ -399,10 +399,10 @@ index 460fc40..526c357 100644
"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
index b3ab7e7..90aa3c3 100644
index efa9b5a..49b0f9f 100644
--- a/apps/app-frontend/src/locales/sv-SE/index.json
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
@@ -2540,6 +2540,9 @@
@@ -2624,6 +2624,9 @@
"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."
},
@@ -412,7 +412,7 @@ index b3ab7e7..90aa3c3 100644
"app.settings.privacy.telemetry.title": {
"message": "Telemetri"
},
@@ -4091,6 +4094,12 @@
@@ -4175,6 +4178,12 @@
"minecraft-required.header": {
"message": "Minecraft krävs"
},
@@ -426,10 +426,10 @@ index b3ab7e7..90aa3c3 100644
"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
index 2a96b4d..ea63a7b 100644
index a8c7802..5f0dfe0 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -2501,6 +2501,9 @@
@@ -2708,6 +2708,9 @@
"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."
},
@@ -439,7 +439,7 @@ index 2a96b4d..ea63a7b 100644
"app.settings.privacy.telemetry.title": {
"message": "Telemetri"
},
@@ -4010,6 +4013,12 @@
@@ -4217,6 +4220,12 @@
"minecraft-required.header": {
"message": "Minecraft gereklidir"
},
@@ -453,10 +453,10 @@ index 2a96b4d..ea63a7b 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."
},
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
index 74ba938..0f6a6a4 100644
index d38df4c..ab6596e 100644
--- a/apps/app-frontend/src/locales/uk-UA/index.json
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
@@ -3161,6 +3161,9 @@
@@ -3236,6 +3236,9 @@
"app.settings.privacy.telemetry.description": {
"message": "Modrinth збирає анонімізовану аналітику та дані про використання для покращення зручності та адаптації сервісу. Вимкнувши цю опцію, ви відмовляєтеся від збору, і ваші дані більше не збиратимуться."
},
@@ -466,7 +466,7 @@ index 74ba938..0f6a6a4 100644
"app.settings.privacy.telemetry.title": {
"message": "Телеметрія"
},
@@ -5018,6 +5021,12 @@
@@ -5168,6 +5171,12 @@
"minecraft-required.header": {
"message": "Потрібний Minecraft"
},
@@ -480,10 +480,10 @@ index 74ba938..0f6a6a4 100644
"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
index e408a3d..9c0cf39 100644
index 2a763fb..5449c62 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -3122,6 +3122,9 @@
@@ -3245,6 +3245,9 @@
"app.settings.privacy.telemetry.description": {
"message": "Modrinth 收集匿名分析和使用数据，以提升用户体验并为您提供个性化服务。若禁用此选项，即表示您选择退出，您的数据将不再被收集。"
},
@@ -493,7 +493,7 @@ index e408a3d..9c0cf39 100644
"app.settings.privacy.telemetry.title": {
"message": "遥测"
},
@@ -4901,6 +4904,12 @@
@@ -5177,6 +5180,12 @@
"minecraft-required.header": {
"message": "需要 Minecraft"
},
@@ -507,10 +507,10 @@ index e408a3d..9c0cf39 100644
"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
index 6b5ec6d..50bd256 100644
index 81d505d..7cf751d 100644
--- a/apps/app-frontend/src/locales/zh-TW/index.json
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
@@ -3173,6 +3173,9 @@
@@ -3245,6 +3245,9 @@
"app.settings.privacy.telemetry.description": {
"message": "Modrinth 會收集匿名化的分析與使用資料，以提升使用者體驗並提供客製化服務。若停用此選項，即表示你選擇退出，你的資料將不再被收集。"
},
@@ -520,7 +520,7 @@ index 6b5ec6d..50bd256 100644
"app.settings.privacy.telemetry.title": {
"message": "遙測"
},
@@ -5030,6 +5033,12 @@
@@ -5177,6 +5180,12 @@
"minecraft-required.header": {
"message": "需要 Minecraft"
},
patches/base.txt
+1 -1
View File
@@ -1 +1 @@
v0.21.4
v0.21.6
upstream.txt
+1 -1
View File
@@ -1 +1 @@
v0.21.4
v0.21.6