Merge branch 'main' into boris/dev-1105

feat: Allow user-images.githubusercontent.com in descriptions

.github/ISSUE_TEMPLATE/5-feature-request.yml

@@ -9,8 +9,6 @@ body:
       options:
         - label: I checked the [existing issues](https://github.com/modrinth/code/issues?q=is%3Aissue) for duplicate feature requests
           required: true
-        - label: I have checked that this feature request is not on our [roadmap](https://roadmap.modrinth.com)
-          required: true
   - type: dropdown
     id: projects
     attributes:

.github/workflows/labrinth-docker.yml

@@ -164,7 +164,7 @@ jobs:
         with:
           context: ./apps/labrinth/docker-stage
           file: ./apps/labrinth/Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
           tags: ${{ steps.docker-meta.outputs.tags }}
           labels: ${{ steps.docker-meta.outputs.labels }}
           annotations: ${{ steps.docker-meta.outputs.annotations }}

Cargo.lock

@@ -3059,29 +3059,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "elasticsearch"
-version = "9.1.0-alpha.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12bb303aa6e1d28c0c86b6fbfe484fd0fd3f512629aeed1ac4f6b85f81d9834a"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "dyn-clone",
- "flate2",
- "lazy_static",
- "parking_lot",
- "percent-encoding",
- "reqwest 0.12.24",
- "rustc_version",
- "serde",
- "serde_json",
- "serde_with",
- "tokio",
- "url",
- "void",
-]
-
 [[package]]
 name = "elliptic-curve"
 version = "0.13.8"
@@ -5275,7 +5252,6 @@ dependencies = [
  "dotenv-build",
  "dotenvy",
  "either",
- "elasticsearch",
  "eyre",
  "futures",
  "futures-util",
@@ -10589,6 +10565,8 @@ version = "1.0.0-local"
 dependencies = [
  "async_zip",
  "chrono",
+ "core-foundation 0.10.1",
+ "core-graphics",
  "daedalus",
  "dashmap",
  "either",
@@ -10596,6 +10574,7 @@ dependencies = [
  "hyper 1.7.0",
  "hyper-util",
  "native-dialog",
+ "objc2-app-kit",
  "paste",
  "path-util",
  "serde",
@@ -10621,6 +10600,7 @@ dependencies = [
  "urlencoding",
  "uuid 1.18.1",
  "webview2-com",
+ "windows",
  "windows-core 0.61.2",
 ]
 

Cargo.toml

@@ -64,6 +64,8 @@ clickhouse = "0.14.0"
 color-eyre = "0.6.5"
 color-thief = "0.2.2"
 const_format = "0.2.34"
+core-foundation = "0.10.1"
+core-graphics = "0.24.0"
 daedalus = { path = "packages/daedalus" }
 darling = { version = "0.23" }
 dashmap = "6.1.0"
@@ -77,7 +79,6 @@ dotenv-build = "0.1.1"
 dotenvy = "0.15.7"
 dunce = "1.0.5"
 either = "1.15.0"
-elasticsearch = "9.1.0-alpha.1"
 encoding_rs = "0.8.35"
 enumset = "1.1.10"
 eyre = "0.6.12"
@@ -124,6 +125,7 @@ murmur2 = "0.1.0"
 native-dialog = "0.9.2"
 notify = { version = "8.2.0", default-features = false }
 notify-debouncer-mini = { version = "0.7.0", default-features = false }
+objc2-app-kit = { version = "0.3.2", default-features = false }
 p256 = "0.13.2"
 parking_lot = "0.12.5"
 paste = "1.0.15"

apps/app-frontend/package.json

@@ -13,7 +13,6 @@
 		"test": "vue-tsc --noEmit"
 	},
 	"dependencies": {
-		"@intercom/messenger-js-sdk": "^0.0.14",
 		"@modrinth/api-client": "workspace:^",
 		"@modrinth/assets": "workspace:*",
 		"@modrinth/ui": "workspace:*",

apps/app-frontend/src/App.vue

@@ -1,5 +1,4 @@
 <script setup>
-import { Intercom, shutdown as shutdownIntercom } from '@intercom/messenger-js-sdk'
 import {
 	AuthFeature,
 	ModrinthApiError,
@@ -53,6 +52,7 @@ import {
 	providePopupNotificationManager,
 	useDebugLogger,
 	useFormatBytes,
+	useHostingIntercom,
 	useVIntl,
 } from '@modrinth/ui'
 import { renderString } from '@modrinth/utils'
@@ -88,7 +88,6 @@ import PromotionWrapper from '@/components/ui/PromotionWrapper.vue'
 import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
 import SplashScreen from '@/components/ui/SplashScreen.vue'
 import WindowControls from '@/components/ui/WindowControls.vue'
-import { useIntercomPositioning } from '@/composables/intercom-positioning'
 import { useCheckDisableMouseover } from '@/composables/macCssFix.js'
 import { config } from '@/config'
 import { hide_ads_window, init_ads_window, show_ads_window } from '@/helpers/ads.js'
@@ -132,15 +131,36 @@ import { AppPopupNotificationManager } from './providers/app-popup-notifications
 const themeStore = useTheming()
 const router = useRouter()
 const route = useRoute()
-const intercomBubblePositioning = useIntercomPositioning({ route, themeStore })
-const {
-	sidebarToggled,
-	forceSidebar,
-	sidebarVisible,
-	intercomBubblePosition,
-	updateIntercomBubbleStyles,
-	clearIntercomBubbleStyles,
-} = intercomBubblePositioning
+const APP_LEFT_NAV_WIDTH = '4rem'
+const APP_SIDEBAR_WIDTH = 300
+const INTERCOM_BUBBLE_DEFAULT_PADDING = 20
+const credentials = ref()
+const sidebarToggled = ref(true)
+const unsubscribeSidebarToggle = themeStore.$subscribe(() => {
+	sidebarToggled.value = !themeStore.toggleSidebar
+})
+const forceSidebar = computed(
+	() => route.path.startsWith('/browse') || route.path.startsWith('/project'),
+)
+const sidebarVisible = computed(() => sidebarToggled.value || forceSidebar.value)
+const hostingRouteActive = computed(() => route.path.startsWith('/hosting'))
+const hostingIntercomIdentityKey = computed(() => {
+	const rawServerId = route.params.id
+	const serverId = Array.isArray(rawServerId) ? rawServerId[0] : rawServerId
+	const userId = credentials.value?.user_id ?? credentials.value?.user?.id ?? 'anonymous'
+	return `${userId}:${serverId ?? 'hosting'}`
+})
+const hostingIntercom = useHostingIntercom({
+	enabled: computed(() => hostingRouteActive.value && !!credentials.value?.session),
+	appId: 'ykeritl9',
+	fetchToken: fetchIntercomToken,
+	identityKey: hostingIntercomIdentityKey,
+	horizontalPadding: computed(() =>
+		sidebarVisible.value
+			? APP_SIDEBAR_WIDTH + INTERCOM_BUBBLE_DEFAULT_PADDING
+			: INTERCOM_BUBBLE_DEFAULT_PADDING,
+	),
+})
 
 const notificationManager = new AppNotificationManager()
 provideNotificationManager(notificationManager)
@@ -175,7 +195,11 @@ provideModrinthClient(tauriApiClient)
 providePageContext({
 	hierarchicalSidebarAvailable: ref(true),
 	showAds: ref(false),
-	...intercomBubblePositioning.pageContext,
+	floatingActionBarOffsets: {
+		left: ref(APP_LEFT_NAV_WIDTH),
+		right: computed(() => (sidebarVisible.value ? `${APP_SIDEBAR_WIDTH}px` : '0px')),
+	},
+	intercomBubble: hostingIntercom.intercomBubble,
 	featureFlags: {
 		serverRamAsBytesAlwaysOn: computed(() =>
 			themeStore.getFeatureFlag('server_ram_as_bytes_always_on'),
@@ -259,8 +283,7 @@ onMounted(async () => {
 onUnmounted(async () => {
 	document.querySelector('body').removeEventListener('click', handleClick)
 	document.querySelector('body').removeEventListener('auxclick', handleAuxClick)
-	shutdownHostingIntercom()
-	clearIntercomBubbleStyles()
+	unsubscribeSidebarToggle()
 
 	await unlistenUpdateDownload?.()
 })
@@ -593,8 +616,6 @@ const incompatibilityWarningModal = ref()
 const installToPlayModal = ref()
 const updateToPlayModal = ref()
 
-const credentials = ref()
-
 const modrinthLoginFlowWaitModal = ref()
 
 setupAuthProvider(credentials, async (_redirectPath) => {
@@ -664,10 +685,6 @@ const hasPlus = computed(
 const showAd = computed(
 	() => sidebarVisible.value && !hasPlus.value && credentials.value !== undefined,
 )
-const hostingRouteActive = computed(() => route.path.startsWith('/hosting'))
-
-let intercomBooting = false
-let intercomBooted = false
 
 async function fetchIntercomToken() {
 	const creds = await getCreds()
@@ -676,8 +693,10 @@ async function fetchIntercomToken() {
 	}
 
 	const params = new URLSearchParams()
-	if (route.path.startsWith('/hosting/manage/') && typeof route.params.id === 'string') {
-		params.set('server_id', route.params.id)
+	const rawServerId = route.params.id
+	const serverId = Array.isArray(rawServerId) ? rawServerId[0] : rawServerId
+	if (route.path.startsWith('/hosting/manage/') && typeof serverId === 'string') {
+		params.set('server_id', serverId)
 	}
 	const query = params.size > 0 ? `?${params.toString()}` : ''
 
@@ -693,69 +712,6 @@ async function fetchIntercomToken() {
 	return await response.json()
 }
 
-async function bootIntercom() {
-	if (
-		intercomBooting ||
-		intercomBooted ||
-		!hostingRouteActive.value ||
-		!credentials.value?.session
-	) {
-		return
-	}
-
-	intercomBooting = true
-	console.debug('[APP][INTERCOM] initializing secure support chat')
-	try {
-		const { token } = await fetchIntercomToken()
-		Intercom({
-			app_id: 'ykeritl9',
-			intercom_user_jwt: token,
-			session_duration: 1000 * 60 * 60 * 24,
-			alignment: 'right',
-			horizontal_padding: intercomBubblePosition.value.horizontalPadding,
-			vertical_padding: intercomBubblePosition.value.verticalPadding,
-		})
-		intercomBooted = true
-	} catch (error) {
-		console.warn('[APP][INTERCOM] failed to initialize secure support chat', error)
-	} finally {
-		intercomBooting = false
-	}
-}
-
-function shutdownHostingIntercom() {
-	if (!intercomBooted && !intercomBooting) return
-	shutdownIntercom()
-	intercomBooting = false
-	intercomBooted = false
-}
-
-watch(
-	intercomBubblePosition,
-	(position) => {
-		updateIntercomBubbleStyles(position)
-		if (intercomBooted) {
-			window.Intercom?.('update', {
-				horizontal_padding: position.horizontalPadding,
-				vertical_padding: position.verticalPadding,
-			})
-		}
-	},
-	{ immediate: true },
-)
-
-watch(
-	[hostingRouteActive, credentials],
-	([active]) => {
-		if (active) {
-			void bootIntercom()
-		} else {
-			shutdownHostingIntercom()
-		}
-	},
-	{ immediate: true },
-)
-
 watch(showAd, () => {
 	if (!showAd.value) {
 		hide_ads_window(true)
@@ -1822,14 +1778,6 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 	--os-handle-bg-active: var(--color-scrollbar) !important;
 }
 
-.intercom-lightweight-app-launcher,
-.intercom-launcher-frame,
-iframe[name='intercom-launcher-frame'] {
-	right: var(--app-support-launcher-right, 20px) !important;
-	bottom: var(--app-support-launcher-bottom, 20px) !important;
-	z-index: 9 !important;
-}
-
 .mac {
 	.app-grid-statusbar {
 		padding-left: 5rem;

apps/app-frontend/src/components/ui/JavaDetectionModal.vue

@@ -1,35 +1,33 @@
 <template>
 	<ModalWrapper ref="detectJavaModal" header="Select java version" :show-ad-on-close="false">
-		<div class="auto-detect-modal">
-			<div class="table">
-				<div class="table-row table-head">
-					<div class="table-cell table-text">Version</div>
-					<div class="table-cell table-text">Path</div>
-					<div class="table-cell table-text">Actions</div>
-				</div>
-				<div v-for="javaInstall in chosenInstallOptions" :key="javaInstall.path" class="table-row">
-					<div class="table-cell table-text">
-						<span>{{ javaInstall.version }}</span>
-					</div>
-					<div v-tooltip="javaInstall.path" class="table-cell table-text">
-						<span>{{ javaInstall.path }}</span>
-					</div>
-					<div class="table-cell table-text manage">
-						<ButtonStyled v-if="currentSelected.path === javaInstall.path">
-							<button disabled><CheckIcon /> Selected</button>
+		<div class="flex flex-col gap-4">
+			<Table :columns="javaInstallColumns" :data="chosenInstallOptions" row-key="path">
+				<template #cell-version="{ value }">
+					<span class="font-semibold text-primary">{{ value }}</span>
+				</template>
+				<template #cell-path="{ value }">
+					<span v-tooltip="value" class="block truncate font-mono text-xs">{{ value }}</span>
+				</template>
+				<template #cell-actions="{ row }">
+					<div class="flex items-center justify-end">
+						<ButtonStyled v-if="currentSelected.path === row.path">
+							<button class="!shadow-none" disabled><CheckIcon /> Selected</button>
 						</ButtonStyled>
 						<ButtonStyled v-else>
-							<button @click="setJavaInstall(javaInstall)"><PlusIcon /> Select</button>
+							<button class="!shadow-none" @click="setJavaInstall(row)"><PlusIcon /> Select</button>
 						</ButtonStyled>
 					</div>
-				</div>
-				<div v-if="chosenInstallOptions.length === 0" class="table-row entire-row">
-					<div class="table-cell table-text">No java installations found!</div>
-				</div>
-			</div>
-			<div class="input-group push-right">
+				</template>
+				<template #empty-state>
+					<div class="p-4 text-secondary">No java installations found!</div>
+				</template>
+			</Table>
+			<div class="flex justify-end">
 				<ButtonStyled type="outlined">
-					<button @click="$refs.detectJavaModal.hide()">
+					<button
+						class="!shadow-none !border-surface-4 !border"
+						@click="$refs.detectJavaModal.hide()"
+					>
 						<XIcon />
 						Cancel
 					</button>
@@ -40,7 +38,7 @@
 </template>
 <script setup>
 import { CheckIcon, PlusIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, injectNotificationManager } from '@modrinth/ui'
+import { ButtonStyled, injectNotificationManager, Table } from '@modrinth/ui'
 import { ref } from 'vue'
 
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
@@ -52,6 +50,11 @@ const { handleError } = injectNotificationManager()
 const chosenInstallOptions = ref([])
 const detectJavaModal = ref(null)
 const currentSelected = ref({})
+const javaInstallColumns = [
+	{ key: 'version', label: 'Version', width: '9rem' },
+	{ key: 'path', label: 'Path' },
+	{ key: 'actions', label: 'Actions', align: 'right', width: '10rem' },
+]
 
 defineExpose({
 	show: async (version, currentSelectedJava) => {
@@ -77,25 +80,3 @@ function setJavaInstall(javaInstall) {
 	})
 }
 </script>
-<style lang="scss" scoped>
-.auto-detect-modal {
-	.table {
-		.table-row {
-			grid-template-columns: 1fr 4fr min-content;
-		}
-
-		span {
-			display: inherit;
-			align-items: center;
-			justify-content: center;
-		}
-
-		padding: 0.5rem;
-	}
-}
-
-.manage {
-	display: flex;
-	gap: 0.5rem;
-}
-</style>

apps/app-frontend/src/components/ui/JavaSelector.vue

@@ -1,85 +1,104 @@
 <template>
 	<JavaDetectionModal ref="detectJavaModal" @submit="(val) => emit('update:modelValue', val)" />
-	<div class="toggle-setting" :class="{ compact }">
-		<StyledInput
-			autocomplete="off"
-			:disabled="props.disabled"
-			:model-value="props.modelValue ? props.modelValue.path : ''"
-			:placeholder="placeholder ?? '/path/to/java'"
-			wrapper-class="installation-input"
-			@update:model-value="
-				(val) => {
-					emit('update:modelValue', {
-						...props.modelValue,
-						path: val,
-					})
-				}
-			"
-		/>
+	<div :id="props.id" class="toggle-setting" :class="{ compact }">
+		<div class="input-with-status">
+			<StyledInput
+				autocomplete="off"
+				:disabled="props.disabled"
+				:model-value="props.modelValue ? props.modelValue.path : ''"
+				:placeholder="placeholder ?? '/path/to/java'"
+				wrapper-class="installation-input"
+				@update:model-value="
+					(val) => {
+						emit('update:modelValue', {
+							...props.modelValue,
+							path: val,
+						})
+					}
+				"
+			/>
+			<ButtonStyled
+				:color="
+					!hoveringTest && !testingJava
+						? testingJavaSuccess === true
+							? 'green'
+							: 'red'
+						: 'standard'
+				"
+				color-fill="text"
+			>
+				<button
+					class="!shadow-none"
+					:disabled="testingJava || props.disabled"
+					@click="runTest(props.modelValue?.path)"
+					@mouseenter="!props.disabled && (hoveringTest = true)"
+					@mouseleave="hoveringTest = false"
+				>
+					<SpinnerIcon v-if="testingJava" class="animate-spin h-4 w-4" />
+					<CheckCircleIcon
+						v-else-if="testingJavaSuccess === true && !hoveringTest"
+						class="h-4 w-4"
+					/>
+					<XCircleIcon v-else-if="testingJavaSuccess !== true && !hoveringTest" class="h-4 w-4" />
+					<RefreshCwIcon v-else-if="!props.disabled" class="h-4 w-4" />
+				</button>
+			</ButtonStyled>
+		</div>
 		<span class="installation-buttons">
 			<ButtonStyled v-if="props.version">
-				<button :disabled="props.disabled || installingJava" @click="reinstallJava">
+				<button
+					v-tooltip="testingJavaSuccess === true ? 'Already installed' : undefined"
+					class="!shadow-none"
+					:disabled="props.disabled || installingJava || testingJavaSuccess === true"
+					@click="reinstallJava"
+				>
 					<DownloadIcon />
 					{{ installingJava ? 'Installing...' : 'Install recommended' }}
 				</button>
 			</ButtonStyled>
 			<ButtonStyled>
-				<button :disabled="props.disabled" @click="autoDetect">
+				<button class="!shadow-none" :disabled="props.disabled" @click="autoDetect">
 					<SearchIcon />
 					Detect
 				</button>
 			</ButtonStyled>
 			<ButtonStyled>
-				<button :disabled="props.disabled" @click="handleJavaFileInput()">
+				<button class="!shadow-none" :disabled="props.disabled" @click="handleJavaFileInput()">
 					<FolderSearchIcon />
 					Browse
 				</button>
 			</ButtonStyled>
-			<ButtonStyled v-if="testingJava">
-				<button disabled>Testing...</button>
-			</ButtonStyled>
-			<ButtonStyled v-else-if="testingJavaSuccess === true">
-				<button disabled>
-					<CheckIcon />
-					Success
-				</button>
-			</ButtonStyled>
-			<ButtonStyled v-else-if="testingJavaSuccess === false">
-				<button disabled>
-					<XIcon />
-					Failed
-				</button>
-			</ButtonStyled>
-			<ButtonStyled v-else>
-				<button :disabled="props.disabled" @click="testJava">
-					<PlayIcon />
-					Test
-				</button>
-			</ButtonStyled>
 		</span>
 	</div>
 </template>
 
 <script setup>
 import {
-	CheckIcon,
+	CheckCircleIcon,
 	DownloadIcon,
 	FolderSearchIcon,
-	PlayIcon,
+	RefreshCwIcon,
 	SearchIcon,
-	XIcon,
+	SpinnerIcon,
+	XCircleIcon,
 } from '@modrinth/assets'
 import { ButtonStyled, injectNotificationManager, StyledInput } from '@modrinth/ui'
 import { open } from '@tauri-apps/plugin-dialog'
-import { ref } from 'vue'
+import { ref, watch } from 'vue'
 
 import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
+import useJavaTest from '@/composables/useJavaTest'
 import { trackEvent } from '@/helpers/analytics'
-import { auto_install_java, find_filtered_jres, get_jre, test_jre } from '@/helpers/jre.js'
+import { auto_install_java, find_filtered_jres, get_jre } from '@/helpers/jre.js'
 
 const { handleError } = injectNotificationManager()
 
 const props = defineProps({
+	id: {
+		type: String,
+		required: false,
+		default: null,
+	},
 	version: {
 		type: Number,
 		required: false,
@@ -110,29 +129,36 @@ const props = defineProps({
 
 const emit = defineEmits(['update:modelValue'])
 
-const testingJava = ref(false)
-const testingJavaSuccess = ref(null)
+const {
+	testingJava,
+	javaTestResult: testingJavaSuccess,
+	testJavaInstallationDebounced,
+	testJavaInstallation,
+} = useJavaTest()
 
 const installingJava = ref(false)
+const hoveringTest = ref(false)
+let hasInitialized = false
 
-async function testJava() {
-	testingJava.value = true
-	testingJavaSuccess.value = await test_jre(
-		props.modelValue ? props.modelValue.path : '',
-		props.version,
-	)
-	testingJava.value = false
-
-	trackEvent('JavaTest', {
-		path: props.modelValue ? props.modelValue.path : '',
-		success: testingJavaSuccess.value,
-	})
-
-	setTimeout(() => {
-		testingJavaSuccess.value = null
-	}, 2000)
+async function runTest(path) {
+	await testJavaInstallation(path, props.version, true)
 }
 
+watch(
+	() => props.modelValue?.path,
+	(newPath) => {
+		if (newPath) {
+			if (!hasInitialized) {
+				testJavaInstallation(newPath, props.version, false)
+				hasInitialized = true
+			} else {
+				testJavaInstallationDebounced(newPath, props.version)
+			}
+		}
+	},
+	{ immediate: true },
+)
+
 async function handleJavaFileInput() {
 	const filePath = await open()
 
@@ -142,6 +168,7 @@ async function handleJavaFileInput() {
 			result = {
 				path: filePath.path ?? filePath,
 				version: props.version.toString(),
+				parsed_version: props.version,
 				architecture: 'x86',
 			}
 		}
@@ -175,6 +202,7 @@ async function reinstallJava() {
 		result = {
 			path: path,
 			version: props.version.toString(),
+			parsed_version: props.version,
 			architecture: 'x86',
 		}
 	}
@@ -186,13 +214,23 @@ async function reinstallJava() {
 
 	emit('update:modelValue', result)
 	installingJava.value = false
+	runTest(result.path)
 }
 </script>
 
 <style lang="scss" scoped>
+.input-with-status {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	gap: 0.5rem;
+	width: 100%;
+	min-width: 0;
+}
+
 .installation-input {
-	width: 100% !important;
-	flex-grow: 1;
+	flex: 1 1 0;
+	min-width: 0;
 }
 
 .toggle-setting {
@@ -215,12 +253,4 @@ async function reinstallJava() {
 	gap: 0.5rem;
 	margin: 0;
 }
-
-.test-success {
-	color: var(--color-green);
-}
-
-.test-fail {
-	color: var(--color-red);
-}
 </style>

apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue

@@ -35,7 +35,7 @@ const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 const queryClient = useQueryClient()
 
-const { instance, offline, isMinecraftServer, onUnlinked } = injectInstanceSettings()
+const { instance, offline, isMinecraftServer, onUnlinked, closeModal } = injectInstanceSettings()
 
 const [
 	fabric_versions,
@@ -113,6 +113,7 @@ provideAppBackup({
 })
 
 provideInstallationSettings({
+	closeSettings: closeModal,
 	loading: ref(false),
 	installationInfo: computed(() => {
 		const rows = [

apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue

@@ -1,6 +1,15 @@
 <script setup lang="ts">
-import { CheckCircleIcon, XCircleIcon } from '@modrinth/assets'
 import {
+	CheckCircleIcon,
+	CoffeeIcon,
+	FolderSearchIcon,
+	RefreshCwIcon,
+	SearchIcon,
+	SpinnerIcon,
+	XCircleIcon,
+} from '@modrinth/assets'
+import {
+	ButtonStyled,
 	Checkbox,
 	defineMessages,
 	injectNotificationManager,
@@ -8,9 +17,11 @@ import {
 	StyledInput,
 	useVIntl,
 } from '@modrinth/ui'
+import { open } from '@tauri-apps/plugin-dialog'
 import { computed, readonly, ref, watch } from 'vue'
 
-import JavaSelector from '@/components/ui/JavaSelector.vue'
+import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
+import useJavaTest from '@/composables/useJavaTest'
 import useMemorySlider from '@/composables/useMemorySlider'
 import { edit, get_optimal_jre_key } from '@/helpers/profile'
 import { get } from '@/helpers/settings.ts'
@@ -25,9 +36,54 @@ const { instance } = injectInstanceSettings()
 
 const globalSettings = (await get().catch(handleError)) as unknown as AppSettings
 
-const overrideJavaInstall = ref(!!instance.value.java_path)
 const optimalJava = readonly(await get_optimal_jre_key(instance.value.path).catch(handleError))
-const javaInstall = ref({ path: optimalJava.path ?? instance.value.java_path })
+
+const overrideJavaInstall = ref(!!instance.value.java_path)
+const javaPath = ref(instance.value.java_path ?? optimalJava?.path ?? '')
+
+const activePath = computed(() =>
+	overrideJavaInstall.value ? javaPath.value : (optimalJava?.path ?? ''),
+)
+
+watch(overrideJavaInstall, (enabled) => {
+	if (enabled && !javaPath.value) {
+		javaPath.value = optimalJava?.path ?? ''
+	}
+})
+
+const { testingJava, javaTestResult, testJavaInstallationDebounced, testJavaInstallation } =
+	useJavaTest()
+
+const hoveringTest = ref(false)
+let hasInitialized = false
+
+watch(
+	activePath,
+	(newPath) => {
+		if (newPath && optimalJava?.parsed_version) {
+			if (!hasInitialized) {
+				testJavaInstallation(newPath, optimalJava?.parsed_version, false)
+				hasInitialized = true
+			} else {
+				testJavaInstallationDebounced(newPath, optimalJava?.parsed_version)
+			}
+		}
+	},
+	{ immediate: true },
+)
+
+const javaDetectionModal = ref<{ show: (version: number, current: object) => void } | null>(null)
+
+async function handleBrowseJava() {
+	const result = await open({ multiple: false })
+	if (result) {
+		javaPath.value = result
+	}
+}
+
+function handleDetectJava() {
+	javaDetectionModal.value?.show(optimalJava?.parsed_version, { path: javaPath.value })
+}
 
 const overrideJavaArgs = ref((instance.value.extra_launch_args?.length ?? 0) > 0)
 const javaArgs = ref(
@@ -51,8 +107,8 @@ const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) a
 const editProfileObject = computed(() => {
 	return {
 		java_path:
-			overrideJavaInstall.value && javaInstall.value.path !== ''
-				? javaInstall.value.path.replace('java.exe', 'javaw.exe')
+			overrideJavaInstall.value && javaPath.value
+				? javaPath.value.replace('java.exe', 'javaw.exe')
 				: null,
 		extra_launch_args: overrideJavaArgs.value
 			? javaArgs.value.trim().split(/\s+/).filter(Boolean)
@@ -71,7 +127,7 @@ const editProfileObject = computed(() => {
 watch(
 	[
 		overrideJavaInstall,
-		javaInstall,
+		javaPath,
 		overrideJavaArgs,
 		javaArgs,
 		overrideEnvVars,
@@ -90,17 +146,45 @@ const messages = defineMessages({
 		id: 'instance.settings.tabs.java.java-installation',
 		defaultMessage: 'Java installation',
 	},
+	customJavaInstallation: {
+		id: 'instance.settings.tabs.java.custom-java-installation',
+		defaultMessage: 'Custom Java installation',
+	},
+	javaPathPlaceholder: {
+		id: 'instance.settings.tabs.java.java-path-placeholder',
+		defaultMessage: '/path/to/java',
+	},
+	javaMemory: {
+		id: 'instance.settings.tabs.java.java-memory',
+		defaultMessage: 'Memory allocated',
+	},
+	customMemoryAllocation: {
+		id: 'instance.settings.tabs.java.custom-memory-allocation',
+		defaultMessage: 'Custom memory allocation',
+	},
 	javaArguments: {
 		id: 'instance.settings.tabs.java.java-arguments',
 		defaultMessage: 'Java arguments',
 	},
+	customJavaArguments: {
+		id: 'instance.settings.tabs.java.custom-java-arguments',
+		defaultMessage: 'Custom Java arguments',
+	},
+	enterJavaArguments: {
+		id: 'instance.settings.tabs.java.enter-java-arguments',
+		defaultMessage: 'Enter Java arguments...',
+	},
 	javaEnvironmentVariables: {
 		id: 'instance.settings.tabs.java.environment-variables',
 		defaultMessage: 'Environment variables',
 	},
-	javaMemory: {
-		id: 'instance.settings.tabs.java.java-memory',
-		defaultMessage: 'Memory allocated',
+	customEnvironmentVariables: {
+		id: 'instance.settings.tabs.java.custom-environment-variables',
+		defaultMessage: 'Custom environment variables',
+	},
+	enterEnvironmentVariables: {
+		id: 'instance.settings.tabs.java.enter-environment-variables',
+		defaultMessage: 'Enter environmental variables...',
 	},
 	hooks: {
 		id: 'instance.settings.tabs.java.hooks',
@@ -111,43 +195,86 @@ const messages = defineMessages({
 
 <template>
 	<div>
-		<h2 id="project-name" class="m-0 mb-2.5 text-lg font-semibold text-contrast block">
+		<JavaDetectionModal ref="javaDetectionModal" @submit="(val) => (javaPath = val.path)" />
+		<h2 class="m-0 mb-2 text-lg font-extrabold text-contrast block">
 			{{ formatMessage(messages.javaInstallation) }}
 		</h2>
-		<Checkbox v-model="overrideJavaInstall" label="Custom Java installation" class="mb-2.5" />
-		<template v-if="!overrideJavaInstall">
-			<div class="flex my-2 items-center gap-2 font-semibold">
-				<template v-if="javaInstall">
-					<CheckCircleIcon class="text-brand-green h-4 w-4" />
-					<span>Using default Java {{ optimalJava.major_version }} installation:</span>
-				</template>
-				<template v-else-if="optimalJava">
-					<XCircleIcon class="text-brand-red h-5 w-5" />
-					<span
-						>Could not find a default Java {{ optimalJava.major_version }} installation. Please set
-						one below:</span
+		<Checkbox
+			v-model="overrideJavaInstall"
+			:label="formatMessage(messages.customJavaInstallation)"
+			class="mb-2"
+		/>
+		<div class="flex gap-4 p-4 bg-bg rounded-2xl">
+			<div class="flex gap-3 items-start flex-1 min-w-0">
+				<div
+					class="w-10 h-10 flex items-center justify-center rounded-full bg-button-bg border-solid border-[1px] border-button-border p-2 mt-1 shrink-0 [&_svg]:h-full [&_svg]:w-full"
+				>
+					<CoffeeIcon />
+				</div>
+				<div class="flex flex-col gap-2 flex-1 min-w-0">
+					<span class="font-semibold leading-none mt-2"
+						>Java {{ optimalJava?.parsed_version }}</span
 					>
-				</template>
-				<template v-else>
-					<XCircleIcon class="text-brand-red h-5 w-5" />
-					<span
-						>Could not automatically determine a Java installation to use. Please set one
-						below:</span
-					>
-				</template>
+					<div class="flex gap-2 items-center">
+						<StyledInput
+							:model-value="activePath"
+							:disabled="!overrideJavaInstall"
+							autocomplete="off"
+							:placeholder="formatMessage(messages.javaPathPlaceholder)"
+							wrapper-class="flex-1 min-w-0"
+							@update:model-value="(val) => (javaPath = String(val))"
+						/>
+						<ButtonStyled
+							:color="
+								!hoveringTest && !testingJava
+									? javaTestResult === true
+										? 'green'
+										: 'red'
+									: 'standard'
+							"
+							color-fill="text"
+						>
+							<button
+								:disabled="!overrideJavaInstall || testingJava"
+								@click="testJavaInstallation(activePath, optimalJava?.parsed_version, true)"
+								@mouseenter="overrideJavaInstall && (hoveringTest = true)"
+								@mouseleave="hoveringTest = false"
+							>
+								<SpinnerIcon v-if="testingJava" class="animate-spin h-4 w-4" />
+								<CheckCircleIcon
+									v-else-if="javaTestResult === true && !hoveringTest"
+									class="h-4 w-4"
+								/>
+								<XCircleIcon v-else-if="javaTestResult !== true && !hoveringTest" class="h-4 w-4" />
+								<RefreshCwIcon v-else-if="overrideJavaInstall" class="h-4 w-4" />
+							</button>
+						</ButtonStyled>
+					</div>
+					<div v-if="overrideJavaInstall" class="flex gap-2">
+						<ButtonStyled>
+							<button @click="handleDetectJava">
+								<SearchIcon />
+								Detect
+							</button>
+						</ButtonStyled>
+						<ButtonStyled>
+							<button @click="handleBrowseJava">
+								<FolderSearchIcon />
+								Browse
+							</button>
+						</ButtonStyled>
+					</div>
+				</div>
 			</div>
-			<div
-				v-if="javaInstall && !overrideJavaInstall"
-				class="p-4 bg-bg rounded-xl text-xs text-secondary leading-none font-mono"
-			>
-				{{ javaInstall.path }}
-			</div>
-		</template>
-		<JavaSelector v-if="overrideJavaInstall || !javaInstall" v-model="javaInstall" />
-		<h2 id="project-name" class="mt-6 mb-2.5 text-lg font-semibold text-contrast block">
+		</div>
+		<h2 class="mt-4 mb-1 text-lg font-extrabold text-contrast block">
 			{{ formatMessage(messages.javaMemory) }}
 		</h2>
-		<Checkbox v-model="overrideMemorySettings" label="Custom memory allocation" class="mb-2.5" />
+		<Checkbox
+			v-model="overrideMemorySettings"
+			:label="formatMessage(messages.customMemoryAllocation)"
+			class="mb-2"
+		/>
 		<Slider
 			id="max-memory"
 			v-model="memory.maximum"
@@ -159,28 +286,36 @@ const messages = defineMessages({
 			:snap-range="512"
 			unit="MB"
 		/>
-		<h2 id="project-name" class="mt-6 mb-2.5 text-lg font-semibold text-contrast block">
+		<h2 class="mt-4 mb-1 text-lg font-extrabold text-contrast block">
 			{{ formatMessage(messages.javaArguments) }}
 		</h2>
-		<Checkbox v-model="overrideJavaArgs" label="Custom java arguments" class="my-2" />
+		<Checkbox
+			v-model="overrideJavaArgs"
+			:label="formatMessage(messages.customJavaArguments)"
+			class="my-2"
+		/>
 		<StyledInput
 			id="java-args"
 			v-model="javaArgs"
 			autocomplete="off"
 			:disabled="!overrideJavaArgs"
-			placeholder="Enter java arguments..."
+			:placeholder="formatMessage(messages.enterJavaArguments)"
 			wrapper-class="w-full"
 		/>
-		<h2 id="project-name" class="mt-6 mb-2.5 text-lg font-semibold text-contrast block">
+		<h2 class="mt-4 mb-1 text-lg font-extrabold text-contrast block">
 			{{ formatMessage(messages.javaEnvironmentVariables) }}
 		</h2>
-		<Checkbox v-model="overrideEnvVars" label="Custom environment variables" class="mb-2.5" />
+		<Checkbox
+			v-model="overrideEnvVars"
+			:label="formatMessage(messages.customEnvironmentVariables)"
+			class="mb-2"
+		/>
 		<StyledInput
 			id="env-vars"
 			v-model="envVars"
 			autocomplete="off"
 			:disabled="!overrideEnvVars"
-			placeholder="Enter environmental variables..."
+			:placeholder="formatMessage(messages.enterEnvironmentVariables)"
 			wrapper-class="w-full"
 		/>
 	</div>

apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue

@@ -45,12 +45,19 @@ const isMinecraftServer = ref(false)
 const handleUnlinked = () => emit('unlinked')
 
 const instanceRef = computed(() => props.instance)
+const queryClient = useQueryClient()
+const tabbedModal = ref<InstanceType<typeof TabbedModal> | null>(null)
+
+function hide() {
+	tabbedModal.value?.hide()
+}
 
 provideInstanceSettings({
 	instance: instanceRef,
 	offline: props.offline,
 	isMinecraftServer,
 	onUnlinked: handleUnlinked,
+	closeModal: hide,
 })
 
 watch(
@@ -113,9 +120,6 @@ const tabs = computed<TabbedModalTab[]>(() => [
 	},
 ])
 
-const queryClient = useQueryClient()
-const tabbedModal = ref<InstanceType<typeof TabbedModal> | null>(null)
-
 function show(tabIndex?: number) {
 	if (props.instance.linked_data?.project_id) {
 		queryClient.prefetchQuery({
@@ -129,7 +133,7 @@ function show(tabIndex?: number) {
 	}
 }
 
-defineExpose({ show })
+defineExpose({ show, hide })
 </script>
 <template>
 	<TabbedModal

apps/app-frontend/src/composables/intercom-positioning.ts

@@ -1,121 +0,0 @@
-import { computed, onUnmounted, ref } from 'vue'
-import type { RouteLocationNormalizedLoaded } from 'vue-router'
-
-interface ThemeStore {
-	toggleSidebar: boolean
-	$subscribe: (callback: () => void) => () => void
-}
-
-interface IntercomBubblePosition {
-	horizontalPadding: number
-	verticalPadding: number
-}
-
-const APP_LEFT_NAV_WIDTH = '4rem'
-const APP_SIDEBAR_WIDTH = 300
-const INTERCOM_BUBBLE_DEFAULT_PADDING = 20
-const INTERCOM_BUBBLE_WIDTH = 72
-const INTERCOM_BUBBLE_RIGHT_VAR = '--app-support-launcher-right'
-const INTERCOM_BUBBLE_BOTTOM_VAR = '--app-support-launcher-bottom'
-
-export function useIntercomPositioning({
-	route,
-	themeStore,
-}: {
-	route: RouteLocationNormalizedLoaded
-	themeStore: ThemeStore
-}) {
-	const sidebarToggled = ref(true)
-	const unsubscribeSidebarToggle = themeStore.$subscribe(() => {
-		sidebarToggled.value = !themeStore.toggleSidebar
-	})
-
-	onUnmounted(unsubscribeSidebarToggle)
-
-	const forceSidebar = computed(
-		() => route.path.startsWith('/browse') || route.path.startsWith('/project'),
-	)
-	const sidebarVisible = computed(() => sidebarToggled.value || forceSidebar.value)
-	const defaultIntercomBubbleHorizontalPadding = computed(() =>
-		sidebarVisible.value
-			? APP_SIDEBAR_WIDTH + INTERCOM_BUBBLE_DEFAULT_PADDING
-			: INTERCOM_BUBBLE_DEFAULT_PADDING,
-	)
-	const intercomBubbleRequestedHorizontalPadding = ref<number | null>(null)
-	const intercomBubbleHorizontalPadding = computed(
-		() =>
-			intercomBubbleRequestedHorizontalPadding.value ??
-			defaultIntercomBubbleHorizontalPadding.value,
-	)
-	const intercomBubbleVerticalClearance = ref<number | null>(null)
-	const intercomBubblePosition = computed(() => ({
-		horizontalPadding: intercomBubbleHorizontalPadding.value,
-		verticalPadding: intercomBubbleVerticalClearance.value ?? INTERCOM_BUBBLE_DEFAULT_PADDING,
-	}))
-	const intercomBubbleHorizontalPaddingRequests = new Map<symbol, number>()
-	const intercomBubbleClearanceRequests = new Map<symbol, number>()
-
-	function requestIntercomBubbleHorizontalPadding(id: symbol, padding: number | null) {
-		if (padding === null) {
-			intercomBubbleHorizontalPaddingRequests.delete(id)
-		} else {
-			intercomBubbleHorizontalPaddingRequests.set(id, padding)
-		}
-
-		intercomBubbleRequestedHorizontalPadding.value =
-			intercomBubbleHorizontalPaddingRequests.size > 0
-				? Math.max(...intercomBubbleHorizontalPaddingRequests.values())
-				: null
-	}
-
-	function requestIntercomBubbleVerticalClearance(id: symbol, clearance: number | null) {
-		if (clearance === null) {
-			intercomBubbleClearanceRequests.delete(id)
-		} else {
-			intercomBubbleClearanceRequests.set(id, clearance)
-		}
-
-		intercomBubbleVerticalClearance.value =
-			intercomBubbleClearanceRequests.size > 0
-				? Math.max(...intercomBubbleClearanceRequests.values())
-				: null
-	}
-
-	function updateIntercomBubbleStyles({
-		horizontalPadding,
-		verticalPadding,
-	}: IntercomBubblePosition) {
-		if (typeof document === 'undefined') return
-
-		document.documentElement.style.setProperty(INTERCOM_BUBBLE_RIGHT_VAR, `${horizontalPadding}px`)
-		document.documentElement.style.setProperty(INTERCOM_BUBBLE_BOTTOM_VAR, `${verticalPadding}px`)
-	}
-
-	function clearIntercomBubbleStyles() {
-		if (typeof document === 'undefined') return
-
-		document.documentElement.style.removeProperty(INTERCOM_BUBBLE_RIGHT_VAR)
-		document.documentElement.style.removeProperty(INTERCOM_BUBBLE_BOTTOM_VAR)
-	}
-
-	return {
-		sidebarToggled,
-		forceSidebar,
-		sidebarVisible,
-		intercomBubblePosition,
-		updateIntercomBubbleStyles,
-		clearIntercomBubbleStyles,
-		pageContext: {
-			floatingActionBarOffsets: {
-				left: ref(APP_LEFT_NAV_WIDTH),
-				right: computed(() => (sidebarVisible.value ? `${APP_SIDEBAR_WIDTH}px` : '0px')),
-			},
-			intercomBubble: {
-				width: ref(INTERCOM_BUBBLE_WIDTH),
-				horizontalPadding: intercomBubbleHorizontalPadding,
-				requestHorizontalPadding: requestIntercomBubbleHorizontalPadding,
-				requestVerticalClearance: requestIntercomBubbleVerticalClearance,
-			},
-		},
-	}
-}

apps/app-frontend/src/composables/useInstanceConsole.ts

@@ -8,7 +8,7 @@ interface LogEntry {
 	filename: string
 	name?: string
 	log_type: string
-	stdout?: string
+	output?: string | null
 	age?: number
 	live?: boolean
 }
@@ -50,12 +50,12 @@ async function getHistoricalLogs(profilePathId: string, instancePath: string): P
 	const entry = getOrCreate(profilePathId)
 	if (entry.logList) return entry.logList
 
-	const logs: LogEntry[] = await get_logs(instancePath, false)
+	const logs: LogEntry[] = await get_logs(instancePath, true)
 	entry.logList = logs
 
 	for (const log of logs) {
-		if (log.stdout && log.stdout !== '') {
-			entry.historicalCache.set(log.filename, log.stdout)
+		if (log.output) {
+			entry.historicalCache.set(log.filename, log.output)
 		}
 	}
 

apps/app-frontend/src/composables/useJavaTest.ts

@@ -0,0 +1,52 @@
+import { ref } from 'vue'
+
+import { trackEvent } from '@/helpers/analytics'
+import { test_jre } from '@/helpers/jre.js'
+
+export default function useJavaTest() {
+	const testingJava = ref(false)
+	const javaTestResult = ref<boolean | null>(null)
+	let testDebounceTimer: ReturnType<typeof setTimeout> | null = null
+
+	async function runJavaTest(path: string, version: number, track = true) {
+		if (testDebounceTimer) {
+			clearTimeout(testDebounceTimer)
+			testDebounceTimer = null
+		}
+		if (!path) {
+			javaTestResult.value = null
+			return
+		}
+		testingJava.value = true
+		try {
+			javaTestResult.value = await test_jre(path, version)
+		} catch {
+			javaTestResult.value = false
+		}
+		testingJava.value = false
+
+		if (track) {
+			trackEvent('JavaTest', { path, success: javaTestResult.value })
+		}
+	}
+
+	function testJavaInstallationDebounced(path: string, version: number, delay = 600) {
+		if (testDebounceTimer) clearTimeout(testDebounceTimer)
+		if (!path) {
+			javaTestResult.value = null
+			return
+		}
+		testDebounceTimer = setTimeout(() => runJavaTest(path, version, false), delay)
+	}
+
+	async function testJavaInstallation(path: string, version: number, track = false) {
+		await runJavaTest(path, version, track)
+	}
+
+	return {
+		testingJava,
+		javaTestResult,
+		testJavaInstallationDebounced,
+		testJavaInstallation,
+	}
+}

apps/app-frontend/src/helpers/instance-content.ts

@@ -0,0 +1,100 @@
+import type {
+	ContentItem,
+	ContentModpackCardCategory,
+	ContentModpackCardProject,
+	ContentModpackCardVersion,
+	ContentOwner,
+} from '@modrinth/ui'
+
+import {
+	get_content_items,
+	get_linked_modpack_info,
+	type LinkedModpackInfo,
+} from '@/helpers/profile'
+import { get_categories } from '@/helpers/tags.js'
+import type { CacheBehaviour } from '@/helpers/types'
+
+export type InstanceContentData = {
+	path: string
+	contentItems: ContentItem[] | null
+	modpack: InstanceContentModpackData | null
+}
+
+export type InstanceContentModpackData = {
+	project: ContentModpackCardProject
+	version: ContentModpackCardVersion
+	owner: ContentOwner | null
+	categories: ContentModpackCardCategory[]
+	hasUpdate: boolean
+	updateVersionId: string | null
+}
+
+export async function loadInstanceContentData(
+	path: string,
+	cacheBehaviour?: CacheBehaviour,
+	onError?: (error: Error) => unknown,
+): Promise<InstanceContentData> {
+	const [contentItems, modpackInfo, allCategories] = await Promise.all([
+		get_content_items(path, cacheBehaviour).catch((error) => handleLoadError(error, onError)),
+		get_linked_modpack_info(path, cacheBehaviour).catch((error) => handleLoadError(error, onError)),
+		get_categories().catch((error) => handleLoadError(error, onError)),
+	])
+
+	return {
+		path,
+		contentItems: (contentItems as ContentItem[] | null | undefined) ?? null,
+		modpack: normalizeLinkedModpackInfo(
+			modpackInfo as LinkedModpackInfo | null | undefined,
+			allCategories as ContentModpackCardCategory[] | null | undefined,
+		),
+	}
+}
+
+function handleLoadError(error: unknown, onError?: (error: Error) => unknown) {
+	onError?.(error as Error)
+	return null
+}
+
+function normalizeLinkedModpackInfo(
+	modpackInfo: LinkedModpackInfo | null | undefined,
+	allCategories: ContentModpackCardCategory[] | null | undefined,
+): InstanceContentModpackData | null {
+	if (!modpackInfo) return null
+
+	return {
+		project: {
+			...modpackInfo.project,
+			slug: modpackInfo.project.slug ?? modpackInfo.project.id,
+			icon_url: modpackInfo.project.icon_url ?? undefined,
+		},
+		version: {
+			...modpackInfo.version,
+			date_published: modpackInfo.version.date_published.toString(),
+		},
+		owner: modpackInfo.owner
+			? {
+					...modpackInfo.owner,
+					avatar_url: modpackInfo.owner.avatar_url ?? undefined,
+				}
+			: null,
+		categories: resolveLinkedModpackCategories(modpackInfo, allCategories),
+		hasUpdate: modpackInfo.has_update,
+		updateVersionId: modpackInfo.update_version_id,
+	}
+}
+
+function resolveLinkedModpackCategories(
+	modpackInfo: LinkedModpackInfo,
+	allCategories: ContentModpackCardCategory[] | null | undefined,
+) {
+	if (!allCategories || !modpackInfo.project.categories) return []
+
+	const seen = new Set<string>()
+	return allCategories.filter((category) => {
+		if (modpackInfo.project.categories.includes(category.name) && !seen.has(category.name)) {
+			seen.add(category.name)
+			return true
+		}
+		return false
+	})
+}

apps/app-frontend/src/helpers/logs.js

@@ -6,12 +6,11 @@
 import { invoke } from '@tauri-apps/api/core'
 
 /*
-A log is a struct containing the filename string, stdout, and stderr, as follows:
+A log is a struct containing the filename string and optional output, as follows:
 
 pub struct Logs {
     pub filename:  String,
-    pub stdout: String,
-    pub stderr: String,
+    pub output: Option<String>,
 }
 */
 

apps/app-frontend/src/helpers/profile.ts

@@ -147,9 +147,16 @@ export async function get_mod_full_path(path: string, projectPath: string): Prom
 	return await invoke('plugin:profile|profile_get_mod_full_path', { path, projectPath })
 }
 
+export interface JavaVersion {
+	parsed_version: number
+	version: string
+	architecture: string
+	path: string
+}
+
 // Get optimal java version from profile
 // Returns a java version
-export async function get_optimal_jre_key(path: string): Promise<string | null> {
+export async function get_optimal_jre_key(path: string): Promise<JavaVersion | null> {
 	return await invoke('plugin:profile|profile_get_optimal_jre_key', { path })
 }
 

apps/app-frontend/src/locales/ar-SA/index.json

@@ -5,6 +5,15 @@
   "app.action-bar.downloads": {
     "message": "التنزيلات"
   },
+  "app.action-bar.offline": {
+    "message": "غير متصل"
+  },
+  "app.appearance-settings.default-landing-page.home": {
+    "message": "صفحة الرئيسية"
+  },
+  "app.appearance-settings.default-landing-page.library": {
+    "message": "مكتبة"
+  },
   "app.auth-servers.unreachable.body": {
     "message": "قد تكون خوادم مصادقة ماينكرافت معطلة حاليًا. تحقق من اتصالك بالإنترنت وحاول مرة أخرى لاحقًا."
   },
@@ -566,6 +575,12 @@
   "instance.worlds.world_in_use": {
     "message": "العالم قيد الاستخدام"
   },
+  "minecraft-account.add-account": {
+    "message": "إضافة حساب"
+  },
+  "minecraft-account.select-account": {
+    "message": "اختيار الحساب"
+  },
   "search.filter.locked.instance": {
     "message": "مقدَّم من النسخة"
   },

apps/app-frontend/src/locales/cs-CZ/index.json

@@ -1,10 +1,115 @@
 {
+  "app.action-bar.downloading-java": {
+    "message": "Stahování Javy {version}"
+  },
+  "app.action-bar.downloads": {
+    "message": "Stažené Soubory"
+  },
+  "app.action-bar.hide-more-running-instances": {
+    "message": "Skrýt více spuštěných instancí"
+  },
+  "app.action-bar.make-primary-instance": {
+    "message": "Použít jako primární instanci"
+  },
+  "app.action-bar.no-instances-running": {
+    "message": "Žádné spuštěné instance"
+  },
+  "app.action-bar.offline": {
+    "message": "Offline"
+  },
+  "app.action-bar.primary-instance": {
+    "message": "Primární instance"
+  },
+  "app.action-bar.show-more-running-instances": {
+    "message": "Zobrazit další spuštěné instance"
+  },
+  "app.action-bar.stop-instance": {
+    "message": "Ukončit instanci"
+  },
+  "app.action-bar.view-active-downloads": {
+    "message": "Zobrazit probíhající stahování"
+  },
+  "app.action-bar.view-instance": {
+    "message": "Zobrazit instanci"
+  },
+  "app.action-bar.view-logs": {
+    "message": "Zobrazit záznamy"
+  },
+  "app.appearance-settings.advanced-rendering.description": {
+    "message": "Umožňuje pokročilé vykreslování, jako jsou efekty rozostření, které mohou způsobit problémy s výkonem bez hardwarového vykreslení."
+  },
+  "app.appearance-settings.advanced-rendering.title": {
+    "message": "Pokročilé vykreslování"
+  },
+  "app.appearance-settings.color-theme.description": {
+    "message": "Vyberte si váš preferovaný motiv pro aplikaci Modrinth."
+  },
+  "app.appearance-settings.color-theme.title": {
+    "message": "Barevný motiv"
+  },
+  "app.appearance-settings.default-landing-page.description": {
+    "message": "Změňte stránku, na které se spouštěč otevře."
+  },
+  "app.appearance-settings.default-landing-page.home": {
+    "message": "Domov"
+  },
+  "app.appearance-settings.default-landing-page.library": {
+    "message": "Knihovna"
+  },
+  "app.appearance-settings.default-landing-page.title": {
+    "message": "Výchozí úvodní stránka"
+  },
+  "app.appearance-settings.hide-nametag.description": {
+    "message": "Zakáže zobrazení jmenovky nad vaší postavou na stránce skinů."
+  },
+  "app.appearance-settings.hide-nametag.title": {
+    "message": "Skrýt jmenovku"
+  },
+  "app.appearance-settings.jump-back-into-worlds.description": {
+    "message": "V sekci „Vrátit se do hry“ na úvodní stránce jsou uvedeny nejnovější světy."
+  },
+  "app.appearance-settings.jump-back-into-worlds.title": {
+    "message": "Skočit zpět do světů"
+  },
+  "app.appearance-settings.minimize-launcher.description": {
+    "message": "Minimalizovat spouštěč při spuštění procesu Minecraftu."
+  },
+  "app.appearance-settings.minimize-launcher.title": {
+    "message": "Minimalizovat spouštěč"
+  },
+  "app.appearance-settings.native-decorations.description": {
+    "message": "Použít systémový rámeček okna (vyžaduje restart aplikace)."
+  },
+  "app.appearance-settings.native-decorations.title": {
+    "message": "Nativní dekorace"
+  },
+  "app.appearance-settings.select-option": {
+    "message": "Vyberte možnost"
+  },
+  "app.appearance-settings.toggle-sidebar.description": {
+    "message": "Umožňí přepínat zobrazení postranního panelu."
+  },
+  "app.appearance-settings.toggle-sidebar.title": {
+    "message": "Přepnout postranní panel"
+  },
+  "app.appearance-settings.unknown-pack-warning.description": {
+    "message": "Pokud se pokusíte nainstalovat soubor Modrinth Pack (.mrpack), který není hostován na Modrinth, zajistíme, abyste si před instalací uvědomili související rizika."
+  },
+  "app.appearance-settings.unknown-pack-warning.title": {
+    "message": "Upozorni mě před instalací neznámých modpacků"
+  },
   "app.auth-servers.unreachable.body": {
     "message": "Autořizační servery Minecraftu aktuálně nejsou k dispozici. Zkontrolujte si své připojení k internetu a zkuste to znovu později."
   },
   "app.auth-servers.unreachable.header": {
     "message": "Připojení k autorizačním serverům se nezdařilo"
   },
+  "app.browse.add-servers-to-instance": {
+    "message": "Přidat server do instance"
+  },
+  "app.browse.add-to-an-instance": {
+    "message": "Přidat do instalace"
+  },
   "app.browse.add-to-instance": {
     "message": "Přidat do instalace"
   },
@@ -17,12 +122,33 @@
   "app.browse.already-added": {
     "message": "Už přidáno"
   },
+  "app.browse.back-to-instance": {
+    "message": "Zpět k instanci"
+  },
   "app.browse.discover-content": {
     "message": "Prozkoumat obsah"
   },
   "app.browse.discover-servers": {
     "message": "Prozkoumat servery"
   },
+  "app.browse.hide-added-servers": {
+    "message": "Skrýt již přidané servery"
+  },
+  "app.browse.project-type.modpacks": {
+    "message": "Balíčky Modifikací"
+  },
+  "app.browse.server-instance-content-warning": {
+    "message": "Přidání obsahu může narušit kompatibilitu při připojení k serveru. Veškerý přidaný obsah se navíc ztratí při aktualizaci obsahu instance serveru."
+  },
+  "app.browse.server.installing": {
+    "message": "Instalování"
+  },
+  "app.creation-modal.installing-modpack.description": {
+    "message": "{fileName}"
+  },
+  "app.creation-modal.installing-modpack.title": {
+    "message": "Probíhá instalace modpacku..."
+  },
   "app.export-modal.description-placeholder": {
     "message": "Přidej popis modpacku..."
   },
@@ -32,12 +158,18 @@
   "app.export-modal.header": {
     "message": "Exportovat modpack"
   },
+  "app.export-modal.include-file-accessibility-label": {
+    "message": "Zahrnout \"{file}\"?"
+  },
   "app.export-modal.modpack-name-label": {
     "message": "Jméno Modpacku"
   },
   "app.export-modal.modpack-name-placeholder": {
     "message": "Jméno modpacku"
   },
+  "app.export-modal.select-files-label": {
+    "message": "Nastavte, které soubory mají být do tohoto exportu zahrnuty"
+  },
   "app.export-modal.version-number-label": {
     "message": "Číslo verze"
   },
@@ -119,6 +251,9 @@
   "app.instance.worlds.remove-server-description": {
     "message": "„{name}“ bude odstraněn z tvého seznamu, včetně hry, a nebude žádný způsob, jak ho obnovit."
   },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) bude odstraněn z vašeho seznamu, a to i ve hře, a nebude možné jej obnovit."
+  },
   "app.instance.worlds.remove-server-title": {
     "message": "Opravdu chceš odstranit {name}?"
   },
@@ -128,6 +263,9 @@
   "app.instance.worlds.this-server": {
     "message": "tento server"
   },
+  "app.modal.install-to-play.content-required": {
+    "message": "Požadovaný obsah"
+  },
   "app.modal.install-to-play.header": {
     "message": "Nainstaluj ke hraní"
   },
@@ -137,12 +275,21 @@
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural,one  {#mód} other  {#módy}}"
   },
+  "app.modal.install-to-play.required-modpack": {
+    "message": "Povinný modpack"
+  },
+  "app.modal.install-to-play.server-requires-mods": {
+    "message": "Tento server k hraní vyžaduje módy. Klikni na instalovat pro získání potřebných módů z Modrinth."
+  },
   "app.modal.install-to-play.shared-instance": {
     "message": "Sdílená instance"
   },
   "app.modal.install-to-play.shared-server-instance": {
     "message": "Sdílená serverová instance"
   },
+  "app.modal.install-to-play.view-contents": {
+    "message": "Zobrazit obsah"
+  },
   "app.modal.update-to-play.header": {
     "message": "Updatuj ke hraní"
   },
@@ -152,6 +299,15 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "Je nutná aktualizace ke hraní {name}. Prosím updatuj na nejnovější verzi k spuštění hry."
   },
+  "app.project.install-button.already-installed": {
+    "message": "Tento projekt je již nainstalován"
+  },
+  "app.project.install-context.back-to-browse": {
+    "message": "Zpět na Prozkoumat"
+  },
+  "app.project.install-context.install-content-to-instance": {
+    "message": "Nainstalovat obsah do instnce"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Vývojářský režim povolen."
   },
@@ -176,9 +332,33 @@
   "app.settings.tabs.resource-management": {
     "message": "Správa zdrojů"
   },
+  "app.update-popup.body": {
+    "message": "Aplikace Modrinth v{version} je připravena k instalaci! Nainstalujte aktualizaci nyní nebo automaticky po zavření aplikace Modrinth."
+  },
+  "app.update-popup.body.download-complete": {
+    "message": "Stahování aplikace Modrinth v{version} bylo dokončeno. Nainstalujte aktualizaci nyní nebo automaticky po zavření aplikace Modrinth."
+  },
+  "app.update-popup.body.linux": {
+    "message": "Aplikace Modrinth v{version} je k dispozici. Aktualizujte pomocí svého správce balíčků, abyste získali nejnovější funkce a opravy!"
+  },
+  "app.update-popup.body.metered": {
+    "message": "Aplikace Modrinth v{version} je nyní k dispozici! Protože jste v měřené síti, nebyla stažena automaticky."
+  },
+  "app.update-popup.changelog": {
+    "message": "Seznam změn"
+  },
   "app.update-popup.download": {
     "message": "Stáhnout ({size})"
   },
+  "app.update-popup.download-complete": {
+    "message": "Stahování bylo dokončeno"
+  },
+  "app.update-popup.reload": {
+    "message": "Načíst znovu"
+  },
+  "app.update-popup.title": {
+    "message": "Je k dispozici aktualizace"
+  },
   "app.update.complete-toast.text": {
     "message": "Kliknutím sem zobrazíte seznam změn."
   },
@@ -194,6 +374,24 @@
   "app.update.reload-to-update": {
     "message": "Restartovat aplikaci pro nainstalování aktualizace"
   },
+  "app.world.server-modal.placeholder-address": {
+    "message": "priklad.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Vyberte možnost"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Nekompatibilní verze {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Ještě nehráno"
+  },
+  "app.world.world-item.offline": {
+    "message": "Offline"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} online"
+  },
   "friends.action.add-friend": {
     "message": "Přidat přítele"
   },
@@ -293,6 +491,12 @@
   "instance.edit-world.title": {
     "message": "Upravit svět"
   },
+  "instance.files.adding-files": {
+    "message": "Přidávání souborů ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Uložit jako..."
+  },
   "instance.server-modal.address": {
     "message": "Adresa"
   },
@@ -473,6 +677,9 @@
   "instance.worlds.incompatible_server": {
     "message": "Server je nekompatibilní"
   },
+  "instance.worlds.linked_server": {
+    "message": "Spravováno projektem serveru"
+  },
   "instance.worlds.no_contact": {
     "message": "Server se nepodařilo spojit"
   },
@@ -491,6 +698,24 @@
   "instance.worlds.world_in_use": {
     "message": "Svět je použit"
   },
+  "minecraft-account.add-account": {
+    "message": "Přidat účet"
+  },
+  "minecraft-account.label": {
+    "message": "Účet Minecraft"
+  },
+  "minecraft-account.not-signed-in": {
+    "message": "Nejste přihlášeni"
+  },
+  "minecraft-account.remove-account": {
+    "message": "Odstranit účet"
+  },
+  "minecraft-account.select-account": {
+    "message": "Vyberte účet"
+  },
+  "minecraft-account.sign-in": {
+    "message": "Přihlásit se do Minecraftu"
+  },
   "search.filter.locked.instance": {
     "message": "Poskytováno instancí"
   },
@@ -503,6 +728,9 @@
   "search.filter.locked.instance.sync": {
     "message": "Synchronizováno z instancí"
   },
+  "search.filter.locked.server": {
+    "message": "Poskytováno serverem"
+  },
   "search.filter.locked.server-environment.title": {
     "message": "Jen klientské mody mohou být přidány na server"
   },
@@ -511,5 +739,26 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Loader zprostředkovává server"
+  },
+  "unknown-pack-warning-modal.body": {
+    "message": "Soubor je zkontrolován pouze v případě, že je nahrán na Modrinth, a to bez ohledu na jeho formát (včetně formátu .mrpack)."
+  },
+  "unknown-pack-warning-modal.dont-show-again": {
+    "message": "Toto varování již nezobrazovat"
+  },
+  "unknown-pack-warning-modal.header": {
+    "message": "Potvrdit instalaci"
+  },
+  "unknown-pack-warning-modal.install-anyway": {
+    "message": "Přesto nainstalovat"
+  },
+  "unknown-pack-warning-modal.malware-statement": {
+    "message": "Malware se často šíří prostřednictvím souborů s modpacky, které se sdílejí na platformách jako Discord."
+  },
+  "unknown-pack-warning-modal.warning.body": {
+    "message": "Tento soubor jsme na Modrinthu nenašli. Důrazně doporučujeme instalovat pouze soubory z důvěryhodných zdrojů."
+  },
+  "unknown-pack-warning-modal.warning.title": {
+    "message": "Upozornění na neznámý soubor"
   }
 }

apps/app-frontend/src/locales/da-DK/index.json

@@ -104,6 +104,12 @@
   "app.browse.discover-servers": {
     "message": "Opdag servere"
   },
+  "app.browse.project-type.modpacks": {
+    "message": "Modpacks"
+  },
+  "app.creation-modal.installing-modpack.description": {
+    "message": "{fileName}"
+  },
   "app.export-modal.description-placeholder": {
     "message": "Indtast modpack beskrivelse..."
   },

apps/app-frontend/src/locales/de-CH/index.json

@@ -303,7 +303,7 @@
     "message": "Dieses Projekt ist bereits installiert"
   },
   "app.project.install-context.back-to-browse": {
-    "message": "Zurück zum Durchstöbern"
+    "message": "Zurück zum Entdecken"
   },
   "app.project.install-context.install-content-to-instance": {
     "message": "Inhalt in Instanz installieren"

apps/app-frontend/src/locales/de-DE/index.json

@@ -48,7 +48,7 @@
     "message": "Farbschema"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Ändere die Seite, die beim Öffnen des Launchers angezeigt wird."
+    "message": "Ändere die Kategorie, die beim Öffnen des Launchers angezeigt wird."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Start"
@@ -137,6 +137,9 @@
   "app.browse.project-type.modpacks": {
     "message": "Modpacks"
   },
+  "app.browse.server-instance-content-warning": {
+    "message": "Das Hinzufügen von Inhalten kann die Kompatibilität beim Beitreten zum Server beeinträchtigen. Außerdem gehen alle hinzugefügten Inhalte verloren, wenn du die Inhalte der Serverinstanz aktualisierst."
+  },
   "app.browse.server.installing": {
     "message": "Wird installiert"
   },
@@ -299,6 +302,9 @@
   "app.project.install-button.already-installed": {
     "message": "Dieses Projekt ist bereits installiert"
   },
+  "app.project.install-context.back-to-browse": {
+    "message": "Zurück zum Entdecken"
+  },
   "app.project.install-context.install-content-to-instance": {
     "message": "Inhalt in Instanz installieren"
   },
@@ -519,7 +525,7 @@
     "message": "Wird gelöscht..."
   },
   "instance.settings.tabs.general.duplicate-button": {
-    "message": "Kopieren"
+    "message": "Duplizieren"
   },
   "instance.settings.tabs.general.duplicate-button.tooltip.installing": {
     "message": "Kann während der Installation nicht dupliziert werden."

apps/app-frontend/src/locales/en-US/index.json

@@ -303,7 +303,7 @@
     "message": "This project is already installed"
   },
   "app.project.install-context.back-to-browse": {
-    "message": "Back to browse"
+    "message": "Back to discover"
   },
   "app.project.install-context.install-content-to-instance": {
     "message": "Install content to instance"
@@ -611,6 +611,24 @@
   "instance.settings.tabs.java": {
     "message": "Java and memory"
   },
+  "instance.settings.tabs.java.custom-environment-variables": {
+    "message": "Custom environment variables"
+  },
+  "instance.settings.tabs.java.custom-java-arguments": {
+    "message": "Custom Java arguments"
+  },
+  "instance.settings.tabs.java.custom-java-installation": {
+    "message": "Custom Java installation"
+  },
+  "instance.settings.tabs.java.custom-memory-allocation": {
+    "message": "Custom memory allocation"
+  },
+  "instance.settings.tabs.java.enter-environment-variables": {
+    "message": "Enter environmental variables..."
+  },
+  "instance.settings.tabs.java.enter-java-arguments": {
+    "message": "Enter Java arguments..."
+  },
   "instance.settings.tabs.java.environment-variables": {
     "message": "Environment variables"
   },
@@ -626,6 +644,9 @@
   "instance.settings.tabs.java.java-memory": {
     "message": "Memory allocated"
   },
+  "instance.settings.tabs.java.java-path-placeholder": {
+    "message": "/path/to/java"
+  },
   "instance.settings.tabs.window": {
     "message": "Window"
   },

apps/app-frontend/src/locales/es-419/index.json

@@ -104,6 +104,12 @@
   "app.auth-servers.unreachable.header": {
     "message": "No se puede acceder a los servidores de autenticación"
   },
+  "app.browse.add-servers-to-instance": {
+    "message": "Añadiendo servidor a instancia"
+  },
+  "app.browse.add-to-an-instance": {
+    "message": "Añadir a una instancia"
+  },
   "app.browse.add-to-instance": {
     "message": "Añadir a instancia"
   },
@@ -116,6 +122,9 @@
   "app.browse.already-added": {
     "message": "Ya se ha añadido"
   },
+  "app.browse.back-to-instance": {
+    "message": "Volver a instancia"
+  },
   "app.browse.discover-content": {
     "message": "Descubrir contenido"
   },
@@ -128,6 +137,9 @@
   "app.browse.project-type.modpacks": {
     "message": "Modpacks"
   },
+  "app.browse.server-instance-content-warning": {
+    "message": "Añadir contenido puede romper la compatibilidad cuando te unes al servidor. Cualquier contenido añadido tambien se perderá cuando actualizes el contenido en la instancia del servidor."
+  },
   "app.browse.server.installing": {
     "message": "Instalando"
   },
@@ -287,6 +299,15 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "Se requiere una actualización para jugar {name}. Por favor, actualiza a la versión más reciente para iniciar el juego."
   },
+  "app.project.install-button.already-installed": {
+    "message": "Este proyecto está actualmente instalado"
+  },
+  "app.project.install-context.back-to-browse": {
+    "message": "Volver al explorador"
+  },
+  "app.project.install-context.install-content-to-instance": {
+    "message": "Instalar contenido a la instancia"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Modo desarrollador activado."
   },

apps/app-frontend/src/locales/es-ES/index.json

@@ -21,7 +21,7 @@
     "message": "Instancia principal"
   },
   "app.action-bar.show-more-running-instances": {
-    "message": "Mostrar mas instancias en ejecución"
+    "message": "Mostrar más instancias en ejecución"
   },
   "app.action-bar.stop-instance": {
     "message": "Finalizar instancia"
@@ -48,7 +48,7 @@
     "message": "Tema de color"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Cambia la página en la que el launcher se abre en."
+    "message": "Cambia la página en la que el lanzador inicia."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Inicio"
@@ -72,13 +72,13 @@
     "message": "Vuelve a jugar tus mundos"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimiza el launcher cuando un proceso de Minecraft empieza."
+    "message": "Minimiza el lanzador cuando un proceso de Minecraft empieza."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimiza el launcher"
+    "message": "Minimiza el lanzador"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Usa los sistemas de frame de Windows (se requiere resetear la aplicación)."
+    "message": "Usa los sistemas de marco de Windows (se requiere resetear la aplicación)."
   },
   "app.appearance-settings.native-decorations.title": {
     "message": "Decoraciones nativas"
@@ -93,10 +93,10 @@
     "message": "Alternar barra lateral"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Si intentas instalar un archivo de paquete de Modrinth (.mrpack) que no esté alojado en Modrinth, te advertiremos de los riesgos antes de instalarlo."
+    "message": "Si intentas instalar un archivo de paquete de Modrinth (.mrpack) que no esté alojado en Modrinth, debes comprender los riesgos que esto conlleva antes de instalarlo."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
-    "message": "Adviérteme antes de instalarme modpacks desconocidos"
+    "message": "Advertir antes de instalarme paquetes de mods desconocidos"
   },
   "app.auth-servers.unreachable.body": {
     "message": "Los servidores de autenticación de Minecraft pueden no estar funcionando en este momento. Verifica tu conexión a internet e inténtalo de nuevo más tarde."
@@ -104,6 +104,12 @@
   "app.auth-servers.unreachable.header": {
     "message": "No se puede conectar con los servidores de autenticación"
   },
+  "app.browse.add-servers-to-instance": {
+    "message": "Añadir servidor a instancia"
+  },
+  "app.browse.add-to-an-instance": {
+    "message": "Añadir a una instancia"
+  },
   "app.browse.add-to-instance": {
     "message": "Añadir a la instancia"
   },
@@ -116,6 +122,9 @@
   "app.browse.already-added": {
     "message": "Ya está añadido"
   },
+  "app.browse.back-to-instance": {
+    "message": "Volver a la instancia"
+  },
   "app.browse.discover-content": {
     "message": "Descubrir contenido"
   },
@@ -128,6 +137,9 @@
   "app.browse.project-type.modpacks": {
     "message": "Modpacks"
   },
+  "app.browse.server-instance-content-warning": {
+    "message": "Añadir contenido puede comprometer la compatibilidad a la hora de unirse a un servidor. Cualquier contenido añadido se perderá cuando actualices la instancia del servidor."
+  },
   "app.browse.server.installing": {
     "message": "Instalando"
   },
@@ -146,12 +158,18 @@
   "app.export-modal.header": {
     "message": "Exportar modpack"
   },
+  "app.export-modal.include-file-accessibility-label": {
+    "message": "¿Incluir \"{file}\"?"
+  },
   "app.export-modal.modpack-name-label": {
     "message": "Nombre del modpack"
   },
   "app.export-modal.modpack-name-placeholder": {
     "message": "Nombre del modpack"
   },
+  "app.export-modal.select-files-label": {
+    "message": "Configura que archivos se incluirán en esta instancia"
+  },
   "app.export-modal.version-number-label": {
     "message": "Número de versión"
   },
@@ -281,6 +299,15 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "Una actualización es requerida para jugar {name}. Por favor actualízala a la versión más reciente para ejecutar el juego."
   },
+  "app.project.install-button.already-installed": {
+    "message": "El proyecto ya está instalado"
+  },
+  "app.project.install-context.back-to-browse": {
+    "message": "Volver a descubrir"
+  },
+  "app.project.install-context.install-content-to-instance": {
+    "message": "Instalar contenido"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Modo desarrollador activado."
   },
@@ -671,6 +698,24 @@
   "instance.worlds.world_in_use": {
     "message": "El mundo está en uso"
   },
+  "minecraft-account.add-account": {
+    "message": "Añadir cuenta"
+  },
+  "minecraft-account.label": {
+    "message": "Cuenta de Minecraft"
+  },
+  "minecraft-account.not-signed-in": {
+    "message": "Registrarse"
+  },
+  "minecraft-account.remove-account": {
+    "message": "Eliminar cuenta"
+  },
+  "minecraft-account.select-account": {
+    "message": "Seleccionar cuenta"
+  },
+  "minecraft-account.sign-in": {
+    "message": "Registrarse en Minecraft"
+  },
   "search.filter.locked.instance": {
     "message": "Proporcionado por la instancia"
   },

apps/app-frontend/src/locales/fi-FI/index.json

@@ -1,10 +1,115 @@
 {
+  "app.action-bar.downloading-java": {
+    "message": "Ladataan Java-versiota {version}"
+  },
+  "app.action-bar.downloads": {
+    "message": "Lataukset"
+  },
+  "app.action-bar.hide-more-running-instances": {
+    "message": "Piilota enemmän käynnissä olevia instansseja"
+  },
+  "app.action-bar.make-primary-instance": {
+    "message": "Aseta ensisijaiseksi instanssiksi"
+  },
+  "app.action-bar.no-instances-running": {
+    "message": "Ei instansseja käynnissä"
+  },
+  "app.action-bar.offline": {
+    "message": "Offline-tilassa"
+  },
+  "app.action-bar.primary-instance": {
+    "message": "Ensisijainen instanssi"
+  },
+  "app.action-bar.show-more-running-instances": {
+    "message": "Näytä enemmän käynnissä olevia instansseja"
+  },
+  "app.action-bar.stop-instance": {
+    "message": "Pysäytä instanssi"
+  },
+  "app.action-bar.view-active-downloads": {
+    "message": "Näytä aktiiviset lataukset"
+  },
+  "app.action-bar.view-instance": {
+    "message": "Katso intanssia"
+  },
+  "app.action-bar.view-logs": {
+    "message": "Katso lokeja"
+  },
+  "app.appearance-settings.advanced-rendering.description": {
+    "message": "Mahdollistaa edistyneen renderöinnin, kuten sumennus efektit, jotka voivat aiheuttaa suorituskykyongelmia ilman laitteistokiihdytettyä renderöintiä."
+  },
+  "app.appearance-settings.advanced-rendering.title": {
+    "message": "Edistynyt renderointi"
+  },
+  "app.appearance-settings.color-theme.description": {
+    "message": "Valitse haluamasi väriteema Modrinth Appille."
+  },
+  "app.appearance-settings.color-theme.title": {
+    "message": "Väriteema"
+  },
+  "app.appearance-settings.default-landing-page.description": {
+    "message": "Muuta sivua mille laukaisin avautuu."
+  },
+  "app.appearance-settings.default-landing-page.home": {
+    "message": "Koti"
+  },
+  "app.appearance-settings.default-landing-page.library": {
+    "message": "Kirjasto"
+  },
+  "app.appearance-settings.default-landing-page.title": {
+    "message": "Oletus laskeutumissivu"
+  },
+  "app.appearance-settings.hide-nametag.description": {
+    "message": "Kytkee pois päältä nimikyltin pelaajasi päällä skinit sivulla."
+  },
+  "app.appearance-settings.hide-nametag.title": {
+    "message": "Piilota nimikyltti"
+  },
+  "app.appearance-settings.jump-back-into-worlds.description": {
+    "message": "Sisällyttää viimeaikaiset maailmat \"Hyppää takaisin sisään\" osiossa Koti sivulla."
+  },
+  "app.appearance-settings.jump-back-into-worlds.title": {
+    "message": "Hyppää takaisin sisään maailmoihin"
+  },
+  "app.appearance-settings.minimize-launcher.description": {
+    "message": "Pienennä laukaisin kun Minecraft prosessi käynnistyy."
+  },
+  "app.appearance-settings.minimize-launcher.title": {
+    "message": "Piilota käynnistysohjelma"
+  },
+  "app.appearance-settings.native-decorations.description": {
+    "message": "Käytä järjestelmän ikkuna kehystä (Vaatii sovelluksen uudelleen käynnistämisen)."
+  },
+  "app.appearance-settings.native-decorations.title": {
+    "message": "Natiivit koristukset"
+  },
+  "app.appearance-settings.select-option": {
+    "message": "Valitse vaihtoehto"
+  },
+  "app.appearance-settings.toggle-sidebar.description": {
+    "message": "Laittaa päälle mahdollisuuden kytkeä sivupalkkia."
+  },
+  "app.appearance-settings.toggle-sidebar.title": {
+    "message": "Kytke sivupalkki"
+  },
+  "app.appearance-settings.unknown-pack-warning.description": {
+    "message": "Jos yrität asentaa Modrinth-pakettitiedoston (.mrpack), jota ei ole isännöity Modrinthissä, varmistamme, että ymmärrät riskit ennen asennusta."
+  },
+  "app.appearance-settings.unknown-pack-warning.title": {
+    "message": "Varoita minua ennen tuntemattomien modipakettien asentamista"
+  },
   "app.auth-servers.unreachable.body": {
     "message": "Minecraftin todennuspalvelimet eivät ehkä ole tällä hetkellä tavoitettavissa. Tarkista internetyhteytesi ja yritä myöhemmin uudelleen."
   },
   "app.auth-servers.unreachable.header": {
     "message": "Todennuspalvelimiin ei saada yhteyttä"
   },
+  "app.browse.add-servers-to-instance": {
+    "message": "Lisää palvelin instanssiin"
+  },
+  "app.browse.add-to-an-instance": {
+    "message": "Lisää instanssiin"
+  },
   "app.browse.add-to-instance": {
     "message": "Lisää instanssiin"
   },
@@ -17,12 +122,33 @@
   "app.browse.already-added": {
     "message": "On jo asennettu"
   },
+  "app.browse.back-to-instance": {
+    "message": "Takaisin instanssiin"
+  },
   "app.browse.discover-content": {
     "message": "Löydä sisältöä"
   },
   "app.browse.discover-servers": {
     "message": "Löydä palvelimia"
   },
+  "app.browse.hide-added-servers": {
+    "message": "Piilota lisätyt palvelimet"
+  },
+  "app.browse.project-type.modpacks": {
+    "message": "Modipaketit"
+  },
+  "app.browse.server-instance-content-warning": {
+    "message": "Sisällön lisääminen voi rikkoa yhteensopivuuden palvelimelle liittyessä. Kaikki lisätty sisältö katoaa myös kun päivität palvelin instanssin sisällön."
+  },
+  "app.browse.server.installing": {
+    "message": "Asennetaan"
+  },
+  "app.creation-modal.installing-modpack.description": {
+    "message": "{fileName}"
+  },
+  "app.creation-modal.installing-modpack.title": {
+    "message": "Asennetaan modipakettia..."
+  },
   "app.export-modal.description-placeholder": {
     "message": "Lisää modipaketin kuvaus..."
   },
@@ -32,12 +158,18 @@
   "app.export-modal.header": {
     "message": "Vie modipaketti"
   },
+  "app.export-modal.include-file-accessibility-label": {
+    "message": "Sisällytä \"{file}\"?"
+  },
   "app.export-modal.modpack-name-label": {
     "message": "Modipaketin nimi"
   },
   "app.export-modal.modpack-name-placeholder": {
     "message": "Modipaketin nimi"
   },
+  "app.export-modal.select-files-label": {
+    "message": "Muuta mitkä tiedostot sisältyvät tähän vientiin"
+  },
   "app.export-modal.version-number-label": {
     "message": "Versio numero"
   },
@@ -80,6 +212,9 @@
   "app.instance.mods.share-text": {
     "message": "Tsekkaa projektit joita käytän minun modipaketissani!"
   },
+  "app.instance.mods.share-title": {
+    "message": "Jaetaan modipaketti sisältöä"
+  },
   "app.instance.mods.successfully-uploaded": {
     "message": "Onnistuneesti ladattu"
   },
@@ -164,6 +299,15 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "Pävitys vaaditaan pelataksesi {name}. Päivitä viimeisimpään versioon pelataksesi."
   },
+  "app.project.install-button.already-installed": {
+    "message": "Tämä projekti on jo asennettu"
+  },
+  "app.project.install-context.back-to-browse": {
+    "message": "Takaisin sisällön löytöön"
+  },
+  "app.project.install-context.install-content-to-instance": {
+    "message": "Asenna sisältöä instanssiin"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Kehittäjätila käytössä."
   },
@@ -467,6 +611,24 @@
   "instance.settings.tabs.java": {
     "message": "Java ja muisti"
   },
+  "instance.settings.tabs.java.custom-environment-variables": {
+    "message": "Mukautetut ympäristö muuttujat"
+  },
+  "instance.settings.tabs.java.custom-java-arguments": {
+    "message": "Mukautetut Java argumentit"
+  },
+  "instance.settings.tabs.java.custom-java-installation": {
+    "message": "Mukautettu Java asennus"
+  },
+  "instance.settings.tabs.java.custom-memory-allocation": {
+    "message": "Mukautettu muistin allokointi"
+  },
+  "instance.settings.tabs.java.enter-environment-variables": {
+    "message": "Syötä ympäristö muuttujat..."
+  },
+  "instance.settings.tabs.java.enter-java-arguments": {
+    "message": "Syötä Java argumentit..."
+  },
   "instance.settings.tabs.java.environment-variables": {
     "message": "Ympäristö muuttujat"
   },
@@ -482,6 +644,9 @@
   "instance.settings.tabs.java.java-memory": {
     "message": "Muisti allokoitu"
   },
+  "instance.settings.tabs.java.java-path-placeholder": {
+    "message": "/javaan/johtava/polku/"
+  },
   "instance.settings.tabs.window": {
     "message": "Ikkuna"
   },
@@ -554,6 +719,24 @@
   "instance.worlds.world_in_use": {
     "message": "Maailma on käytössä"
   },
+  "minecraft-account.add-account": {
+    "message": "Lisää tili"
+  },
+  "minecraft-account.label": {
+    "message": "Minecraft tili"
+  },
+  "minecraft-account.not-signed-in": {
+    "message": "Ei kirjautuneena sisään"
+  },
+  "minecraft-account.remove-account": {
+    "message": "Poista tili"
+  },
+  "minecraft-account.select-account": {
+    "message": "Valitse tili"
+  },
+  "minecraft-account.sign-in": {
+    "message": "Kirjaudu sisään Minecraftiin"
+  },
   "search.filter.locked.instance": {
     "message": "Annettu instanssin toimesta"
   },
@@ -577,5 +760,26 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Modialusta on palvelimen tarjoama"
+  },
+  "unknown-pack-warning-modal.body": {
+    "message": "Tiedosto tarkistetaan vain jos se on ladattu Modrinthiin, riippumatta tiedoston muodosta (mukaanlukien .mrpack)."
+  },
+  "unknown-pack-warning-modal.dont-show-again": {
+    "message": "Älä näytä tätä varoitusta uudestaan"
+  },
+  "unknown-pack-warning-modal.header": {
+    "message": "Vahvista asennus"
+  },
+  "unknown-pack-warning-modal.install-anyway": {
+    "message": "Asenna jokatapauksessa"
+  },
+  "unknown-pack-warning-modal.malware-statement": {
+    "message": "Haittaohjelmia levitetään usein modipaketti tiedostojen kautta jakamalla niitä alustoilla kuten Discordissa."
+  },
+  "unknown-pack-warning-modal.warning.body": {
+    "message": "Emme löytäneet tätä tiedostoa Modrinthista. Suosittelemme vahvasti että asennat tiedostoja vain lähteistä joihin luotat."
+  },
+  "unknown-pack-warning-modal.warning.title": {
+    "message": "Tuntematon tiedosto varoitus"
   }
 }

apps/app-frontend/src/locales/fil-PH/index.json

@@ -729,7 +729,7 @@
     "message": "Kumpirmahin ang installation"
   },
   "unknown-pack-warning-modal.install-anyway": {
-    "message": "I-install parin"
+    "message": "I-install pa rin"
   },
   "unknown-pack-warning-modal.malware-statement": {
     "message": "Ang malware ay madalas naidadala sa mga modpack files sa pamamagitan ng pag-bigay ng mga ito sa mga platforms kagaya ng Discord."

apps/app-frontend/src/locales/fr-FR/index.json

@@ -1,6 +1,6 @@
 {
   "app.action-bar.downloading-java": {
-    "message": "Java version {version} en cours de téléchargement"
+    "message": "Téléchargement de Java {version} en cours"
   },
   "app.action-bar.downloads": {
     "message": "Téléchargements"
@@ -303,7 +303,7 @@
     "message": "Ce projet a déjà été installé"
   },
   "app.project.install-context.back-to-browse": {
-    "message": "Retour à la navigation"
+    "message": "Retour vers la page découvrir"
   },
   "app.project.install-context.install-content-to-instance": {
     "message": "Installer du contenu à l'instance"

apps/app-frontend/src/locales/hu-HU/index.json

@@ -20,15 +20,78 @@
   "app.action-bar.primary-instance": {
     "message": "Elsődleges profil"
   },
+  "app.action-bar.show-more-running-instances": {
+    "message": "További futó profilok megjelenítése"
+  },
   "app.action-bar.stop-instance": {
     "message": "Profil megállítása"
   },
+  "app.action-bar.view-active-downloads": {
+    "message": "Aktív letöltések megtekintése"
+  },
+  "app.action-bar.view-instance": {
+    "message": "Profil megtekintése"
+  },
   "app.action-bar.view-logs": {
     "message": "Naplók megtekintése"
   },
+  "app.appearance-settings.advanced-rendering.description": {
+    "message": "Lehetővé teszi olyan speciális megjelenítési effektusok használatát, mint például az elmosódás, amelyek hardveres gyorsítás nélkül teljesítménycsökkenést okozhatnak."
+  },
+  "app.appearance-settings.advanced-rendering.title": {
+    "message": "Fejlett renderelés"
+  },
+  "app.appearance-settings.color-theme.description": {
+    "message": "Válaszd ki a Modrinth Apphoz a kívánt színsémát."
+  },
   "app.appearance-settings.color-theme.title": {
     "message": "Téma"
   },
+  "app.appearance-settings.default-landing-page.description": {
+    "message": "Állítsd be, hogy az indító melyik oldalon nyíljon meg."
+  },
+  "app.appearance-settings.default-landing-page.home": {
+    "message": "Kezdőlap"
+  },
+  "app.appearance-settings.default-landing-page.library": {
+    "message": "Könyvtár"
+  },
+  "app.appearance-settings.default-landing-page.title": {
+    "message": "Alapértelmezett nyitóoldal"
+  },
+  "app.appearance-settings.hide-nametag.description": {
+    "message": "Letiltja a játékosod felett megjelenő névcímkét a Skinek oldalon."
+  },
+  "app.appearance-settings.hide-nametag.title": {
+    "message": "Névcímke eltüntetése"
+  },
+  "app.appearance-settings.jump-back-into-worlds.description": {
+    "message": "A kezdőlap „Folytasd itt” részében a legújabb világok is megtalálhatók."
+  },
+  "app.appearance-settings.jump-back-into-worlds.title": {
+    "message": "„Folytasd itt” a világokat is"
+  },
+  "app.appearance-settings.minimize-launcher.description": {
+    "message": "Minimalizáld az indítót a Minecraft indításakor."
+  },
+  "app.appearance-settings.minimize-launcher.title": {
+    "message": "Indító minimalizálása"
+  },
+  "app.appearance-settings.native-decorations.description": {
+    "message": "A rendszer ablakkeret használata (az alkalmazás újraindítása szükséges)."
+  },
+  "app.appearance-settings.native-decorations.title": {
+    "message": "Rendszer ablakkeret használata"
+  },
+  "app.appearance-settings.select-option": {
+    "message": "Válassz egy lehetőséget"
+  },
+  "app.appearance-settings.toggle-sidebar.description": {
+    "message": "Lehetővé teszi az oldalsáv be- és kikapcsolását."
+  },
+  "app.appearance-settings.toggle-sidebar.title": {
+    "message": "Oldalsáv megjelenítése/elrejtése"
+  },
   "app.appearance-settings.unknown-pack-warning.description": {
     "message": "Ha olyan Modrinth Csomagfájlt (.mrpack) próbálsz telepíteni, amely nem a Modrinth szerverén található, a telepítés előtt gondoskodunk arról, hogy tisztában legyél a kockázatokkal."
   },
@@ -41,6 +104,12 @@
   "app.auth-servers.unreachable.header": {
     "message": "Nem lehet elérni a hitelesítési kiszolgálókat"
   },
+  "app.browse.add-servers-to-instance": {
+    "message": "Szerver hozzáadása a profilhoz"
+  },
+  "app.browse.add-to-an-instance": {
+    "message": "Hozzáadás egy profilhoz"
+  },
   "app.browse.add-to-instance": {
     "message": "Hozzáadás a profilhoz"
   },
@@ -68,6 +137,9 @@
   "app.browse.project-type.modpacks": {
     "message": "Modcsomagok"
   },
+  "app.browse.server-instance-content-warning": {
+    "message": "A tartalom hozzáadása ronthatja a kompatibilitást a szerverhez való csatlakozáskor. A hozzáadott tartalom elveszik, ha frissíted a szerverprofil tartalmát."
+  },
   "app.browse.server.installing": {
     "message": "Letöltés..."
   },
@@ -86,12 +158,18 @@
   "app.export-modal.header": {
     "message": "Modcsomag exportálása"
   },
+  "app.export-modal.include-file-accessibility-label": {
+    "message": "Tartalmaz „{file}” fájlokat?"
+  },
   "app.export-modal.modpack-name-label": {
     "message": "A modcsomag neve"
   },
   "app.export-modal.modpack-name-placeholder": {
     "message": "A modcsomag neve"
   },
+  "app.export-modal.select-files-label": {
+    "message": "Állítsd be, hogy mely fájlok kerüljenek bele az exportba"
+  },
   "app.export-modal.version-number-label": {
     "message": "Verziószám"
   },
@@ -219,7 +297,10 @@
     "message": "Frissítés szükséges"
   },
   "app.modal.update-to-play.update-required-description": {
-    "message": "\nFrissítés szükséges ehhez: {name}. Kérjük, frissíts a legújabb verzióra a játék elindításához"
+    "message": "Frissítés szükséges ehhez: {name}. Kérlek, frissíts a legújabb verzióra a játék elindításához."
+  },
+  "app.project.install-button.already-installed": {
+    "message": "Ez a projekt már telepítve van"
   },
   "app.project.install-context.back-to-browse": {
     "message": "Vissza a böngészéshez"
@@ -588,7 +669,7 @@
     "message": "Ne mutasd a kezdőlapon"
   },
   "instance.worlds.game_already_open": {
-    "message": "A profil már meg van nyitva"
+    "message": "A profil már el van indítva"
   },
   "instance.worlds.hardcore": {
     "message": "Hardcore mód"
@@ -617,6 +698,24 @@
   "instance.worlds.world_in_use": {
     "message": "A világ használatban van"
   },
+  "minecraft-account.add-account": {
+    "message": "Fiók hozzáadása"
+  },
+  "minecraft-account.label": {
+    "message": "Minecraft-fiók"
+  },
+  "minecraft-account.not-signed-in": {
+    "message": "Nem vagy bejelentkezve"
+  },
+  "minecraft-account.remove-account": {
+    "message": "Fiók törlése"
+  },
+  "minecraft-account.select-account": {
+    "message": "Fiók kiválasztása"
+  },
+  "minecraft-account.sign-in": {
+    "message": "Bejelentkezés a Minecraftba"
+  },
   "search.filter.locked.instance": {
     "message": "A profil által van megadva"
   },
@@ -641,13 +740,25 @@
   "search.filter.locked.server-loader.title": {
     "message": "A betöltőt a szerver biztosítja"
   },
+  "unknown-pack-warning-modal.body": {
+    "message": "Egy fájlt csak akkor vizsgálunk meg, ha azt feltöltik a Modrinthra, függetlenül a fájlformátumtól (beleértve a .mrpack formátumot is)."
+  },
+  "unknown-pack-warning-modal.dont-show-again": {
+    "message": "Ne mutasd újra ezt a figyelmeztetést"
+  },
   "unknown-pack-warning-modal.header": {
     "message": "Telepítés megerősítése"
   },
   "unknown-pack-warning-modal.install-anyway": {
     "message": "Letöltés mindenképpen"
   },
+  "unknown-pack-warning-modal.malware-statement": {
+    "message": "A rosszindulatú programokat gyakran modcsomag-fájlokon keresztül terjesztik, például a Discordhoz hasonló platformokon történő megosztás révén."
+  },
   "unknown-pack-warning-modal.warning.body": {
     "message": "Ezt a fájlt nem találtuk meg a Modrinthon. Határozottan javasoljuk, hogy kizárólag megbízható forrásokból származó fájlokat telepíts."
+  },
+  "unknown-pack-warning-modal.warning.title": {
+    "message": "Figyelmeztetés ismeretlen fájlról"
   }
 }

apps/app-frontend/src/locales/id-ID/index.json

@@ -71,6 +71,9 @@
   "app.appearance-settings.select-option": {
     "message": "Pilih opsi"
   },
+  "app.appearance-settings.unknown-pack-warning.title": {
+    "message": "Peringatkan saya sebelum memasang paket mod tidak dikenal"
+  },
   "app.auth-servers.unreachable.body": {
     "message": "Server autentikasi Minecraft mungkin sedang tidak tersedia saat ini. Periksa koneksi internet Anda dan coba lagi nanti."
   },
@@ -269,6 +272,9 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "{name} perlu diperbarui sebelum dimainkan. Mohon perbarui ke versi terkini untuk meluncurkan permainan."
   },
+  "app.project.install-context.install-content-to-instance": {
+    "message": "Pasang konten ke instans"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Mode pengembang dihidupkan."
   },
@@ -659,6 +665,21 @@
   "instance.worlds.world_in_use": {
     "message": "Dunia sedang dimainkan"
   },
+  "minecraft-account.add-account": {
+    "message": "Tambah akun"
+  },
+  "minecraft-account.label": {
+    "message": "Akun Minecraft"
+  },
+  "minecraft-account.not-signed-in": {
+    "message": "Tidak masuk"
+  },
+  "minecraft-account.remove-account": {
+    "message": "Hapus akun"
+  },
+  "minecraft-account.select-account": {
+    "message": "Pilih akun"
+  },
   "search.filter.locked.instance": {
     "message": "Disediakan oleh instans"
   },
@@ -682,5 +703,20 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Pemuat disediakan oleh server"
+  },
+  "unknown-pack-warning-modal.dont-show-again": {
+    "message": "Jangan tampilkan peringatan ini lagi"
+  },
+  "unknown-pack-warning-modal.header": {
+    "message": "Konfirmasi pemasangan"
+  },
+  "unknown-pack-warning-modal.install-anyway": {
+    "message": "Tetap pasang"
+  },
+  "unknown-pack-warning-modal.warning.body": {
+    "message": "Kami tidak dapat menemukan berkas ini di Modrinth. Kami sangat menyarankan Anda untuk hanya memasang berkas dari sumber-sumber terpercaya."
+  },
+  "unknown-pack-warning-modal.warning.title": {
+    "message": "Peringatan berkas tidak dikenal"
   }
 }

apps/app-frontend/src/locales/it-IT/index.json

@@ -84,7 +84,7 @@
     "message": "Decorazioni native"
   },
   "app.appearance-settings.select-option": {
-    "message": "Scegli una pagina"
+    "message": "Seleziona"
   },
   "app.appearance-settings.toggle-sidebar.description": {
     "message": "Scegli se mostrare o nascondere la barra laterale."
@@ -93,7 +93,7 @@
     "message": "Abilita la barra laterale"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Visti i rischi nell'installare un file Modrinth Pack (.mrpack) non proveniente da Modrinth, mostriamo un avvertimento quando tenti di fare ciò."
+    "message": "Visti i rischi, apparirà un avviso prima di installare un file Modrinth Pack (.mrpack) non proveniente da Modrinth."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Avvisami se installo pacchetti sconosciuti"
@@ -303,7 +303,7 @@
     "message": "Questo progetto è già stato installato"
   },
   "app.project.install-context.back-to-browse": {
-    "message": "Torna su esplora"
+    "message": "Torna a Esplora"
   },
   "app.project.install-context.install-content-to-instance": {
     "message": "Installa il contenuto nell'istanza"
@@ -611,6 +611,24 @@
   "instance.settings.tabs.java": {
     "message": "Java e memoria"
   },
+  "instance.settings.tabs.java.custom-environment-variables": {
+    "message": "Variabili d'ambiente"
+  },
+  "instance.settings.tabs.java.custom-java-arguments": {
+    "message": "Argomenti JVM"
+  },
+  "instance.settings.tabs.java.custom-java-installation": {
+    "message": "Eseguibile di Java"
+  },
+  "instance.settings.tabs.java.custom-memory-allocation": {
+    "message": "Memoria allocata"
+  },
+  "instance.settings.tabs.java.enter-environment-variables": {
+    "message": "Inserisci le variabili d'ambiente..."
+  },
+  "instance.settings.tabs.java.enter-java-arguments": {
+    "message": "Inserisci gli argomenti JVM..."
+  },
   "instance.settings.tabs.java.environment-variables": {
     "message": "Variabili d'ambiente"
   },
@@ -626,6 +644,9 @@
   "instance.settings.tabs.java.java-memory": {
     "message": "Memoria allocata"
   },
+  "instance.settings.tabs.java.java-path-placeholder": {
+    "message": "/percorso/di/java"
+  },
   "instance.settings.tabs.window": {
     "message": "Finestra"
   },

apps/app-frontend/src/locales/ko-KR/index.json

@@ -24,7 +24,7 @@
     "message": "실행 중인 인스턴스 보이기"
   },
   "app.action-bar.stop-instance": {
-    "message": "인스턴스 중지"
+    "message": "인스턴스 멈추기"
   },
   "app.action-bar.view-active-downloads": {
     "message": "다운로드 목록 보기"
@@ -104,6 +104,12 @@
   "app.auth-servers.unreachable.header": {
     "message": "인증 서버에 연결할 수 없습니다"
   },
+  "app.browse.add-servers-to-instance": {
+    "message": "인스턴스에 서버 추가"
+  },
+  "app.browse.add-to-an-instance": {
+    "message": "인스턴스에 추가"
+  },
   "app.browse.add-to-instance": {
     "message": "인스턴스에 추가"
   },
@@ -116,6 +122,9 @@
   "app.browse.already-added": {
     "message": "이미 추가됨"
   },
+  "app.browse.back-to-instance": {
+    "message": "인스턴스로 돌아가기"
+  },
   "app.browse.discover-content": {
     "message": "콘텐츠 탐색하기"
   },
@@ -128,6 +137,9 @@
   "app.browse.project-type.modpacks": {
     "message": "모드팩"
   },
+  "app.browse.server-instance-content-warning": {
+    "message": "콘텐츠를 추가하면 서버 접속 시 호환이 안 될 수 있습니다. 또한 서버 인스턴스 콘텐츠를 업데이트하면 임의로 추가된 콘텐츠는 모두 손실됩니다."
+  },
   "app.browse.server.installing": {
     "message": "설치 중"
   },
@@ -180,10 +192,10 @@
     "message": "이 모드팩은 이미 <bold>{instanceName}</bold> 인스턴스에 설치되어 있습니다. 정말로 복제하시겠습니까?"
   },
   "app.instance.modpack-already-installed.create": {
-    "message": "생성"
+    "message": "만들기"
   },
   "app.instance.modpack-already-installed.header": {
-    "message": "모드팩 이미 설치됨"
+    "message": "이미 설치된 모드팩"
   },
   "app.instance.modpack-already-installed.instance": {
     "message": "인스턴스"
@@ -287,6 +299,15 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "{name}을(를) 플레이하려면 업데이트가 필요합니다. 게임을 실행하려면 최신 버전으로 업데이트해 주세요."
   },
+  "app.project.install-button.already-installed": {
+    "message": "이미 설치되어 있음"
+  },
+  "app.project.install-context.back-to-browse": {
+    "message": "탐색으로 돌아가기"
+  },
+  "app.project.install-context.install-content-to-instance": {
+    "message": "인스턴스에 콘텐츠 설치"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "개발자 모드가 활성화되었습니다."
   },
@@ -590,6 +611,24 @@
   "instance.settings.tabs.java": {
     "message": "Java 및 메모리"
   },
+  "instance.settings.tabs.java.custom-environment-variables": {
+    "message": "사용자 지정 환경 변수"
+  },
+  "instance.settings.tabs.java.custom-java-arguments": {
+    "message": "사용자 지정 Java 매개변수"
+  },
+  "instance.settings.tabs.java.custom-java-installation": {
+    "message": "사용자 지정 Java 설치"
+  },
+  "instance.settings.tabs.java.custom-memory-allocation": {
+    "message": "사용자 지정 메모리 할당"
+  },
+  "instance.settings.tabs.java.enter-environment-variables": {
+    "message": "환경 변수를 입력하세요..."
+  },
+  "instance.settings.tabs.java.enter-java-arguments": {
+    "message": "Java 인수를 입력하세요..."
+  },
   "instance.settings.tabs.java.environment-variables": {
     "message": "환경 변수"
   },
@@ -605,6 +644,9 @@
   "instance.settings.tabs.java.java-memory": {
     "message": "할당된 메모리"
   },
+  "instance.settings.tabs.java.java-path-placeholder": {
+    "message": "/path/to/java"
+  },
   "instance.settings.tabs.window": {
     "message": "창"
   },

apps/app-frontend/src/locales/ms-MY/index.json

@@ -302,9 +302,6 @@
   "app.project.install-button.already-installed": {
     "message": "Projek ini sudah dipasang"
   },
-  "app.project.install-context.back-to-browse": {
-    "message": "Kembali melayar"
-  },
   "app.project.install-context.install-content-to-instance": {
     "message": "Pasang kandungan ke dalam pemasangan"
   },

apps/app-frontend/src/locales/nl-NL/index.json

@@ -189,7 +189,7 @@
     "message": "Verwijder instantie"
   },
   "app.instance.modpack-already-installed.body": {
-    "message": "Deze modpakket is al in de <bold>{instanceName}<bold> instantie geïnstalleerd. Ben je zeker dat je het geen wil dupliceren?"
+    "message": "Deze modpakket is al in de <bold>{instanceName}</bold> instantie geïnstalleerd. Ben je zeker dat je het geen wil dupliceren?"
   },
   "app.instance.modpack-already-installed.create": {
     "message": "Maak"
@@ -302,9 +302,6 @@
   "app.project.install-button.already-installed": {
     "message": "Dit project is al geïnstalleerd"
   },
-  "app.project.install-context.back-to-browse": {
-    "message": "Terug naar browsen"
-  },
   "app.project.install-context.install-content-to-instance": {
     "message": "Installeer content naar instantie"
   },

apps/app-frontend/src/locales/pl-PL/index.json

@@ -137,6 +137,9 @@
   "app.browse.project-type.modpacks": {
     "message": "Paczki modów"
   },
+  "app.browse.server-instance-content-warning": {
+    "message": "Dodawanie zawartości może zepsuć kompatybilność podczas dołączania na serwer. Jakakolwiek dodana zawartość zostanie stracona, gdy zaktualizujesz zawartość instancji serwera."
+  },
   "app.browse.server.installing": {
     "message": "Instalowanie"
   },
@@ -155,12 +158,18 @@
   "app.export-modal.header": {
     "message": "Eksportuj paczkę modów"
   },
+  "app.export-modal.include-file-accessibility-label": {
+    "message": "Dołączyć \"{file}\"?"
+  },
   "app.export-modal.modpack-name-label": {
     "message": "Nazwa paczki modów"
   },
   "app.export-modal.modpack-name-placeholder": {
     "message": "Nazwa paczki modów"
   },
+  "app.export-modal.select-files-label": {
+    "message": "Skonfiguruje jakie pliki zostaną załączone w tym eksporcie"
+  },
   "app.export-modal.version-number-label": {
     "message": "Numer wersji"
   },
@@ -168,7 +177,7 @@
     "message": "1.0.0"
   },
   "app.instance.confirm-delete.admonition-body": {
-    "message": "Wszystkie dane z Twojej instancji zostaną trwale usunięte, w tym Twoje światy, pliki konfiguracji i wszystkie zainstalowane treści."
+    "message": "Wszystkie dane z Twojej instancji zostaną trwale usunięte, w tym Twoje światy, pliki konfiguracji i jakakolwiek dodana zawartość."
   },
   "app.instance.confirm-delete.admonition-header": {
     "message": "Tej akcji nie można odwrócić"
@@ -294,7 +303,7 @@
     "message": "Ten projekt jest już zainstalowany"
   },
   "app.project.install-context.back-to-browse": {
-    "message": "Powrót do przeglądania"
+    "message": "Powróć do odkrywania"
   },
   "app.project.install-context.install-content-to-instance": {
     "message": "Zainstaluj zasoby do instancji"
@@ -695,6 +704,9 @@
   "minecraft-account.label": {
     "message": "Konto Minecraft"
   },
+  "minecraft-account.not-signed-in": {
+    "message": "Nie zalogowano"
+  },
   "minecraft-account.remove-account": {
     "message": "Usuń konto"
   },

apps/app-frontend/src/locales/pt-BR/index.json

@@ -303,7 +303,7 @@
     "message": "Este projeto já foi instalado"
   },
   "app.project.install-context.back-to-browse": {
-    "message": "Voltar ao explorar"
+    "message": "Voltar ao descobrir"
   },
   "app.project.install-context.install-content-to-instance": {
     "message": "Instalar conteúdo para a instância"
@@ -611,6 +611,24 @@
   "instance.settings.tabs.java": {
     "message": "Java e memória"
   },
+  "instance.settings.tabs.java.custom-environment-variables": {
+    "message": "Variáveis ​​de ambiente personalizadas"
+  },
+  "instance.settings.tabs.java.custom-java-arguments": {
+    "message": "Argumentos Java personalizados"
+  },
+  "instance.settings.tabs.java.custom-java-installation": {
+    "message": "Instalação personalizada do Java"
+  },
+  "instance.settings.tabs.java.custom-memory-allocation": {
+    "message": "Alocação de memória personalizada"
+  },
+  "instance.settings.tabs.java.enter-environment-variables": {
+    "message": "Insira as variáveis ​​de ambiente..."
+  },
+  "instance.settings.tabs.java.enter-java-arguments": {
+    "message": "Insira os argumentos Java..."
+  },
   "instance.settings.tabs.java.environment-variables": {
     "message": "Variáveis de ambiente"
   },
@@ -626,6 +644,9 @@
   "instance.settings.tabs.java.java-memory": {
     "message": "Memória alocada"
   },
+  "instance.settings.tabs.java.java-path-placeholder": {
+    "message": "/caminho/para/java"
+  },
   "instance.settings.tabs.window": {
     "message": "Janela"
   },

apps/app-frontend/src/locales/pt-PT/index.json

@@ -1,4 +1,61 @@
 {
+  "app.action-bar.downloading-java": {
+    "message": "A descarregar a versão do java {version}"
+  },
+  "app.action-bar.downloads": {
+    "message": "Downloads"
+  },
+  "app.action-bar.hide-more-running-instances": {
+    "message": "Esconder mais instâncias a correr"
+  },
+  "app.action-bar.make-primary-instance": {
+    "message": "Transformar na instância principal"
+  },
+  "app.action-bar.no-instances-running": {
+    "message": "Nenhuma instância a correr"
+  },
+  "app.action-bar.offline": {
+    "message": "Offline"
+  },
+  "app.action-bar.primary-instance": {
+    "message": "Instância principal"
+  },
+  "app.action-bar.show-more-running-instances": {
+    "message": "Mostrar mais instâncias a correr"
+  },
+  "app.action-bar.stop-instance": {
+    "message": "Para instância"
+  },
+  "app.action-bar.view-active-downloads": {
+    "message": "Ver instâncias ativas"
+  },
+  "app.action-bar.view-instance": {
+    "message": "Ver instância"
+  },
+  "app.action-bar.view-logs": {
+    "message": "Ver logs"
+  },
+  "app.appearance-settings.advanced-rendering.title": {
+    "message": "Renderização avançada"
+  },
+  "app.appearance-settings.color-theme.description": {
+    "message": "Seleciona a tua cor preferida para a Modrinth App."
+  },
+  "app.appearance-settings.color-theme.title": {
+    "message": "Cor de tema"
+  },
+  "app.appearance-settings.default-landing-page.description": {
+    "message": "Mudar a página em que o launcher abre."
+  },
+  "app.appearance-settings.default-landing-page.home": {
+    "message": "Casa"
+  },
+  "app.appearance-settings.default-landing-page.library": {
+    "message": "Livraria"
+  },
+  "app.appearance-settings.default-landing-page.title": {
+    "message": "Página de carregamento principal"
+  },
   "app.auth-servers.unreachable.body": {
     "message": "Os servidores de autenticação do Minecraft poderão estar em baixo de momento. Verifica a tua ligação à internet e tenta novamente mais tarde."
   },

apps/app-frontend/src/locales/ru-RU/index.json

@@ -3,7 +3,7 @@
     "message": "Скачивание Java {version}"
   },
   "app.action-bar.downloads": {
-    "message": "Скачивания"
+    "message": "Скачивание"
   },
   "app.action-bar.hide-more-running-instances": {
     "message": "Скрыть другие активные сборки"
@@ -360,7 +360,7 @@
     "message": "Доступно обновление"
   },
   "app.update.complete-toast.text": {
-    "message": "Нажмите здесь, чтобы посмотреть изменения."
+    "message": "Нажмите, чтобы посмотреть список изменений."
   },
   "app.update.complete-toast.title": {
     "message": "Версия {version} успешно установлена!"
@@ -611,6 +611,24 @@
   "instance.settings.tabs.java": {
     "message": "Java и память"
   },
+  "instance.settings.tabs.java.custom-environment-variables": {
+    "message": "Пользовательские настройки запуска"
+  },
+  "instance.settings.tabs.java.custom-java-arguments": {
+    "message": "Пользовательские аргументы Java"
+  },
+  "instance.settings.tabs.java.custom-java-installation": {
+    "message": "Пользовательская установка Java"
+  },
+  "instance.settings.tabs.java.custom-memory-allocation": {
+    "message": "Пользовательский объём памяти"
+  },
+  "instance.settings.tabs.java.enter-environment-variables": {
+    "message": "Введите дополнительные параметры системы..."
+  },
+  "instance.settings.tabs.java.enter-java-arguments": {
+    "message": "Введите аргументы Java..."
+  },
   "instance.settings.tabs.java.environment-variables": {
     "message": "Переменные среды"
   },
@@ -626,6 +644,9 @@
   "instance.settings.tabs.java.java-memory": {
     "message": "Выделенная память"
   },
+  "instance.settings.tabs.java.java-path-placeholder": {
+    "message": "/path/to/java"
+  },
   "instance.settings.tabs.window": {
     "message": "Окно"
   },
@@ -741,7 +762,7 @@
     "message": "Загрузчик управляется сервером"
   },
   "unknown-pack-warning-modal.body": {
-    "message": "Файлы любого формата проверены на безопасность, если они загружены на Modrinth (в том числе файлы⠀.mrpack)."
+    "message": "Файл проверяется только в том случае, если он загружен на Modrinth, независимо от его формата (включая .mrpack)."
   },
   "unknown-pack-warning-modal.dont-show-again": {
     "message": "Больше не предупреждать"

apps/app-frontend/src/locales/sv-SE/index.json

@@ -5,12 +5,57 @@
   "app.action-bar.downloads": {
     "message": "Nedladdningar"
   },
+  "app.action-bar.hide-more-running-instances": {
+    "message": "Göm fler pågående instanser"
+  },
+  "app.action-bar.make-primary-instance": {
+    "message": "Gör till primärinstans"
+  },
+  "app.action-bar.no-instances-running": {
+    "message": "Ingen pågående instans"
+  },
   "app.action-bar.offline": {
     "message": "Offline"
   },
+  "app.action-bar.primary-instance": {
+    "message": "Primärinstans"
+  },
+  "app.action-bar.show-more-running-instances": {
+    "message": "Visa fler pågående instanser"
+  },
+  "app.action-bar.stop-instance": {
+    "message": "Avsluta instans"
+  },
+  "app.action-bar.view-active-downloads": {
+    "message": "Visa aktiva nedladdningar"
+  },
+  "app.action-bar.view-instance": {
+    "message": "Visa instans"
+  },
+  "app.action-bar.view-logs": {
+    "message": "Visa loggar"
+  },
+  "app.appearance-settings.advanced-rendering.description": {
+    "message": "Aktiverar avancerad rendering som till exempel oskärpa vilket kan leda till prestandaproblem utan hårdvaruaccelererad rendering."
+  },
+  "app.appearance-settings.advanced-rendering.title": {
+    "message": "Avancerad rendering"
+  },
+  "app.appearance-settings.color-theme.description": {
+    "message": "Välj färgtema för Modrinth-appen."
+  },
   "app.appearance-settings.color-theme.title": {
     "message": "Färgtema"
   },
+  "app.appearance-settings.default-landing-page.home": {
+    "message": "Hem"
+  },
+  "app.appearance-settings.default-landing-page.library": {
+    "message": "Bibliotek"
+  },
+  "app.appearance-settings.hide-nametag.title": {
+    "message": "Dölj namnskylt"
+  },
   "app.auth-servers.unreachable.body": {
     "message": "Minecrafts autentiseringsservrar kan vara nere just nu. Kontrollera din internetanslutning och försök igen senare."
   },

apps/app-frontend/src/locales/uk-UA/index.json

@@ -6,49 +6,49 @@
     "message": "Завантаження"
   },
   "app.action-bar.hide-more-running-instances": {
-    "message": "Приховати більше запущених екземплярів"
+    "message": "Приховати більше запущених профілів"
   },
   "app.action-bar.make-primary-instance": {
-    "message": "Зробити основним екземпляром"
+    "message": "Зробити основним профілем"
   },
   "app.action-bar.no-instances-running": {
-    "message": "Немає запущених екземплярів"
+    "message": "Немає запущених профілів"
   },
   "app.action-bar.offline": {
-    "message": "Офлайн"
+    "message": "Поза мережею"
   },
   "app.action-bar.primary-instance": {
-    "message": "Основний екземпляр"
+    "message": "Основний профіль"
   },
   "app.action-bar.show-more-running-instances": {
-    "message": "Показати більше запущених екземплярів"
+    "message": "Показати більше запущених профілів"
   },
   "app.action-bar.stop-instance": {
-    "message": "Зупинити екземпляр"
+    "message": "Зупинити профіль"
   },
   "app.action-bar.view-active-downloads": {
     "message": "Переглянути активні завантаження"
   },
   "app.action-bar.view-instance": {
-    "message": "Переглянути екземпляр"
+    "message": "Переглянути профіль"
   },
   "app.action-bar.view-logs": {
     "message": "Переглянути журнали"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Дозволяє розширений рендеринг, такий як ефекти розмиття, які можуть спричиняти проблеми з продуктивністю без апаратно-прискореного рендерингу."
+    "message": "Дозволяє розширене промальовування, як-от ефекти розмиття, які можуть спричиняти проблеми з продуктивністю без апаратно-прискореного промальовування."
   },
   "app.appearance-settings.advanced-rendering.title": {
-    "message": "Розширений рендеринг"
+    "message": "Розширене промальовування"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Виберіть бажану колірну тему для програми Modrinth App."
+    "message": "Виберіть бажану колірну тему для Modrinth App."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Колірна тема"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Змініть сторінку, на якій відкривається панель запуску."
+    "message": "Змініть сторінку, на якій відкривається запускач."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Головна"
@@ -57,46 +57,46 @@
     "message": "Бібліотека"
   },
   "app.appearance-settings.default-landing-page.title": {
-    "message": "Цільова сторінка за замовчуванням"
+    "message": "Усталена цільова сторінка"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Вимикає іменний бейдж над вашим гравцем на сторінці скінів."
+    "message": "Вимикає ім'я над вашим гравцем на сторінці скінів."
   },
   "app.appearance-settings.hide-nametag.title": {
-    "message": "Приховати бейдж з іменем"
+    "message": "Приховати ім'я"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Включає нещодавні світи в розділі «Повернення» на головній сторінці."
+    "message": "Уключає нещодавні світи в розділі «Повернутися» на головній сторінці."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Стрибни назад у світи"
+    "message": "Повернутися у світи"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Згорнути лаунчер під час запуску процесу Minecraft."
+    "message": "Згортає запускач під час запуску процесу Minecraft."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Згорнути панель запуску"
+    "message": "Мінімізувати запускач"
   },
   "app.appearance-settings.native-decorations.description": {
     "message": "Використовувати рамку системного вікна (потрібно перезапустити програму)."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Рідні прикраси"
+    "message": "Системне оформлення"
   },
   "app.appearance-settings.select-option": {
     "message": "Виберіть опцію"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Вмикає можливість перемикання бічної панелі."
+    "message": "Умикає можливість перемикання бокової панелі."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Перемикання бічної панелі"
+    "message": "Перемикання бокової панелі"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Якщо ви спробуєте встановити файл пакета Modrinth (.mrpack), який не розміщено на Modrinth, ми переконаємося, що ви розумієте ризики, перш ніж встановлювати його."
+    "message": "Якщо ви спробуєте встановити файл пакета Modrinth (.mrpack), який не розміщено на Modrinth, ми переконаємося, що ви розумієте ризики, перш ніж установлювати його."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
-    "message": "Попереджати мене перед встановленням невідомих модпаків"
+    "message": "Попереджати мене перед установленням невідомих збірок"
   },
   "app.auth-servers.unreachable.body": {
     "message": "Сервери автентифікації Minecraft можуть зараз не працювати. Перевірте з’єднання з інтернетом та спробуйте пізніше."
@@ -104,6 +104,12 @@
   "app.auth-servers.unreachable.header": {
     "message": "Не вдається зв’язатися зі серверами автентифікації"
   },
+  "app.browse.add-servers-to-instance": {
+    "message": "Додавання сервера до профілю"
+  },
+  "app.browse.add-to-an-instance": {
+    "message": "Додати до профілю"
+  },
   "app.browse.add-to-instance": {
     "message": "Додати до профілю"
   },
@@ -116,6 +122,9 @@
   "app.browse.already-added": {
     "message": "Уже додано"
   },
+  "app.browse.back-to-instance": {
+    "message": "Назад до профілю"
+  },
   "app.browse.discover-content": {
     "message": "Дослідити вміст"
   },
@@ -123,22 +132,25 @@
     "message": "Дослідити сервера"
   },
   "app.browse.hide-added-servers": {
-    "message": "Скрити наявні сервери"
+    "message": "Сховати наявні сервери"
   },
   "app.browse.project-type.modpacks": {
-    "message": "Модпаки"
+    "message": "Збірки"
+  },
+  "app.browse.server-instance-content-warning": {
+    "message": "Додавання вмісту може порушити сумісність при приєднанні до сервера. Усі додані матеріали також будуть утрачені під час оновлення вмісту профілю сервера."
   },
   "app.browse.server.installing": {
-    "message": "Встановлення"
+    "message": "Установлення"
   },
   "app.creation-modal.installing-modpack.description": {
     "message": "{fileName}"
   },
   "app.creation-modal.installing-modpack.title": {
-    "message": "Встановлення модпаку..."
+    "message": "Установлення збірки…"
   },
   "app.export-modal.description-placeholder": {
-    "message": "Уведіть опис збірки..."
+    "message": "Уведіть опис збірки…"
   },
   "app.export-modal.export-button": {
     "message": "Експортувати"
@@ -146,12 +158,18 @@
   "app.export-modal.header": {
     "message": "Експортувати збірку"
   },
+  "app.export-modal.include-file-accessibility-label": {
+    "message": "Уключити «{file}»?"
+  },
   "app.export-modal.modpack-name-label": {
     "message": "Назва збірки"
   },
   "app.export-modal.modpack-name-placeholder": {
     "message": "Назва збірки"
   },
+  "app.export-modal.select-files-label": {
+    "message": "Змініть файли, які додані до експорту"
+  },
   "app.export-modal.version-number-label": {
     "message": "Номер версії"
   },
@@ -159,7 +177,7 @@
     "message": "1.0.0"
   },
   "app.instance.confirm-delete.admonition-body": {
-    "message": "Усі дані вашого профілю будуть видалені назавжди, включно з вашими світами, конфігураціями та усім встановленим контентом."
+    "message": "Усі дані вашого профілю будуть видалені назавжди, включно з вашими світами, налаштуваннями та всім установленим умістом."
   },
   "app.instance.confirm-delete.admonition-header": {
     "message": "Ця дія є незворотною"
@@ -204,7 +222,7 @@
     "message": "Додати сервер"
   },
   "app.instance.worlds.browse-servers": {
-    "message": "Переглянути сервера"
+    "message": "Переглянути сервери"
   },
   "app.instance.worlds.delete-world-description": {
     "message": "«{name}» буде **назавжди видалено** й у вас не буде можливости відновлення."
@@ -213,7 +231,7 @@
     "message": "Ви впевнені, що хочете назавжди видалити цей світ?"
   },
   "app.instance.worlds.filter-modded": {
-    "message": "Модифікований"
+    "message": "Модифіковано"
   },
   "app.instance.worlds.filter-offline": {
     "message": "Поза мережею"
@@ -222,7 +240,7 @@
     "message": "У мережі"
   },
   "app.instance.worlds.filter-vanilla": {
-    "message": "Ванільний"
+    "message": "Стандартний"
   },
   "app.instance.worlds.no-worlds-description": {
     "message": "Додати сервер або переглянути, щоб почати"
@@ -240,7 +258,7 @@
     "message": "Ви впевнені, що хочете видалити «{name}»?"
   },
   "app.instance.worlds.search-worlds-placeholder": {
-    "message": "Пошук {count} світів..."
+    "message": "Пошук {count} світів…"
   },
   "app.instance.worlds.this-server": {
     "message": "цей сервер"
@@ -281,6 +299,15 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "«{name}» потребує оновлення, щоб грати. Будь ласка, оновіть гру до останньої версії, щоб запустити її."
   },
+  "app.project.install-button.already-installed": {
+    "message": "Проєкт уже встановлено"
+  },
+  "app.project.install-context.back-to-browse": {
+    "message": "Повернутися до дослідження"
+  },
+  "app.project.install-context.install-content-to-instance": {
+    "message": "Установити вміст до профілю"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Увімкнено режим розробника."
   },
@@ -420,7 +447,7 @@
     "message": "Немає друзів, які збігаються з «{query}»"
   },
   "friends.search-friends-placeholder": {
-    "message": "Пошук друзів..."
+    "message": "Пошук друзів…"
   },
   "friends.section.heading": {
     "message": "{title} — {count}"
@@ -468,7 +495,7 @@
     "message": "Додавання файлів ({completed}/{total})"
   },
   "instance.files.save-as": {
-    "message": "Зберегти як..."
+    "message": "Зберегти як…"
   },
   "instance.server-modal.address": {
     "message": "Адреса"
@@ -584,6 +611,24 @@
   "instance.settings.tabs.java": {
     "message": "Java та пам’ять"
   },
+  "instance.settings.tabs.java.custom-environment-variables": {
+    "message": "Власні змінні середовища"
+  },
+  "instance.settings.tabs.java.custom-java-arguments": {
+    "message": "Власні аргументи Java"
+  },
+  "instance.settings.tabs.java.custom-java-installation": {
+    "message": "Власна інсталяція Java"
+  },
+  "instance.settings.tabs.java.custom-memory-allocation": {
+    "message": "Власний розподіл пам'яті"
+  },
+  "instance.settings.tabs.java.enter-environment-variables": {
+    "message": "Уведіть змінні середовища…"
+  },
+  "instance.settings.tabs.java.enter-java-arguments": {
+    "message": "Уведіть аргументи Java…"
+  },
   "instance.settings.tabs.java.environment-variables": {
     "message": "Змінні середовища"
   },
@@ -599,6 +644,9 @@
   "instance.settings.tabs.java.java-memory": {
     "message": "Виділена пам’ять"
   },
+  "instance.settings.tabs.java.java-path-placeholder": {
+    "message": "/шлях/до/java"
+  },
   "instance.settings.tabs.window": {
     "message": "Вікно"
   },
@@ -674,12 +722,21 @@
   "minecraft-account.add-account": {
     "message": "Додати обліковий запис"
   },
+  "minecraft-account.label": {
+    "message": "Майнкрафт аккаунт"
+  },
+  "minecraft-account.not-signed-in": {
+    "message": "Не ввійдено в систему"
+  },
   "minecraft-account.remove-account": {
     "message": "Видалити обліковий запис"
   },
   "minecraft-account.select-account": {
     "message": "Обрати обліковий запис"
   },
+  "minecraft-account.sign-in": {
+    "message": "Увійти в Майнкрафт"
+  },
   "search.filter.locked.instance": {
     "message": "Надано профілем"
   },
@@ -717,7 +774,7 @@
     "message": "Усе одно інсталювати"
   },
   "unknown-pack-warning-modal.malware-statement": {
-    "message": "Шкідливе програмне забезпечення часто поширюють через файли модпаків, які публікуються на таких платформах, як Discord."
+    "message": "Шкідливе програмне забезпечення часто поширюють через файли збірок, які публікуються на таких платформах, як Discord."
   },
   "unknown-pack-warning-modal.warning.body": {
     "message": "Ми не змогли знайти цей файл на Modrinth. Ми рекомендуємо встановлювати файли лише з тих джерел яким ви довіряєте."

apps/app-frontend/src/locales/vi-VN/index.json

@@ -1,10 +1,115 @@
 {
+  "app.action-bar.downloading-java": {
+    "message": "Đang tải xuống Java {version}"
+  },
+  "app.action-bar.downloads": {
+    "message": "Tải xuống"
+  },
+  "app.action-bar.hide-more-running-instances": {
+    "message": "Đóng các phiên bản đang chạy"
+  },
+  "app.action-bar.make-primary-instance": {
+    "message": "Đặt làm bản instance chính"
+  },
+  "app.action-bar.no-instances-running": {
+    "message": "Không có phiên bản nào đang chạy"
+  },
+  "app.action-bar.offline": {
+    "message": "Ngoại tuyến"
+  },
+  "app.action-bar.primary-instance": {
+    "message": "Bản instance chính"
+  },
+  "app.action-bar.show-more-running-instances": {
+    "message": "Hiện thêm các phiên bản đang chạy"
+  },
+  "app.action-bar.stop-instance": {
+    "message": "Dừng instance"
+  },
+  "app.action-bar.view-active-downloads": {
+    "message": "Xem các lượt tải xuống"
+  },
+  "app.action-bar.view-instance": {
+    "message": "Xem phiên bản"
+  },
+  "app.action-bar.view-logs": {
+    "message": "Xem logs"
+  },
+  "app.appearance-settings.advanced-rendering.description": {
+    "message": "Kích hoạt các tính năng dựng hình nâng cao như hiệu ứng làm mờ, có thể gây giảm hiệu năng nếu không có chế độ tăng tốc phần cứng."
+  },
+  "app.appearance-settings.advanced-rendering.title": {
+    "message": "Dựng hình nâng cao"
+  },
+  "app.appearance-settings.color-theme.description": {
+    "message": "Chọn màu nền ưu thích của bạn cho Modrinth App."
+  },
+  "app.appearance-settings.color-theme.title": {
+    "message": "Màu chủ đề"
+  },
+  "app.appearance-settings.default-landing-page.description": {
+    "message": "Thay đổi trang hiển thị khi khởi chạy launcher."
+  },
+  "app.appearance-settings.default-landing-page.home": {
+    "message": "Trang chủ"
+  },
+  "app.appearance-settings.default-landing-page.library": {
+    "message": "Thư viện"
+  },
+  "app.appearance-settings.default-landing-page.title": {
+    "message": "Trang mặc định"
+  },
+  "app.appearance-settings.hide-nametag.description": {
+    "message": "Tắt hiển thị thẻ tên phía trên người chơi ở trang skin."
+  },
+  "app.appearance-settings.hide-nametag.title": {
+    "message": "Ẩn thẻ tên"
+  },
+  "app.appearance-settings.jump-back-into-worlds.description": {
+    "message": "Hiển thị các thế giới gần đây trong mục \"Tiếp tục chơi\" ở Trang chủ."
+  },
+  "app.appearance-settings.jump-back-into-worlds.title": {
+    "message": "Tiếp tục chơi"
+  },
+  "app.appearance-settings.minimize-launcher.description": {
+    "message": "Thu nhỏ launcher khi game Minecraft bắt đầu chạy."
+  },
+  "app.appearance-settings.minimize-launcher.title": {
+    "message": "Thu nhỏ launcher"
+  },
+  "app.appearance-settings.native-decorations.description": {
+    "message": "Sử dụng khung cửa sổ hệ thống (yêu cầu khởi động lại ứng dụng)."
+  },
+  "app.appearance-settings.native-decorations.title": {
+    "message": "Giao diện cửa sổ hệ thống"
+  },
+  "app.appearance-settings.select-option": {
+    "message": "Chọn một tuỳ chọn"
+  },
+  "app.appearance-settings.toggle-sidebar.description": {
+    "message": "Bật tính năng ẩn hiển thị thanh menu bên."
+  },
+  "app.appearance-settings.toggle-sidebar.title": {
+    "message": "Ẩn/hiện thanh bên"
+  },
+  "app.appearance-settings.unknown-pack-warning.description": {
+    "message": "Nếu bạn cố gắng cài đặt tệp Modrinth Pack (.mrpack) không được lưu trữ trên máy chủ Modrinth, chúng tôi sẽ đảm bảo bạn hiểu rõ các rủi ro trước khi cài đặt."
+  },
+  "app.appearance-settings.unknown-pack-warning.title": {
+    "message": "Cảnh báo tôi trước khi cài đặt các modpacks không rõ nguồn gốc"
+  },
   "app.auth-servers.unreachable.body": {
     "message": "Máy chủ xác thực của Minecraft có thể đang bị sập. Hãy kiểm tra kết nối Internet của bạn và thử lại sau."
   },
   "app.auth-servers.unreachable.header": {
     "message": "Không thể kết nối đến máy chủ xác thực"
   },
+  "app.browse.add-servers-to-instance": {
+    "message": "Thêm máy chủ vào phiên bản"
+  },
+  "app.browse.add-to-an-instance": {
+    "message": "Thêm vào phiên bản"
+  },
   "app.browse.add-to-instance": {
     "message": "Thêm vào hồ sơ"
   },
@@ -17,12 +122,33 @@
   "app.browse.already-added": {
     "message": "Đã được thêm"
   },
+  "app.browse.back-to-instance": {
+    "message": "Quay lại phiên bản"
+  },
   "app.browse.discover-content": {
     "message": "Khám phá nội dung"
   },
   "app.browse.discover-servers": {
     "message": "Khám phá máy chủ"
   },
+  "app.browse.hide-added-servers": {
+    "message": "Ẩn các server đã thêm"
+  },
+  "app.browse.project-type.modpacks": {
+    "message": "Modpack"
+  },
+  "app.browse.server-instance-content-warning": {
+    "message": "Thêm nội dung có thể gây lỗi tương thích khi tham gia máy chủ. Bất kỳ nội dung nào được thêm vào cũng sẽ bị mất khi bạn cập nhật nội dung của phiên bản máy chủ."
+  },
+  "app.browse.server.installing": {
+    "message": "Đang cài đặt"
+  },
+  "app.creation-modal.installing-modpack.description": {
+    "message": "{fileName}"
+  },
+  "app.creation-modal.installing-modpack.title": {
+    "message": "Đang cài đặt modpack..."
+  },
   "app.export-modal.description-placeholder": {
     "message": "Thêm miêu tả cho gói modpack..."
   },
@@ -32,12 +158,18 @@
   "app.export-modal.header": {
     "message": "Xuất modpack"
   },
+  "app.export-modal.include-file-accessibility-label": {
+    "message": "Bao gồm \"{file}\"?"
+  },
   "app.export-modal.modpack-name-label": {
     "message": "Tên modpack"
   },
   "app.export-modal.modpack-name-placeholder": {
     "message": "Tên modpack"
   },
+  "app.export-modal.select-files-label": {
+    "message": "Cấu hình các tệp nào được bao gồm trong quá trình xuất phiên bản này"
+  },
   "app.export-modal.version-number-label": {
     "message": "Phiên bản"
   },
@@ -167,6 +299,15 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "Bạn cần cập nhật {name} để có thể chơi. Vui lòng cập nhật lên bản mới nhất để khởi chạy trò chơi."
   },
+  "app.project.install-button.already-installed": {
+    "message": "Dự án này đã được cài đặt"
+  },
+  "app.project.install-context.back-to-browse": {
+    "message": "Quay lại trang Khám Phá"
+  },
+  "app.project.install-context.install-content-to-instance": {
+    "message": "Cài đặt nội dung vào phiên bản"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Chế độ nhà phát triển đã được bật."
   },
@@ -470,6 +611,24 @@
   "instance.settings.tabs.java": {
     "message": "Java và bộ nhớ"
   },
+  "instance.settings.tabs.java.custom-environment-variables": {
+    "message": "Tùy chọn biến môi trường"
+  },
+  "instance.settings.tabs.java.custom-java-arguments": {
+    "message": "Tùy chỉnh tham số Java"
+  },
+  "instance.settings.tabs.java.custom-java-installation": {
+    "message": "Tùy chỉnh phiên bản cài đặt Java"
+  },
+  "instance.settings.tabs.java.custom-memory-allocation": {
+    "message": "Tùy chỉnh phân bổ bộ nhớ"
+  },
+  "instance.settings.tabs.java.enter-environment-variables": {
+    "message": "Nhập biến môi trường..."
+  },
+  "instance.settings.tabs.java.enter-java-arguments": {
+    "message": "Nhập tham số Java..."
+  },
   "instance.settings.tabs.java.environment-variables": {
     "message": "Biến môi trường"
   },
@@ -485,6 +644,9 @@
   "instance.settings.tabs.java.java-memory": {
     "message": "Bộ nhớ phân bổ"
   },
+  "instance.settings.tabs.java.java-path-placeholder": {
+    "message": "/đường_dẫn/tới/java"
+  },
   "instance.settings.tabs.window": {
     "message": "Cửa sổ"
   },
@@ -557,6 +719,24 @@
   "instance.worlds.world_in_use": {
     "message": "Thế giới đang mở"
   },
+  "minecraft-account.add-account": {
+    "message": "Thêm tài khoản"
+  },
+  "minecraft-account.label": {
+    "message": "Tài khoản Minecraft"
+  },
+  "minecraft-account.not-signed-in": {
+    "message": "Chưa đăng nhập"
+  },
+  "minecraft-account.remove-account": {
+    "message": "Xoá tài khoản"
+  },
+  "minecraft-account.select-account": {
+    "message": "Chọn tài khoản"
+  },
+  "minecraft-account.sign-in": {
+    "message": "Đăng nhập vào Minecraft"
+  },
   "search.filter.locked.instance": {
     "message": "Được cung cấp bởi phiên bản"
   },
@@ -580,5 +760,26 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Loader được cung cấp bởi máy chủ"
+  },
+  "unknown-pack-warning-modal.body": {
+    "message": "Tệp chỉ được xem xét nếu nó được tải lên Modrinth, bất kể định dạng tệp của nó là gì (bao gồm cả .mrpack)."
+  },
+  "unknown-pack-warning-modal.dont-show-again": {
+    "message": "Đừng hiển thị cảnh báo này nữa"
+  },
+  "unknown-pack-warning-modal.header": {
+    "message": "Xác nhận cài đặt"
+  },
+  "unknown-pack-warning-modal.install-anyway": {
+    "message": "Tiếp tục cài đặt"
+  },
+  "unknown-pack-warning-modal.malware-statement": {
+    "message": "Phần mềm độc hại thường được phát tán thông qua các tệp modpack bằng cách chia sẻ chúng trên các nền tảng như Discord."
+  },
+  "unknown-pack-warning-modal.warning.body": {
+    "message": "Chúng tôi không tìm thấy tập tin này trên Modrinth. Chúng tôi đặc biệt khuyên bạn chỉ nên cài đặt các tập tin từ các nguồn đáng tin cậy."
+  },
+  "unknown-pack-warning-modal.warning.title": {
+    "message": "Cảnh báo tệp không xác định"
   }
 }

apps/app-frontend/src/locales/zh-CN/index.json

@@ -63,7 +63,7 @@
     "message": "在皮肤页面中禁用你玩家头顶上的名牌。"
   },
   "app.appearance-settings.hide-nametag.title": {
-    "message": "隐藏名牌"
+    "message": "隐藏名称标签"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
     "message": "在主页的“快速回到”部分包含最近的世界。"
@@ -303,7 +303,7 @@
     "message": "此项目已安装"
   },
   "app.project.install-context.back-to-browse": {
-    "message": "返回浏览器"
+    "message": "返回发现页"
   },
   "app.project.install-context.install-content-to-instance": {
     "message": "将内容安装到实例中"
@@ -567,7 +567,7 @@
     "message": "启动 Hooks"
   },
   "instance.settings.tabs.hooks.custom-hooks": {
-    "message": "自定义启动Hooks"
+    "message": "自定义启动 Hooks"
   },
   "instance.settings.tabs.hooks.description": {
     "message": "Hooks允许高级用户在启动游戏前后运行特定的系统命令。"

apps/app-frontend/src/locales/zh-TW/index.json

@@ -147,10 +147,10 @@
     "message": "{fileName}"
   },
   "app.creation-modal.installing-modpack.title": {
-    "message": "正在安裝模組包..."
+    "message": "正在安裝模組包……"
   },
   "app.export-modal.description-placeholder": {
-    "message": "輸入模組包描述..."
+    "message": "輸入模組包描述……"
   },
   "app.export-modal.export-button": {
     "message": "匯出"
@@ -252,13 +252,13 @@
     "message": "「{name}」將從你的清單中移除（包含遊戲內），且無法還原。"
   },
   "app.instance.worlds.remove-server-description-with-address": {
-    "message": "「{name}」({address}) 將從你的清單中移除（包含遊戲內），且無法還原。"
+    "message": "「{name}」({address}) 將從你的清單中移除(包含遊戲內），且無法還原。"
   },
   "app.instance.worlds.remove-server-title": {
     "message": "確定要移除「{name}」嗎？"
   },
   "app.instance.worlds.search-worlds-placeholder": {
-    "message": "搜尋 {count} 個世界..."
+    "message": "搜尋 {count} 個世界……"
   },
   "app.instance.worlds.this-server": {
     "message": "這個伺服器"
@@ -303,7 +303,7 @@
     "message": "這個專案已安裝"
   },
   "app.project.install-context.back-to-browse": {
-    "message": "回到瀏覽頁面"
+    "message": "返回瀏覽"
   },
   "app.project.install-context.install-content-to-instance": {
     "message": "將內容安裝至實例"
@@ -611,6 +611,24 @@
   "instance.settings.tabs.java": {
     "message": "Java 和記憶體"
   },
+  "instance.settings.tabs.java.custom-environment-variables": {
+    "message": "自訂環境變數"
+  },
+  "instance.settings.tabs.java.custom-java-arguments": {
+    "message": "自訂 Java 參數"
+  },
+  "instance.settings.tabs.java.custom-java-installation": {
+    "message": "自訂 Java 安裝"
+  },
+  "instance.settings.tabs.java.custom-memory-allocation": {
+    "message": "自訂記憶體分配"
+  },
+  "instance.settings.tabs.java.enter-environment-variables": {
+    "message": "輸入環境變數……"
+  },
+  "instance.settings.tabs.java.enter-java-arguments": {
+    "message": "輸入 Java 參數……"
+  },
   "instance.settings.tabs.java.environment-variables": {
     "message": "環境變數"
   },
@@ -626,6 +644,9 @@
   "instance.settings.tabs.java.java-memory": {
     "message": "記憶體配置"
   },
+  "instance.settings.tabs.java.java-path-placeholder": {
+    "message": "/path/to/java"
+  },
   "instance.settings.tabs.window": {
     "message": "視窗"
   },

apps/app-frontend/src/pages/instance/Index.vue

@@ -218,7 +218,11 @@
 				:key="instance.path"
 			>
 				<template v-if="Component">
-					<Suspense :key="instance.path">
+					<Suspense
+						:key="instance.path"
+						@pending="subpagePending = true"
+						@resolve="subpagePending = false"
+					>
 						<component
 							:is="Component"
 							:instance="instance"
@@ -228,6 +232,7 @@
 							:installed="instance.install_stage !== 'installed'"
 							:is-server-instance="isServerInstance"
 							:open-settings="() => settingsModal?.show(1)"
+							v-bind="contentSubpageProps"
 							@play="updatePlayState"
 							@stop="() => stopInstance('InstanceSubpage')"
 						></component>
@@ -295,6 +300,7 @@ import {
 	ServerPing,
 	ServerRecentPlays,
 	ServerRegion,
+	useLoadingBarToken,
 } from '@modrinth/ui'
 import { useQueryClient } from '@tanstack/vue-query'
 import { convertFileSrc } from '@tauri-apps/api/core'
@@ -312,6 +318,7 @@ import { useInstanceConsole } from '@/composables/useInstanceConsole'
 import { trackEvent } from '@/helpers/analytics'
 import { get_project_v3 } from '@/helpers/cache.js'
 import { process_listener, profile_listener } from '@/helpers/events'
+import { type InstanceContentData, loadInstanceContentData } from '@/helpers/instance-content'
 import { get_by_profile_path } from '@/helpers/process'
 import { finish_install, get, get_full_path, kill, run } from '@/helpers/profile'
 import type { GameInstance } from '@/helpers/types'
@@ -331,6 +338,7 @@ const route = useRoute()
 
 const router = useRouter()
 const breadcrumbs = useBreadcrumbs()
+const contentSubpageRouteNames = new Set(['Mods', 'ModsFilter'])
 
 const offline = ref(!navigator.onLine)
 window.addEventListener('offline', () => {
@@ -341,12 +349,16 @@ window.addEventListener('online', () => {
 })
 
 const instance = ref<GameInstance>()
+const preloadedContent = ref<InstanceContentData | null>(null)
 const playing = ref(false)
 const loading = ref(false)
+const subpagePending = ref(false)
 const stopping = ref(false)
 const exportModal = ref<InstanceType<typeof ExportModal>>()
 const updateToPlayModal = ref<InstanceType<typeof UpdateToPlayModal>>()
 
+useLoadingBarToken(subpagePending)
+
 const isServerInstance = ref(false)
 const linkedProjectV3 = ref<Labrinth.Projects.v3.Project>()
 const selected = ref<unknown[]>([])
@@ -361,36 +373,55 @@ const playersOnline = ref<number | undefined>(undefined)
 const ping = ref<number | undefined>(undefined)
 const loadingServerPing = ref(false)
 
+function isContentSubpageRoute(routeName = route.name) {
+	return typeof routeName === 'string' && contentSubpageRouteNames.has(routeName)
+}
+
 async function fetchInstance() {
 	isServerInstance.value = false
 	linkedProjectV3.value = undefined
+	preloadedContent.value = null
 	ping.value = undefined
 	playersOnline.value = undefined
 	loadingServerPing.value = false
 
-	instance.value = await get(route.params.id as string).catch(handleError)
+	const nextInstance = await get(route.params.id as string).catch(handleError)
+	let nextLinkedProjectV3: Labrinth.Projects.v3.Project | undefined
+	let nextIsServerInstance = false
 
-	if (!offline.value && instance.value?.linked_data && instance.value.linked_data.project_id) {
+	const contentPreloadPromise =
+		nextInstance && isContentSubpageRoute()
+			? loadInstanceContentData(nextInstance.path, undefined, handleError)
+			: Promise.resolve(null)
+
+	if (!offline.value && nextInstance?.linked_data && nextInstance.linked_data.project_id) {
 		try {
-			linkedProjectV3.value = await get_project_v3(
-				instance.value.linked_data.project_id,
+			nextLinkedProjectV3 = await get_project_v3(
+				nextInstance.linked_data.project_id,
 				'must_revalidate',
 			)
 
-			if (linkedProjectV3.value?.minecraft_server != null) {
-				isServerInstance.value = true
+			if (nextLinkedProjectV3?.minecraft_server != null) {
+				nextIsServerInstance = true
 			}
 		} catch (error) {
 			handleError(error as Error)
 		}
 	}
 
+	const nextPreloadedContent = await contentPreloadPromise
+
+	instance.value = nextInstance ?? undefined
+	linkedProjectV3.value = nextLinkedProjectV3
+	isServerInstance.value = nextIsServerInstance
+	preloadedContent.value = nextPreloadedContent
+
 	fetchDeferredData()
 
-	if (instance.value) {
+	if (nextInstance) {
 		queryClient.prefetchQuery({
-			queryKey: ['worlds', instance.value.path],
-			queryFn: () => refreshWorlds(instance.value!.path),
+			queryKey: ['worlds', nextInstance.path],
+			queryFn: () => refreshWorlds(nextInstance.path),
 			staleTime: 30_000,
 		})
 	}
@@ -448,6 +479,9 @@ const renderMode = computed<'scroll' | 'fixed'>(() =>
 	route.meta.renderMode === 'fixed' ? 'fixed' : 'scroll',
 )
 const isFixedRender = computed(() => renderMode.value === 'fixed')
+const contentSubpageProps = computed(() =>
+	isContentSubpageRoute() ? { preloadedContent: preloadedContent.value } : {},
+)
 
 const tabs = computed(() => [
 	{

apps/app-frontend/src/pages/instance/Logs.vue

@@ -77,7 +77,7 @@ function buildLogList(rawLogs) {
 					log.filename !== 'latest_stdout.log' &&
 					log.filename !== 'latest_stdout' &&
 					log.filename !== 'launcher_log.txt' &&
-					log.stdout !== '' &&
+					(log.output == null || log.output !== '') &&
 					(log.filename.includes('.log') || log.filename.endsWith('.txt')),
 			)
 			.map((log) => ({

apps/app-frontend/src/pages/instance/Mods.vue

@@ -13,6 +13,7 @@
 					:modpack-name="linkedModpackProject?.title"
 					:modpack-icon-url="linkedModpackProject?.icon_url ?? undefined"
 					:enable-toggle="!props.isServerInstance"
+					:busy="isBulkOperating"
 					:get-overflow-options="getOverflowOptions"
 					:switch-version="handleSwitchVersion"
 					@update:enabled="handleModpackContentToggle"
@@ -87,12 +88,12 @@ import {
 	ReadyTransition,
 	useDebugLogger,
 	useVIntl,
+	versionChangesGameVersion,
 } from '@modrinth/ui'
 import { getCurrentWebview } from '@tauri-apps/api/webview'
 import { open } from '@tauri-apps/plugin-dialog'
 import { openUrl } from '@tauri-apps/plugin-opener'
-import { useDebounceFn } from '@vueuse/core'
-import { computed, nextTick, onUnmounted, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
 import ExportModal from '@/components/ui/ExportModal.vue'
@@ -100,22 +101,20 @@ import ShareModalWrapper from '@/components/ui/modal/ShareModalWrapper.vue'
 import { trackEvent } from '@/helpers/analytics'
 import { get_project_versions, get_version } from '@/helpers/cache.js'
 import { profile_listener } from '@/helpers/events.js'
+import { type InstanceContentData, loadInstanceContentData } from '@/helpers/instance-content'
 import {
 	add_project_from_path,
 	add_project_from_version,
 	duplicate,
 	edit,
 	get,
-	get_content_items,
 	get_linked_modpack_content,
-	get_linked_modpack_info,
 	list,
 	remove_project,
 	toggle_disable_project,
 	update_managed_modrinth_version,
 	update_project,
 } from '@/helpers/profile'
-import { get_categories } from '@/helpers/tags.js'
 import type { CacheBehaviour, GameInstance } from '@/helpers/types'
 import { highlightModInProfile } from '@/helpers/utils.js'
 import { injectContentInstall } from '@/providers/content-install'
@@ -160,6 +159,7 @@ const props = defineProps<{
 	instance: GameInstance
 	isServerInstance?: boolean
 	openSettings?: () => void
+	preloadedContent?: InstanceContentData | null
 }>()
 
 const loading = ref(true)
@@ -212,6 +212,7 @@ const contentUpdaterModal = ref<InstanceType<typeof ContentUpdaterModal> | null>
 const modpackContentModal = ref<InstanceType<typeof ModpackContentModal> | null>()
 const modpackUpdateConfirmModal = ref<InstanceType<typeof ConfirmModpackUpdateModal> | null>()
 
+// TODO: Extract content operation and updater modal state into composables; this page currently owns file mutations, dependency installs, busy flags, and version selection flow.
 const updatingProject = ref<ContentItem | null>(null)
 const updatingProjectVersions = ref<Labrinth.Versions.v2.Version[]>([])
 const loadingVersions = ref(false)
@@ -219,6 +220,82 @@ const loadingChangelog = ref(false)
 const updatingModpack = ref(false)
 const pendingModpackUpdateVersion = ref<Labrinth.Versions.v2.Version | null>(null)
 const isModpackUpdateDowngrade = ref(false)
+const activeContentOperationKeys = ref(new Set<string>())
+
+let activeContentOperationCount = 0
+let updateRequestId = 0
+const activeUpdateRequestId = ref(0)
+
+function fileNameFromPath(path: string) {
+	return path.split('/').pop() ?? path
+}
+
+function getContentItemId(item: ContentItem | null | undefined) {
+	return item?.file_path ?? item?.file_name ?? item?.id ?? ''
+}
+
+function getContentOperationKeys(item: ContentItem) {
+	return [getContentItemId(item), item.file_path, item.file_name].filter(
+		(key): key is string => !!key,
+	)
+}
+
+function hasContentOperation(item: ContentItem) {
+	const keys = getContentOperationKeys(item)
+	return keys.some((key) => activeContentOperationKeys.value.has(key))
+}
+
+function setContentItemBusy(item: ContentItem, busy: boolean, originalFileName = item.file_name) {
+	item.installing = busy
+	modpackContentModal.value?.updateItem(originalFileName, {
+		installing: busy,
+		disabled: busy,
+	})
+	if (item.file_name !== originalFileName) {
+		modpackContentModal.value?.updateItem(item.file_name, {
+			installing: busy,
+			disabled: busy,
+		})
+	}
+}
+
+function beginContentOperation(item: ContentItem) {
+	if (hasContentOperation(item)) return null
+
+	const keys = getContentOperationKeys(item)
+	activeContentOperationKeys.value = new Set([...activeContentOperationKeys.value, ...keys])
+	activeContentOperationCount++
+	isBulkOperating.value = true
+	setContentItemBusy(item, true)
+
+	return { keys, originalFileName: item.file_name }
+}
+
+function finishContentOperation(
+	item: ContentItem,
+	operation: { keys: string[]; originalFileName: string },
+) {
+	const nextKeys = new Set(activeContentOperationKeys.value)
+	for (const key of operation.keys) {
+		nextKeys.delete(key)
+	}
+	activeContentOperationKeys.value = nextKeys
+	activeContentOperationCount = Math.max(0, activeContentOperationCount - 1)
+	setContentItemBusy(item, false, operation.originalFileName)
+	if (activeContentOperationCount === 0) {
+		isBulkOperating.value = false
+	}
+}
+
+function beginUpdateRequest() {
+	updateRequestId++
+	activeUpdateRequestId.value = updateRequestId
+	return updateRequestId
+}
+
+function isActiveUpdateRequest(requestId: number) {
+	return activeUpdateRequestId.value === requestId
+}
 
 async function handleBrowseContent() {
 	if (!props.instance) return
@@ -265,9 +342,21 @@ async function handleUploadFiles() {
 }
 
 async function toggleDisableMod(mod: ContentItem) {
+	if (!mod.file_path) return
+	const operation = beginContentOperation(mod)
+	if (!operation) return
+
 	try {
-		mod.file_path = await toggle_disable_project(props.instance.path, mod.file_path!)
+		const newPath = await toggle_disable_project(props.instance.path, mod.file_path)
+		const newFileName = fileNameFromPath(newPath)
+		mod.file_path = newPath
+		mod.file_name = newFileName
 		mod.enabled = !mod.enabled
+		modpackContentModal.value?.updateItem(operation.originalFileName, {
+			file_path: newPath,
+			file_name: newFileName,
+			enabled: mod.enabled,
+		})
 
 		trackEvent('InstanceProjectDisable', {
 			loader: props.instance.loader,
@@ -279,33 +368,48 @@ async function toggleDisableMod(mod: ContentItem) {
 		})
 	} catch (err) {
 		handleError(err as Error)
+	} finally {
+		finishContentOperation(mod, operation)
 	}
 }
 
-const toggleDisableDebounced = useDebounceFn(toggleDisableMod, 20)
+const toggleDisableDebounced = toggleDisableMod
 
 async function removeMod(mod: ContentItem) {
-	await remove_project(props.instance.path, mod.file_path!).catch(handleError)
-	projects.value = projects.value.filter((x) => mod.file_path !== x.file_path)
+	if (!mod.file_path) return
+	const operation = beginContentOperation(mod)
+	if (!operation) return
 
-	trackEvent('InstanceProjectRemove', {
-		loader: props.instance.loader,
-		game_version: props.instance.game_version,
-		id: mod.project?.id,
-		name: mod.project?.title ?? mod.file_name,
-		project_type: mod.project_type,
-	})
+	try {
+		const removedPath = mod.file_path
+		await remove_project(props.instance.path, removedPath)
+		projects.value = projects.value.filter((x) => removedPath !== x.file_path)
+
+		trackEvent('InstanceProjectRemove', {
+			loader: props.instance.loader,
+			game_version: props.instance.game_version,
+			id: mod.project?.id,
+			name: mod.project?.title ?? mod.file_name,
+			project_type: mod.project_type,
+		})
+	} catch (err) {
+		handleError(err as Error)
+	} finally {
+		finishContentOperation(mod, operation)
+	}
 }
 
 async function updateProject(mod: ContentItem) {
-	try {
-		const newPath = await update_project(props.instance.path, mod.file_path!)
-		mod.file_path = newPath
+	if (!mod.file_path) return
+	const operation = beginContentOperation(mod)
+	if (!operation) return
 
-		if (mod.update_version_id) {
-			const versionData = await get_version(mod.update_version_id, 'must_revalidate').catch(
-				handleError,
-			)
+	try {
+		const updateVersionId = mod.update_version_id
+		await update_project(props.instance.path, mod.file_path)
+
+		if (updateVersionId) {
+			const versionData = await get_version(updateVersionId, 'must_revalidate').catch(handleError)
 
 			if (versionData) {
 				const profile = await get(props.instance.path).catch(handleError)
@@ -316,12 +420,6 @@ async function updateProject(mod: ContentItem) {
 			}
 		}
 
-		mod.has_update = false
-		if (mod.version && mod.update_version_id) {
-			mod.version.id = mod.update_version_id
-		}
-		mod.update_version_id = null
-
 		trackEvent('InstanceProjectUpdate', {
 			loader: props.instance.loader,
 			game_version: props.instance.game_version,
@@ -331,39 +429,65 @@ async function updateProject(mod: ContentItem) {
 		})
 	} catch (err) {
 		handleError(err as Error)
+	} finally {
+		await refreshContentState('must_revalidate')
+		finishContentOperation(mod, operation)
 	}
 }
 
 async function switchProjectVersion(mod: ContentItem, version: Labrinth.Versions.v2.Version) {
-	isBulkOperating.value = true
-	mod.installing = true
-	if (mod.version) {
-		mod.version.id = version.id
-		mod.version.version_number = version.version_number
-	}
+	if (!mod.file_path) return
+	const operation = beginContentOperation(mod)
+	if (!operation) return
+
+	const oldPath = mod.file_path
+	const wasDisabled = mod.enabled === false || oldPath.endsWith('.disabled')
+	let newPath: string | null = null
+	let shouldRemoveNewOnError = false
+
 	try {
-		await remove_project(props.instance.path, mod.file_path!)
-		const newPath = await add_project_from_version(props.instance.path, version.id, 'standalone')
+		newPath = await add_project_from_version(props.instance.path, version.id, 'update')
+		shouldRemoveNewOnError = newPath !== oldPath
+
+		if (wasDisabled) {
+			newPath = await toggle_disable_project(props.instance.path, newPath)
+		}
 
 		const profile = await get(props.instance.path).catch(handleError)
 		if (profile) {
 			await installVersionDependencies(profile, version, 'update').catch(handleError)
 		}
 
-		mod.file_path = newPath
+		shouldRemoveNewOnError = false
+		if (newPath !== oldPath) {
+			await remove_project(props.instance.path, oldPath)
+		}
+
+		trackEvent('InstanceProjectUpdate', {
+			loader: props.instance.loader,
+			game_version: props.instance.game_version,
+			id: mod.project?.id,
+			name: mod.project?.title ?? mod.file_name,
+			project_type: mod.project_type,
+		})
 	} catch (err) {
+		if (shouldRemoveNewOnError && newPath && newPath !== oldPath) {
+			await remove_project(props.instance.path, newPath).catch(() => {})
+		}
 		handleError(err as Error)
 	} finally {
-		mod.installing = false
-		isBulkOperating.value = false
-		await initProjects()
+		await refreshContentState('must_revalidate')
+		finishContentOperation(mod, operation)
 	}
 }
 
 async function handleUpdate(id: string) {
-	const item = projects.value.find((p) => p.id === id)
+	const item = projects.value.find((p) => getContentItemId(p) === id)
 	if (!item?.has_update || !item.project?.id || !item.version?.id) return
 
+	const requestId = beginUpdateRequest()
+	const itemId = getContentItemId(item)
+
 	debug('handleUpdate triggered', {
 		fileName: item.file_name,
 		projectType: item.project_type,
@@ -384,12 +508,48 @@ async function handleUpdate(id: string) {
 
 	await nextTick()
 
-	contentUpdaterModal.value?.show(item.update_version_id ?? undefined)
+	const initialVersionId = item.update_version_id ?? undefined
+	debug('handleUpdate: opening content updater modal', {
+		type: 'content',
+		initialVersionId,
+		item: {
+			id: item.id,
+			fileName: item.file_name,
+			projectType: item.project_type,
+			projectId: item.project.id,
+			projectTitle: item.project.title,
+			currentVersionId: item.version.id,
+			currentVersionNumber: item.version.version_number,
+			updateVersionId: item.update_version_id,
+		},
+		instance: {
+			path: props.instance.path,
+			name: props.instance.name,
+			gameVersion: props.instance.game_version,
+			loader: props.instance.loader,
+			linkedData: props.instance.linked_data,
+		},
+		modalStateBeforeFetch: {
+			updatingModpack: updatingModpack.value,
+			updatingProjectId: updatingProject.value?.id,
+			updatingProjectVersions: updatingProjectVersions.value.map((version) => ({
+				id: version.id,
+				versionNumber: version.version_number,
+				gameVersions: version.game_versions,
+				loaders: version.loaders,
+				datePublished: version.date_published,
+			})),
+		},
+	})
+	contentUpdaterModal.value?.show(initialVersionId)
 
 	const versions = (await get_project_versions(item.project.id).catch((e) => {
 		return handleError(e)
 	})) as Labrinth.Versions.v2.Version[] | null
 
+	if (!isActiveUpdateRequest(requestId) || getContentItemId(updatingProject.value) !== itemId)
+		return
+
 	loadingVersions.value = false
 
 	if (!versions) {
@@ -414,6 +574,25 @@ async function handleUpdate(id: string) {
 	versions.sort(
 		(a, b) => new Date(b.date_published).getTime() - new Date(a.date_published).getTime(),
 	)
+	const preselectedVersion =
+		versions.find((version) => version.id === initialVersionId) ?? versions[0] ?? null
+	debug('handleUpdate: resolved content updater preselection', {
+		type: 'content',
+		initialVersionId,
+		foundInitialVersion: versions.some((version) => version.id === initialVersionId),
+		preselectedVersion: preselectedVersion
+			? {
+					id: preselectedVersion.id,
+					versionNumber: preselectedVersion.version_number,
+					gameVersions: preselectedVersion.game_versions,
+					loaders: preselectedVersion.loaders,
+					datePublished: preselectedVersion.date_published,
+				}
+			: null,
+		versionCount: versions.length,
+		currentVersionId: item.version.id,
+		updateVersionId: item.update_version_id,
+	})
 
 	updatingProjectVersions.value = versions
 }
@@ -421,6 +600,9 @@ async function handleUpdate(id: string) {
 async function handleSwitchVersion(item: ContentItem) {
 	if (!item.project?.id || !item.version?.id) return
 
+	const requestId = beginUpdateRequest()
+	const itemId = getContentItemId(item)
+
 	updatingModpack.value = false
 	updatingProject.value = item
 	updatingProjectVersions.value = []
@@ -435,6 +617,9 @@ async function handleSwitchVersion(item: ContentItem) {
 		return handleError(e)
 	})) as Labrinth.Versions.v2.Version[] | null
 
+	if (!isActiveUpdateRequest(requestId) || getContentItemId(updatingProject.value) !== itemId)
+		return
+
 	loadingVersions.value = false
 
 	if (!versions) return
@@ -468,9 +653,28 @@ async function handleModpackContent() {
 	}
 }
 
+async function refreshModpackContentItems(cacheBehaviour?: CacheBehaviour) {
+	if (!props.instance?.path) return
+
+	const contentItems = await get_linked_modpack_content(props.instance.path, cacheBehaviour).catch(
+		handleError,
+	)
+
+	if (contentItems) {
+		modpackContentModal.value?.setItems(contentItems)
+	}
+}
+
+async function refreshContentState(cacheBehaviour?: CacheBehaviour) {
+	await initProjects(cacheBehaviour)
+	await refreshModpackContentItems(cacheBehaviour)
+}
+
 async function handleModpackUpdate() {
 	if (!props.instance?.linked_data?.project_id) return
 
+	const requestId = beginUpdateRequest()
+
 	updatingModpack.value = true
 	updatingProject.value = null
 	updatingProjectVersions.value = []
@@ -479,14 +683,42 @@ async function handleModpackUpdate() {
 
 	await nextTick()
 
-	contentUpdaterModal.value?.show(
-		linkedModpackUpdateVersionId.value ?? props.instance?.linked_data?.version_id ?? undefined,
-	)
+	const initialVersionId =
+		linkedModpackUpdateVersionId.value ?? props.instance?.linked_data?.version_id ?? undefined
+	debug('handleModpackUpdate: opening modpack updater modal', {
+		type: 'modpack',
+		initialVersionId,
+		linkedModpackUpdateVersionId: linkedModpackUpdateVersionId.value,
+		linkedModpackProject: linkedModpackProject.value,
+		linkedModpackVersion: linkedModpackVersion.value,
+		linkedModpackHasUpdate: linkedModpackHasUpdate.value,
+		instance: {
+			path: props.instance.path,
+			name: props.instance.name,
+			gameVersion: props.instance.game_version,
+			loader: props.instance.loader,
+			linkedData: props.instance.linked_data,
+		},
+		modalStateBeforeFetch: {
+			updatingModpack: updatingModpack.value,
+			updatingProjectId: updatingProject.value?.id,
+			updatingProjectVersions: updatingProjectVersions.value.map((version) => ({
+				id: version.id,
+				versionNumber: version.version_number,
+				gameVersions: version.game_versions,
+				loaders: version.loaders,
+				datePublished: version.date_published,
+			})),
+		},
+	})
+	contentUpdaterModal.value?.show(initialVersionId)
 
 	const versions = (await get_project_versions(props.instance.linked_data.project_id).catch(
 		handleError,
 	)) as Labrinth.Versions.v2.Version[] | null
 
+	if (!isActiveUpdateRequest(requestId) || !updatingModpack.value) return
+
 	loadingVersions.value = false
 
 	if (!versions) return
@@ -494,6 +726,25 @@ async function handleModpackUpdate() {
 	versions.sort(
 		(a, b) => new Date(b.date_published).getTime() - new Date(a.date_published).getTime(),
 	)
+	const preselectedVersion =
+		versions.find((version) => version.id === initialVersionId) ?? versions[0] ?? null
+	debug('handleModpackUpdate: resolved modpack updater preselection', {
+		type: 'modpack',
+		initialVersionId,
+		foundInitialVersion: versions.some((version) => version.id === initialVersionId),
+		preselectedVersion: preselectedVersion
+			? {
+					id: preselectedVersion.id,
+					versionNumber: preselectedVersion.version_number,
+					gameVersions: preselectedVersion.game_versions,
+					loaders: preselectedVersion.loaders,
+					datePublished: preselectedVersion.date_published,
+				}
+			: null,
+		versionCount: versions.length,
+		linkedModpackUpdateVersionId: linkedModpackUpdateVersionId.value,
+		currentLinkedVersionId: props.instance.linked_data.version_id,
+	})
 
 	updatingProjectVersions.value = versions
 }
@@ -502,10 +753,12 @@ async function fetchAndSpliceVersion(
 	versionId: string,
 	cacheBehaviour?: Parameters<typeof get_version>[1],
 	onError?: (err: unknown) => void,
+	requestId = activeUpdateRequestId.value,
 ) {
 	const fullVersion = (await get_version(versionId, cacheBehaviour).catch(
 		onError ?? (() => null),
 	)) as Labrinth.Versions.v2.Version | null
+	if (!isActiveUpdateRequest(requestId)) return
 	if (!fullVersion) return
 	const index = updatingProjectVersions.value.findIndex((v) => v.id === versionId)
 	if (index !== -1) {
@@ -517,17 +770,26 @@ async function fetchAndSpliceVersion(
 
 async function handleVersionSelect(version: Labrinth.Versions.v2.Version) {
 	if (version.changelog != null) return
+	const requestId = activeUpdateRequestId.value
 	loadingChangelog.value = true
-	await fetchAndSpliceVersion(version.id, 'must_revalidate', handleError as (err: unknown) => void)
-	loadingChangelog.value = false
+	await fetchAndSpliceVersion(
+		version.id,
+		'must_revalidate',
+		handleError as (err: unknown) => void,
+		requestId,
+	)
+	if (isActiveUpdateRequest(requestId)) {
+		loadingChangelog.value = false
+	}
 }
 
 async function handleVersionHover(version: Labrinth.Versions.v2.Version) {
 	if (version.changelog != null) return
-	await fetchAndSpliceVersion(version.id)
+	await fetchAndSpliceVersion(version.id, undefined, undefined, activeUpdateRequestId.value)
 }
 
 function resetUpdateState() {
+	activeUpdateRequestId.value = 0
 	updatingModpack.value = false
 	updatingProject.value = null
 	updatingProjectVersions.value = []
@@ -535,13 +797,23 @@ function resetUpdateState() {
 	loadingChangelog.value = false
 }
 
-function handleModpackUpdateRequest(selectedVersion: Labrinth.Versions.v2.Version) {
+async function handleModpackUpdateRequest(selectedVersion: Labrinth.Versions.v2.Version) {
 	pendingModpackUpdateVersion.value = selectedVersion
+
 	const currentVersionId = props.instance?.linked_data?.version_id
 	const currentVersion = updatingProjectVersions.value.find((v) => v.id === currentVersionId)
 	isModpackUpdateDowngrade.value = currentVersion
 		? new Date(selectedVersion.date_published) < new Date(currentVersion.date_published)
 		: false
+	const shouldShowWarning =
+		isModpackUpdateDowngrade.value ||
+		versionChangesGameVersion(selectedVersion, props.instance.game_version)
+
+	if (!shouldShowWarning) {
+		await handleModpackUpdateConfirm()
+		return
+	}
+
 	modpackUpdateConfirmModal.value?.show()
 }
 
@@ -551,6 +823,7 @@ async function handleModpackUpdateConfirm() {
 	const version = pendingModpackUpdateVersion.value
 	pendingModpackUpdateVersion.value = null
 
+	contentUpdaterModal.value?.hide()
 	isModpackUpdating.value = true
 	try {
 		await update_managed_modrinth_version(props.instance.path, version.id)
@@ -574,7 +847,7 @@ async function handleModalUpdate(
 			pendingModpackUpdateVersion.value = selectedVersion
 			await handleModpackUpdateConfirm()
 		} else {
-			handleModpackUpdateRequest(selectedVersion)
+			await handleModpackUpdateRequest(selectedVersion)
 		}
 	} else if (updatingProject.value) {
 		const mod = updatingProject.value
@@ -662,51 +935,31 @@ function getOverflowOptions(item: ContentItem): OverflowMenuOption[] {
 async function initProjects(cacheBehaviour?: CacheBehaviour) {
 	if (!props.instance) return
 
-	const [contentItems, modpackInfo, allCategories] = await Promise.all([
-		get_content_items(props.instance.path, cacheBehaviour).catch(handleError),
-		get_linked_modpack_info(props.instance.path, cacheBehaviour).catch(handleError),
-		get_categories().catch(handleError),
-	])
+	const contentData = await loadInstanceContentData(
+		props.instance.path,
+		cacheBehaviour,
+		handleError,
+	)
+	applyContentData(contentData)
+}
 
-	if (!contentItems) {
+function applyContentData(contentData: InstanceContentData) {
+	if (contentData.path !== props.instance.path) return false
+
+	if (!contentData.contentItems) {
 		loading.value = false
-		return
+		return true
 	}
 
-	projects.value = contentItems
+	projects.value = contentData.contentItems
 
-	if (modpackInfo) {
-		linkedModpackProject.value = {
-			...modpackInfo.project,
-			slug: modpackInfo.project.slug ?? modpackInfo.project.id,
-			icon_url: modpackInfo.project.icon_url ?? undefined,
-		}
-		linkedModpackVersion.value = {
-			...modpackInfo.version,
-			date_published: modpackInfo.version.date_published.toString(),
-		}
-		linkedModpackOwner.value = modpackInfo.owner
-			? {
-					...modpackInfo.owner,
-					avatar_url: modpackInfo.owner.avatar_url ?? undefined,
-				}
-			: null
-
-		linkedModpackHasUpdate.value = modpackInfo.has_update
-		linkedModpackUpdateVersionId.value = modpackInfo.update_version_id
-
-		if (allCategories && modpackInfo.project.categories) {
-			const seen = new Set<string>()
-			linkedModpackCategories.value = allCategories.filter((cat: { name: string }) => {
-				if (modpackInfo.project.categories.includes(cat.name) && !seen.has(cat.name)) {
-					seen.add(cat.name)
-					return true
-				}
-				return false
-			})
-		} else {
-			linkedModpackCategories.value = []
-		}
+	if (contentData.modpack) {
+		linkedModpackProject.value = contentData.modpack.project
+		linkedModpackVersion.value = contentData.modpack.version
+		linkedModpackOwner.value = contentData.modpack.owner
+		linkedModpackCategories.value = contentData.modpack.categories
+		linkedModpackHasUpdate.value = contentData.modpack.hasUpdate
+		linkedModpackUpdateVersionId.value = contentData.modpack.updateVersionId
 	} else {
 		linkedModpackProject.value = null
 		linkedModpackVersion.value = null
@@ -717,6 +970,7 @@ async function initProjects(cacheBehaviour?: CacheBehaviour) {
 	}
 
 	loading.value = false
+	return true
 }
 
 provideAppBackup({
@@ -809,8 +1063,9 @@ provideContentManager({
 	showContentHint,
 	dismissContentHint,
 	shareItems: handleShareItems,
+	getItemId: getContentItemId,
 	mapToTableItem: (item: ContentItem) => ({
-		id: item.id,
+		id: getContentItemId(item),
 		project: item.project ?? {
 			id: item.file_name,
 			slug: null,
@@ -844,10 +1099,22 @@ provideContentManager({
 	filterPersistKey: props.instance.path,
 })
 
-await initProjects()
+type UnlistenFn = () => void
+
+const initialContentReady = loadInitialContent()
+void initialContentReady.then(restoreModpackContentModalState).catch(handleError)
+
+function loadInitialContent() {
+	if (props.preloadedContent && applyContentData(props.preloadedContent)) {
+		return Promise.resolve()
+	}
+
+	return initProjects()
+}
+
+async function restoreModpackContentModalState() {
+	if (!savedModalState) return
 
-// Restore modpack content modal state if returning via back navigation
-if (savedModalState) {
 	const stateToRestore = savedModalState
 	savedModalState = null
 	await nextTick()
@@ -860,18 +1127,32 @@ const removeBeforeEach = router.beforeEach(() => {
 	savedModalState = state ?? null
 })
 
-const unlisten = await getCurrentWebview().onDragDropEvent(async (event) => {
-	if (event.payload.type !== 'drop' || !props.instance) return
+let isUnmounted = false
+let unlistenDragDrop: UnlistenFn | null = null
+let unlistenProfiles: UnlistenFn | null = null
 
-	for (const file of event.payload.paths) {
-		if (file.endsWith('.mrpack')) continue
-		await add_project_from_path(props.instance.path, file).catch(handleError)
-	}
-	await initProjects()
-})
+onMounted(() => {
+	void getCurrentWebview()
+		.onDragDropEvent(async (event) => {
+			if (event.payload.type !== 'drop' || !props.instance) return
 
-const unlistenProfiles = await profile_listener(
-	async (event: { event: string; profile_path_id: string }) => {
+			for (const file of event.payload.paths) {
+				if (file.endsWith('.mrpack')) continue
+				await add_project_from_path(props.instance.path, file).catch(handleError)
+			}
+			await initProjects()
+		})
+		.then((unlisten) => {
+			if (isUnmounted) {
+				unlisten()
+				return
+			}
+
+			unlistenDragDrop = unlisten
+		})
+		.catch(handleError)
+
+	void profile_listener(async (event: { event: string; profile_path_id: string }) => {
 		if (
 			props.instance &&
 			event.profile_path_id === props.instance.path &&
@@ -881,8 +1162,17 @@ const unlistenProfiles = await profile_listener(
 		) {
 			await initProjects()
 		}
-	},
-)
+	})
+		.then((unlisten) => {
+			if (isUnmounted) {
+				unlisten()
+				return
+			}
+
+			unlistenProfiles = unlisten
+		})
+		.catch(handleError)
+})
 
 watch(
 	() => props.instance?.install_stage,
@@ -905,8 +1195,9 @@ watch(
 )
 
 onUnmounted(() => {
+	isUnmounted = true
 	removeBeforeEach()
-	unlisten()
-	unlistenProfiles()
+	unlistenDragDrop?.()
+	unlistenProfiles?.()
 })
 </script>

apps/app-frontend/src/pages/project/Index.vue

@@ -334,7 +334,7 @@ const { formatMessage } = useVIntl()
 const messages = defineMessages({
 	backToBrowse: {
 		id: 'app.project.install-context.back-to-browse',
-		defaultMessage: 'Back to browse',
+		defaultMessage: 'Back to discover',
 	},
 	installContentToInstance: {
 		id: 'app.project.install-context.install-content-to-instance',
@@ -415,7 +415,7 @@ const projectGalleryHref = computed(() => buildProjectHref(`/project/${route.par
 const projectBrowseBackUrl = computed(() => {
 	const browsePath = route.query.b
 	if (typeof browsePath === 'string' && browsePath.startsWith('/browse/')) return browsePath
-	const type = data.value?.project_type ? `${data.value.project_type}s` : 'mods'
+	const type = data.value?.project_type ? `${data.value.project_type}` : 'mod'
 	return `/browse/${type}`
 })
 

apps/app-frontend/src/providers/instance-settings.ts

@@ -8,6 +8,7 @@ export interface InstanceSettingsContext {
 	offline?: boolean
 	isMinecraftServer: Ref<boolean>
 	onUnlinked: () => void
+	closeModal?: () => void
 }
 
 export const [injectInstanceSettings, provideInstanceSettings] =

apps/app-frontend/src/providers/setup/server-install-content.ts

@@ -17,6 +17,7 @@ import {
 	writePendingServerContentInstallBaseline,
 	writeStoredServerInstallQueue,
 } from '@modrinth/ui'
+import { useQueryClient } from '@tanstack/vue-query'
 import { computed, type ComputedRef, nextTick, type Ref, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
@@ -208,6 +209,7 @@ export function createServerInstallContent(opts: {
 	const router = useRouter()
 	const client = injectModrinthClient()
 	const { handleError } = injectNotificationManager()
+	const queryClient = useQueryClient()
 
 	const serverIdQuery = computed(() => readQueryString(route.query.sid))
 	const worldIdQuery = computed(() => readQueryString(route.query.wid))
@@ -471,6 +473,9 @@ export function createServerInstallContent(opts: {
 				...serverContentInstallKeys.value,
 				...result.flushedPlans.map((plan) => plan.projectId),
 			])
+			if (result.flushedPlans.length > 0) {
+				await queryClient.invalidateQueries({ queryKey: ['content', 'list', 'v1', serverId] })
+			}
 
 			return true
 		} finally {
@@ -491,6 +496,7 @@ export function createServerInstallContent(opts: {
 		const plans = new Map(queuedServerInstalls.value)
 
 		if (sid && wid) {
+			writeStoredServerInstallQueue(sid, wid, plans)
 			writePendingServerContentInstallBaseline(sid, wid, serverContentInstallKeys.value)
 			addPendingServerContentInstalls(sid, wid, getQueuedInstallPlaceholderFallbacks(plans))
 			void getQueuedInstallPlaceholders(client, plans)

apps/app-frontend/tsconfig.app.json

@@ -19,6 +19,7 @@
 		"types": ["vite/client"],
 
 		"paths": {
+			"@modrinth/api-client": ["../../packages/api-client/src/index.ts"],
 			"@/*": ["./src/*"]
 		}
 	},

apps/app-frontend/vite.config.ts

@@ -8,6 +8,7 @@ import tauriConf from '../app/tauri.conf.json'
 
 const projectRootDir = resolve(__dirname)
 const appLibEnvDir = resolve(projectRootDir, '../../packages/app-lib')
+const apiClientSource = resolve(projectRootDir, '../../packages/api-client/src/index.ts')
 
 // Load .env from app-lib manually instead of using Vite's envDir, which would auto-load .env.local and override values
 const envFilePath = resolve(appLibEnvDir, '.env')
@@ -37,6 +38,10 @@ export default defineConfig({
 	},
 	resolve: {
 		alias: [
+			{
+				find: '@modrinth/api-client',
+				replacement: apiClientSource,
+			},
 			{
 				find: '@',
 				replacement: resolve(projectRootDir, 'src'),

apps/app/Cargo.toml

@@ -51,8 +51,21 @@ tauri-build = { workspace = true, features = ["codegen"] }
 [target.'cfg(target_os = "linux")'.dependencies]
 tauri-plugin-updater = { workspace = true, optional = true }
 
+[target.'cfg(target_os = "macos")'.dependencies]
+core-foundation.workspace = true
+core-graphics.workspace = true
+objc2-app-kit = { workspace = true, features = [
+  "NSWindow",
+] }
+
 [target.'cfg(windows)'.dependencies]
 webview2-com.workspace = true
+windows = { workspace = true, features = [
+  "Win32_Foundation",
+  "Win32_Graphics_Dwm",
+  "Win32_Graphics_Gdi",
+  "Win32_UI_WindowsAndMessaging",
+] }
 windows-core.workspace = true
 
 [features]

apps/app/src/api/ads.rs

@@ -11,19 +11,20 @@ use tokio::sync::RwLock;
 pub struct AdsState {
     pub shown: bool,
     pub modal_shown: bool,
+    pub occluded: bool,
     pub last_click: Option<Instant>,
     pub malicious_origins: HashSet<String>,
 }
 
 const AD_LINK: &str = "https://modrinth.com/wrapper/app-ads-cookie";
-#[cfg(not(target_os = "linux"))]
-const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
+#[cfg(any(windows, target_os = "macos"))]
+pub(super) const OCCLUDED_AREA_THRESHOLD: f64 = 0.5;
 #[cfg(not(target_os = "linux"))]
 const ADS_USER_AGENT: &str = concat!(
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 ",
     "(KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 ",
     "ModrinthApp/",
-    APP_VERSION,
+    env!("CARGO_PKG_VERSION"),
     " (Modrinth App)",
 );
 
@@ -36,14 +37,14 @@ fn ads_user_agent_override_params() -> String {
             "brands": [
                 { "brand": "Chromium", "version": "128" },
                 { "brand": "Google Chrome", "version": "128" },
-                { "brand": "Modrinth App", "version": APP_VERSION },
+                { "brand": "Modrinth App", "version": env!("CARGO_PKG_VERSION") },
                 { "brand": "Not=A?Brand", "version": "99" },
             ],
             "fullVersion": "128.0.0.0",
             "fullVersionList": [
                 { "brand": "Chromium", "version": "128.0.0.0" },
                 { "brand": "Google Chrome", "version": "128.0.0.0" },
-                { "brand": "Modrinth App", "version": APP_VERSION },
+                { "brand": "Modrinth App", "version": env!("CARGO_PKG_VERSION") },
                 { "brand": "Not=A?Brand", "version": "99.0.0.0" },
             ],
             "platform": "Windows",
@@ -62,8 +63,8 @@ fn configure_ads_cookie_settings(
     core_webview2: &webview2_com::Microsoft::Web::WebView2::Win32::ICoreWebView2,
 ) {
     use webview2_com::Microsoft::Web::WebView2::Win32::{
-        COREWEBVIEW2_TRACKING_PREVENTION_LEVEL_NONE, ICoreWebView2,
-        ICoreWebView2_13, ICoreWebView2Profile3,
+        COREWEBVIEW2_TRACKING_PREVENTION_LEVEL_NONE, ICoreWebView2_13,
+        ICoreWebView2Profile3,
     };
     use windows_core::Interface;
 
@@ -93,10 +94,12 @@ fn configure_ads_cookie_settings(
     }
 }
 
-fn set_webview_visible<R: Runtime>(
-    webview: &tauri::Webview<R>,
-    _visible: bool,
-) {
+fn set_webview_visible<R: Runtime>(webview: &tauri::Webview<R>, visible: bool) {
+    #[cfg(not(any(windows, target_os = "macos")))]
+    {
+        _ = visible;
+    }
+
     webview
         .with_webview(
             #[allow(unused_variables)]
@@ -104,11 +107,18 @@ fn set_webview_visible<R: Runtime>(
                 #[cfg(windows)]
                 {
                     let controller = wv.controller();
-                    unsafe { controller.SetIsVisible(_visible) }.ok();
+                    unsafe { controller.SetIsVisible(visible) }.ok();
                 }
             },
         )
         .ok();
+
+    #[cfg(target_os = "macos")]
+    if visible {
+        webview.show().ok();
+    } else {
+        webview.hide().ok();
+    }
 }
 
 fn set_webview_visible_for_window<R: Runtime>(
@@ -121,7 +131,76 @@ fn set_webview_visible_for_window<R: Runtime>(
         .and_then(|window| window.is_minimized().ok())
         .unwrap_or(false);
 
-    set_webview_visible(webview, visible && !is_minimized);
+    let is_occluded = app
+        .state::<RwLock<AdsState>>()
+        .try_read()
+        .map(|state| state.occluded)
+        .unwrap_or(false);
+
+    set_webview_visible(webview, visible && !is_minimized && !is_occluded);
+}
+
+#[cfg(any(windows, target_os = "macos"))]
+fn compute_ads_webview_occlusion<R: Runtime>(
+    app: &tauri::AppHandle<R>,
+) -> Option<bool> {
+    let main_window = app.get_window("main")?;
+    let webviews = app.webviews();
+    let webview = webviews.get("ads-window")?;
+
+    #[cfg(target_os = "macos")]
+    {
+        let position = webview.position().ok()?;
+        let size = webview.size().ok()?;
+
+        Some(
+            crate::api::ads_occlusion_macos::is_ads_webview_occluded(
+                &main_window,
+                position.x,
+                position.y,
+                size.width,
+                size.height,
+            )
+            .unwrap_or(false),
+        )
+    }
+
+    #[cfg(windows)]
+    {
+        let position = webview.position().ok()?;
+        let size = webview.size().ok()?;
+        let hwnd = main_window.hwnd().ok()?;
+
+        Some(crate::api::ads_occlusion_windows::is_ads_webview_occluded(
+            hwnd,
+            position.x,
+            position.y,
+            size.width,
+            size.height,
+        ))
+    }
+}
+
+#[cfg(any(windows, target_os = "macos"))]
+async fn sync_ads_occlusion<R: Runtime>(app: &tauri::AppHandle<R>) {
+    let Some(occluded) = compute_ads_webview_occlusion(app) else {
+        return;
+    };
+
+    let state = app.state::<RwLock<AdsState>>();
+    let mut state = state.write().await;
+
+    if state.occluded == occluded {
+        return;
+    }
+
+    state.occluded = occluded;
+    let visible = state.shown && !state.modal_shown;
+    drop(state);
+
+    if let Some(webview) = app.webviews().get("ads-window") {
+        set_webview_visible_for_window(app, webview, visible);
+    }
 }
 
 fn sync_webview_visibility_for_main_window<R: Runtime>(
@@ -142,7 +221,7 @@ fn sync_webview_visibility_for_main_window<R: Runtime>(
         false
     } else {
         match app.state::<RwLock<AdsState>>().try_read() {
-            Ok(state) => state.shown && !state.modal_shown,
+            Ok(state) => state.shown && !state.modal_shown && !state.occluded,
             Err(_) => false,
         }
     };
@@ -175,20 +254,28 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
             app.manage(RwLock::new(AdsState {
                 shown: true,
                 modal_shown: false,
+                occluded: false,
                 last_click: None,
                 malicious_origins: HashSet::new(),
             }));
 
-            // We refresh the ads window every 5 minutes to mitigate memory leak issues.
-            // While this loop doesn't include explicit checks to see if the window is still
-            // visible when we refresh, the Aditude wrapper will not make any ad requests
-            // unless Chromium reports the page as visible. The refresh does not reset the
-            // visibility state.
+            // We refresh the ads window periodically to mitigate memory leak issues.
+            // Skip refreshes when app state has hidden the ads WebView. The refresh does
+            // not reset the visibility state.
             let refresh_app = app.clone();
             tauri::async_runtime::spawn(async move {
                 loop {
-                    if let Some(webview) =
-                        refresh_app.webviews().get_mut("ads-window")
+                    let should_refresh = refresh_app
+                        .state::<RwLock<AdsState>>()
+                        .try_read()
+                        .map(|state| {
+                            state.shown && !state.modal_shown && !state.occluded
+                        })
+                        .unwrap_or(false);
+
+                    if should_refresh
+                        && let Some(webview) =
+                            refresh_app.webviews().get_mut("ads-window")
                     {
                         let _ = webview.navigate(AD_LINK.parse().unwrap());
                     }
@@ -226,6 +313,19 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
                 });
             }
 
+            #[cfg(any(windows, target_os = "macos"))]
+            {
+                let app_handle = app.clone();
+
+                tauri::async_runtime::spawn(async move {
+                    loop {
+                        sync_ads_occlusion(&app_handle).await;
+
+                        tokio::time::sleep(Duration::from_millis(200)).await;
+                    }
+                });
+            }
+
             Ok(())
         })
         .invoke_handler(tauri::generate_handler![

apps/app/src/api/ads_occlusion_macos.rs

@@ -0,0 +1,236 @@
+use std::ptr::NonNull;
+
+use core_foundation::array::CFArray;
+use core_foundation::base::{CFType, TCFType};
+use core_foundation::dictionary::CFDictionary;
+use core_foundation::number::CFNumber;
+use core_foundation::string::CFString;
+use core_graphics::display::CGDisplay;
+use core_graphics::geometry::{CGPoint, CGRect, CGSize};
+use core_graphics::window::{
+    CGWindowID, kCGWindowAlpha, kCGWindowBounds, kCGWindowLayer,
+    kCGWindowListExcludeDesktopElements,
+    kCGWindowListOptionOnScreenAboveWindow, kCGWindowListOptionOnScreenOnly,
+    kCGWindowNumber, kCGWindowOwnerName, kCGWindowOwnerPID,
+};
+use objc2_app_kit::NSWindow;
+
+pub fn is_ads_webview_occluded<R: tauri::Runtime>(
+    main_window: &tauri::Window<R>,
+    ad_x: i32,
+    ad_y: i32,
+    ad_width: u32,
+    ad_height: u32,
+) -> Option<bool> {
+    let scale_factor = main_window.scale_factor().ok()?;
+    let maybe_ns_window = main_window.ns_window().ok()?;
+    let ns_window = NonNull::new(maybe_ns_window)?.cast::<NSWindow>();
+    let ns_window = unsafe { ns_window.as_ref() };
+    let window_number = ns_window.windowNumber();
+    let main_window_id = if window_number > 0 {
+        window_number as CGWindowID
+    } else {
+        return None;
+    };
+
+    let window_infos = CGDisplay::window_list_info(
+        kCGWindowListOptionOnScreenOnly | kCGWindowListExcludeDesktopElements,
+        None,
+    )?;
+
+    let window_infos = unsafe {
+        CFArray::<CFDictionary<CFString, CFType>>::wrap_under_get_rule(
+            window_infos.as_concrete_TypeRef(),
+        )
+    };
+    let main_window_rect = window_infos
+        .iter()
+        .find(|window_info| window_id(window_info) == Some(main_window_id))
+        .and_then(|window_info| window_rect(&window_info))?;
+    let ad_rect = ad_rect_from_main_window(
+        &main_window_rect,
+        ad_x,
+        ad_y,
+        ad_width,
+        ad_height,
+        scale_factor,
+    );
+
+    if is_empty_rect(&ad_rect) {
+        return None;
+    }
+
+    let ad_area = rect_area(&ad_rect);
+
+    if ad_area == 0.0 {
+        return None;
+    }
+
+    let app_process_id = std::process::id() as i32;
+    let windows_above_main = CGDisplay::window_list_info(
+        kCGWindowListOptionOnScreenAboveWindow
+            | kCGWindowListExcludeDesktopElements,
+        Some(main_window_id),
+    )?;
+    let windows_above_main = unsafe {
+        CFArray::<CFDictionary<CFString, CFType>>::wrap_under_get_rule(
+            windows_above_main.as_concrete_TypeRef(),
+        )
+    };
+    let mut occluded_area = 0.0;
+
+    for window_info in windows_above_main.iter() {
+        if window_id(&window_info) == Some(main_window_id) {
+            continue;
+        }
+
+        if window_process_id(&window_info) == Some(app_process_id) {
+            continue;
+        }
+
+        let owner_name = window_owner_name(&window_info);
+
+        if owner_name.as_deref().is_some_and(is_system_window_owner) {
+            continue;
+        }
+
+        let layer = window_layer(&window_info);
+
+        if layer != Some(0) {
+            continue;
+        }
+
+        let alpha = window_alpha(&window_info);
+
+        if alpha.is_some_and(|alpha| alpha <= 0.0) {
+            continue;
+        }
+
+        let Some(rect) = window_rect(&window_info) else {
+            continue;
+        };
+
+        let Some(intersection) = intersect_rects(&ad_rect, &rect) else {
+            continue;
+        };
+
+        occluded_area += rect_area(&intersection);
+        let occluded_ratio = occluded_area / ad_area;
+
+        if occluded_ratio >= super::ads::OCCLUDED_AREA_THRESHOLD {
+            return Some(true);
+        }
+    }
+
+    Some(false)
+}
+
+fn ad_rect_from_main_window(
+    main_window_rect: &CGRect,
+    x: i32,
+    y: i32,
+    width: u32,
+    height: u32,
+    scale_factor: f64,
+) -> CGRect {
+    let scale_factor = if scale_factor > 0.0 {
+        scale_factor
+    } else {
+        1.0
+    };
+
+    CGRect::new(
+        &CGPoint::new(
+            main_window_rect.origin.x + x as f64 / scale_factor,
+            main_window_rect.origin.y + y as f64 / scale_factor,
+        ),
+        &CGSize::new(width as f64 / scale_factor, height as f64 / scale_factor),
+    )
+}
+
+fn window_id(
+    window_info: &CFDictionary<CFString, CFType>,
+) -> Option<CGWindowID> {
+    number_value(window_info, unsafe { kCGWindowNumber })
+        .and_then(|value| u32::try_from(value).ok())
+}
+
+fn window_process_id(
+    window_info: &CFDictionary<CFString, CFType>,
+) -> Option<i32> {
+    number_value(window_info, unsafe { kCGWindowOwnerPID })
+        .and_then(|value| i32::try_from(value).ok())
+}
+
+fn window_layer(window_info: &CFDictionary<CFString, CFType>) -> Option<i32> {
+    number_value(window_info, unsafe { kCGWindowLayer })
+        .and_then(|value| i32::try_from(value).ok())
+}
+
+fn window_alpha(window_info: &CFDictionary<CFString, CFType>) -> Option<f64> {
+    let key = unsafe { CFString::wrap_under_get_rule(kCGWindowAlpha) };
+
+    window_info.find(&key)?.downcast::<CFNumber>()?.to_f64()
+}
+
+fn window_owner_name(
+    window_info: &CFDictionary<CFString, CFType>,
+) -> Option<String> {
+    let key = unsafe { CFString::wrap_under_get_rule(kCGWindowOwnerName) };
+
+    Some(window_info.find(&key)?.downcast::<CFString>()?.to_string())
+}
+
+fn is_system_window_owner(owner_name: &str) -> bool {
+    matches!(owner_name, "WindowManager")
+}
+
+fn number_value(
+    window_info: &CFDictionary<CFString, CFType>,
+    key: core_foundation::string::CFStringRef,
+) -> Option<i64> {
+    let key = unsafe { CFString::wrap_under_get_rule(key) };
+
+    window_info.find(&key)?.downcast::<CFNumber>()?.to_i64()
+}
+
+fn window_rect(window_info: &CFDictionary<CFString, CFType>) -> Option<CGRect> {
+    let key = unsafe { CFString::wrap_under_get_rule(kCGWindowBounds) };
+    let bounds = window_info.find(&key)?.downcast::<CFDictionary>()?;
+    let rect = CGRect::from_dict_representation(&bounds)?;
+
+    if is_empty_rect(&rect) {
+        None
+    } else {
+        Some(rect)
+    }
+}
+
+fn is_empty_rect(rect: &CGRect) -> bool {
+    rect.size.width <= 0.0 || rect.size.height <= 0.0
+}
+
+fn rect_area(rect: &CGRect) -> f64 {
+    if is_empty_rect(rect) {
+        return 0.0;
+    }
+
+    rect.size.width * rect.size.height
+}
+
+fn intersect_rects(a: &CGRect, b: &CGRect) -> Option<CGRect> {
+    let left = a.origin.x.max(b.origin.x);
+    let top = a.origin.y.max(b.origin.y);
+    let right = (a.origin.x + a.size.width).min(b.origin.x + b.size.width);
+    let bottom = (a.origin.y + a.size.height).min(b.origin.y + b.size.height);
+    let rect = CGRect::new(
+        &CGPoint::new(left, top),
+        &CGSize::new(right - left, bottom - top),
+    );
+
+    if is_empty_rect(&rect) {
+        None
+    } else {
+        Some(rect)
+    }
+}

apps/app/src/api/ads_occlusion_windows.rs

@@ -0,0 +1,191 @@
+use windows::Win32::Foundation::{HWND, POINT, RECT};
+use windows::Win32::Graphics::Dwm::{
+    DWMWA_CLOAKED, DWMWA_EXTENDED_FRAME_BOUNDS, DwmGetWindowAttribute,
+};
+use windows::Win32::Graphics::Gdi::ClientToScreen;
+use windows::Win32::UI::WindowsAndMessaging::{
+    GA_ROOT, GW_HWNDNEXT, GetAncestor, GetTopWindow, GetWindow, GetWindowRect,
+    GetWindowThreadProcessId, IsIconic, IsWindowVisible,
+};
+
+pub fn is_ads_webview_occluded(
+    main_hwnd: HWND,
+    x: i32,
+    y: i32,
+    width: u32,
+    height: u32,
+) -> bool {
+    let Some(ad_rect) = ad_rect_in_screen(main_hwnd, x, y, width, height)
+    else {
+        return false;
+    };
+
+    if is_empty_rect(&ad_rect) {
+        return false;
+    }
+
+    let ad_area = rect_area(&ad_rect);
+    if ad_area == 0 {
+        return false;
+    }
+
+    let mut occluded_area = 0u64;
+    let app_root = unsafe { GetAncestor(main_hwnd, GA_ROOT) };
+    let app_process_id = std::process::id();
+    let mut hwnd = match unsafe { GetTopWindow(None) } {
+        Ok(hwnd) => hwnd,
+        Err(_) => return false,
+    };
+
+    while !hwnd.is_invalid() {
+        let window_root = unsafe { GetAncestor(hwnd, GA_ROOT) };
+
+        if window_root == app_root {
+            return false;
+        }
+
+        if window_process_id(hwnd) == Some(app_process_id) {
+            hwnd = match unsafe { GetWindow(hwnd, GW_HWNDNEXT) } {
+                Ok(hwnd) => hwnd,
+                Err(_) => break,
+            };
+            continue;
+        }
+
+        if window_counts_as_occluder(hwnd)
+            && let Some(occluder_rect) = window_rect(hwnd)
+            && let Some(intersection) =
+                intersect_rects(&ad_rect, &occluder_rect)
+        {
+            occluded_area =
+                occluded_area.saturating_add(rect_area(&intersection));
+
+            if (occluded_area as f64 / ad_area as f64)
+                >= super::ads::OCCLUDED_AREA_THRESHOLD
+            {
+                return true;
+            }
+        }
+
+        hwnd = match unsafe { GetWindow(hwnd, GW_HWNDNEXT) } {
+            Ok(hwnd) => hwnd,
+            Err(_) => break,
+        };
+    }
+
+    false
+}
+
+fn ad_rect_in_screen(
+    main_hwnd: HWND,
+    x: i32,
+    y: i32,
+    width: u32,
+    height: u32,
+) -> Option<RECT> {
+    let mut origin = POINT { x: 0, y: 0 };
+
+    if !unsafe { ClientToScreen(main_hwnd, &mut origin).as_bool() } {
+        return None;
+    }
+
+    let left = origin.x.saturating_add(x);
+    let top = origin.y.saturating_add(y);
+    let right = left.saturating_add(width as i32);
+    let bottom = top.saturating_add(height as i32);
+
+    Some(RECT {
+        left,
+        top,
+        right,
+        bottom,
+    })
+}
+
+fn window_counts_as_occluder(hwnd: HWND) -> bool {
+    if !unsafe { IsWindowVisible(hwnd).as_bool() } {
+        return false;
+    }
+
+    if unsafe { IsIconic(hwnd).as_bool() } {
+        return false;
+    }
+
+    if is_dwm_cloaked(hwnd) {
+        return false;
+    }
+
+    true
+}
+
+fn window_process_id(hwnd: HWND) -> Option<u32> {
+    let mut process_id = 0u32;
+
+    unsafe {
+        GetWindowThreadProcessId(hwnd, Some(&mut process_id));
+    }
+
+    (process_id != 0).then_some(process_id)
+}
+
+fn is_dwm_cloaked(hwnd: HWND) -> bool {
+    let mut cloaked = 0u32;
+
+    unsafe {
+        DwmGetWindowAttribute(
+            hwnd,
+            DWMWA_CLOAKED,
+            &mut cloaked as *mut u32 as *mut _,
+            std::mem::size_of::<u32>() as u32,
+        )
+    }
+    .is_ok()
+        && cloaked != 0
+}
+
+fn window_rect(hwnd: HWND) -> Option<RECT> {
+    let mut rect = RECT::default();
+
+    if unsafe {
+        DwmGetWindowAttribute(
+            hwnd,
+            DWMWA_EXTENDED_FRAME_BOUNDS,
+            &mut rect as *mut RECT as *mut _,
+            std::mem::size_of::<RECT>() as u32,
+        )
+    }
+    .is_err()
+        && unsafe { GetWindowRect(hwnd, &mut rect) }.is_err()
+    {
+        return None;
+    }
+
+    if is_empty_rect(&rect) {
+        return None;
+    }
+
+    Some(rect)
+}
+
+fn is_empty_rect(rect: &RECT) -> bool {
+    rect.right <= rect.left || rect.bottom <= rect.top
+}
+
+fn rect_area(rect: &RECT) -> u64 {
+    if is_empty_rect(rect) {
+        return 0;
+    }
+
+    (rect.right - rect.left) as u64 * (rect.bottom - rect.top) as u64
+}
+
+fn intersect_rects(a: &RECT, b: &RECT) -> Option<RECT> {
+    let rect = RECT {
+        left: a.left.max(b.left),
+        top: a.top.max(b.top),
+        right: a.right.min(b.right),
+        bottom: a.bottom.min(b.bottom),
+    };
+
+    (!is_empty_rect(&rect)).then_some(rect)
+}

apps/app/src/api/mod.rs

@@ -18,6 +18,10 @@ pub mod tags;
 pub mod utils;
 
 pub mod ads;
+#[cfg(target_os = "macos")]
+mod ads_occlusion_macos;
+#[cfg(windows)]
+mod ads_occlusion_windows;
 pub mod cache;
 pub mod files;
 pub mod friends;

apps/daedalus_client/src/fabric.rs

@@ -65,49 +65,65 @@ async fn fetch(
     )
     .await?;
 
-    // We check Modrinth's fabric version manifest and compare if the fabric version exists in Modrinth's database
-    // We also check intermediary versions that are newly added to query
-    let (fetch_fabric_versions, fetch_intermediary_versions) =
-        if let Some(modrinth_manifest) = modrinth_manifest {
-            let (mut fetch_versions, mut fetch_intermediary_versions) =
-                (Vec::new(), Vec::new());
+    // We check Modrinth's manifest to find newly added loader versions,
+    // intermediary/mapping artifacts, and game versions.
+    let (
+        fetch_fabric_versions,
+        fetch_intermediary_versions,
+        has_new_game_versions,
+    ) = if let Some(modrinth_manifest) = modrinth_manifest {
+        let (mut fetch_versions, mut fetch_intermediary_versions) =
+            (Vec::new(), Vec::new());
 
-            for version in &fabric_manifest.loader {
-                if !modrinth_manifest
-                    .game_versions
-                    .iter()
-                    .any(|x| x.loaders.iter().any(|x| x.id == version.version))
-                    && !skip_versions.contains(&&*version.version)
-                {
-                    fetch_versions.push(version);
-                }
+        for version in &fabric_manifest.loader {
+            if !modrinth_manifest
+                .game_versions
+                .iter()
+                .any(|x| x.loaders.iter().any(|x| x.id == version.version))
+                && !skip_versions.contains(&&*version.version)
+            {
+                fetch_versions.push(version);
             }
+        }
 
-            for version in &fabric_manifest.intermediary {
-                if !modrinth_manifest
+        for version in &fabric_manifest.intermediary {
+            if !modrinth_manifest
+                .game_versions
+                .iter()
+                .any(|x| x.id == version.version)
+                && fabric_manifest
+                    .game
+                    .iter()
+                    .any(|x| x.version == version.version)
+            {
+                fetch_intermediary_versions.push(version);
+            }
+        }
+
+        let has_new_game_versions =
+            fabric_manifest.game.iter().any(|version| {
+                !modrinth_manifest
                     .game_versions
                     .iter()
                     .any(|x| x.id == version.version)
-                    && fabric_manifest
-                        .game
-                        .iter()
-                        .any(|x| x.version == version.version)
-                {
-                    fetch_intermediary_versions.push(version);
-                }
-            }
+            });
 
-            (fetch_versions, fetch_intermediary_versions)
-        } else {
-            (
-                fabric_manifest
-                    .loader
-                    .iter()
-                    .filter(|x| !skip_versions.contains(&&*x.version))
-                    .collect(),
-                fabric_manifest.intermediary.iter().collect(),
-            )
-        };
+        (
+            fetch_versions,
+            fetch_intermediary_versions,
+            has_new_game_versions,
+        )
+    } else {
+        (
+            fabric_manifest
+                .loader
+                .iter()
+                .filter(|x| !skip_versions.contains(&&*x.version))
+                .collect(),
+            fabric_manifest.intermediary.iter().collect(),
+            true,
+        )
+    };
 
     const DUMMY_GAME_VERSION: &str = "1.21";
 
@@ -216,6 +232,7 @@ async fn fetch(
 
     if !fetch_fabric_versions.is_empty()
         || !fetch_intermediary_versions.is_empty()
+        || has_new_game_versions
     {
         let fabric_manifest_path =
             format!("{mod_loader}/v{format_version}/manifest.json",);

apps/frontend/nuxt.config.ts

@@ -1,10 +1,15 @@
-import { GenericModrinthClient, type Labrinth } from '@modrinth/api-client'
 import serverSidedVue from '@vitejs/plugin-vue'
 import fs from 'fs/promises'
 import { defineNuxtConfig } from 'nuxt/config'
+import { fileURLToPath } from 'url'
 import svgLoader from 'vite-svg-loader'
 
+import { GenericModrinthClient, type Labrinth } from '../../packages/api-client/src/index.ts'
+
 const STAGING_API_URL = 'https://staging-api.modrinth.com/v2/'
+const API_CLIENT_SOURCE = fileURLToPath(
+	new URL('../../packages/api-client/src/index.ts', import.meta.url),
+)
 
 const preloadedFonts = [
 	'inter/Inter-Regular.woff2',
@@ -24,6 +29,9 @@ const STAGING_MODRINTH_URL = 'https://staging.modrinth.com'
 
 export default defineNuxtConfig({
 	srcDir: 'src/',
+	alias: {
+		'@modrinth/api-client': API_CLIENT_SOURCE,
+	},
 	app: {
 		head: {
 			htmlAttrs: {
@@ -82,6 +90,9 @@ export default defineNuxtConfig({
 		},
 		cacheDir: '../../node_modules/.vite/apps/knossos',
 		resolve: {
+			alias: {
+				'@modrinth/api-client': API_CLIENT_SOURCE,
+			},
 			dedupe: ['vue'],
 		},
 		plugins: [

apps/frontend/package.json

@@ -38,7 +38,6 @@
 	},
 	"dependencies": {
 		"@formatjs/intl-localematcher": "^0.5.4",
-		"@intercom/messenger-js-sdk": "^0.0.14",
 		"@ltd/j-toml": "^1.38.0",
 		"@modrinth/api-client": "workspace:*",
 		"@modrinth/assets": "workspace:*",

apps/frontend/src/components/ui/ModrinthFooter.vue

@@ -1,5 +1,12 @@
 <script setup lang="ts">
-import { BlueskyIcon, DiscordIcon, GithubIcon, MastodonIcon, TwitterIcon } from '@modrinth/assets'
+import {
+	BlueskyIcon,
+	DiscordIcon,
+	GithubIcon,
+	MastodonIcon,
+	ToggleRightIcon,
+	TwitterIcon,
+} from '@modrinth/assets'
 import {
 	AutoLink,
 	ButtonStyled,
@@ -10,6 +17,7 @@ import {
 	type MessageDescriptor,
 	useVIntl,
 } from '@modrinth/ui'
+import { commonSettingsMessages } from '@modrinth/ui/src/utils/common-messages.js'
 
 import TextLogo from '~/components/brand/TextLogo.vue'
 
@@ -233,11 +241,21 @@ function developerModeIncrement() {
 					role="region"
 					:aria-label="formatMessage(messages.modrinthInformation)"
 				>
-					<TextLogo
-						aria-hidden="true"
-						class="text-logo button-base h-6 w-auto text-contrast lg:h-8"
-						@click="developerModeIncrement()"
-					/>
+					<div class="flex items-center gap-2">
+						<TextLogo
+							aria-hidden="true"
+							class="text-logo button-base h-6 w-auto text-contrast lg:h-8"
+							@click="developerModeIncrement()"
+						/>
+						<ButtonStyled v-if="flags.developerMode" circular type="transparent" color="brand">
+							<nuxt-link
+								v-tooltip="formatMessage(commonSettingsMessages.featureFlags)"
+								to="/settings/flags"
+							>
+								<ToggleRightIcon />
+							</nuxt-link>
+						</ButtonStyled>
+					</div>
 					<div class="flex flex-wrap justify-center gap-px sm:-mx-2">
 						<ButtonStyled
 							v-for="(social, index) in socialLinks"

apps/frontend/src/components/ui/banner/GeneratedStateErrorsBanner.vue

@@ -1,7 +1,11 @@
 <script setup lang="ts">
-import { defineMessages, PagewideBanner, useVIntl } from '@modrinth/ui'
+import { XCircleIcon, XIcon } from '@modrinth/assets'
+import { ButtonStyled, defineMessages, PagewideBanner, useVIntl } from '@modrinth/ui'
 
 const { formatMessage } = useVIntl()
+const flags = useFeatureFlags()
+
+const tempIgnored = ref(false)
 
 const messages = defineMessages({
 	title: {
@@ -13,16 +17,34 @@ const messages = defineMessages({
 		defaultMessage:
 			"This deploy of Modrinth's frontend failed to generate state from the API. This may be due to an outage or an error in configuration. Rebuild when the API is available. Error codes: {errors}; Current API URL is: {url}",
 	},
+	ignoreErrors: {
+		id: 'layout.banner.build-fail.ignore',
+		defaultMessage: 'Ignore',
+	},
+	alwaysIgnore: {
+		id: 'layout.banner.build-fail.always-ignore',
+		defaultMessage: 'Always ignore',
+	},
 })
 
 defineProps<{
 	errors: any[] | undefined
 	apiUrl: string
 }>()
+
+function alwaysIgnoreBanner() {
+	flags.value.alwaysIgnoreErrorBanner = true
+	saveFeatureFlags()
+}
 </script>
 
 <template>
-	<PagewideBanner v-if="errors?.length" variant="error">
+	<PagewideBanner
+		v-if="
+			flags.showAllBanners || (errors?.length && !tempIgnored && !flags.alwaysIgnoreErrorBanner)
+		"
+		variant="error"
+	>
 		<template #title>
 			<span>{{ formatMessage(messages.title) }}</span>
 		</template>
@@ -34,5 +56,19 @@ defineProps<{
 				})
 			}}
 		</template>
+		<template #actions_right>
+			<ButtonStyled color="red" type="transparent" hover-color-fill="background">
+				<button @click="alwaysIgnoreBanner">
+					<XCircleIcon />
+					{{ formatMessage(messages.alwaysIgnore) }}
+				</button>
+			</ButtonStyled>
+			<ButtonStyled color="red">
+				<button @click="tempIgnored = true">
+					<XIcon />
+					{{ formatMessage(messages.ignoreErrors) }}
+				</button>
+			</ButtonStyled>
+		</template>
 	</PagewideBanner>
 </template>

apps/frontend/src/components/ui/banner/PreviewBanner.vue

@@ -5,7 +5,6 @@ import {
 	commonMessages,
 	defineMessages,
 	IntlFormatted,
-	normalizeChildren,
 	PagewideBanner,
 	useVIntl,
 } from '@modrinth/ui'
@@ -13,6 +12,7 @@ import {
 const { formatMessage } = useVIntl()
 const flags = useFeatureFlags()
 const config = useRuntimeConfig()
+const route = useRoute()
 
 const messages = defineMessages({
 	title: {
@@ -21,7 +21,7 @@ const messages = defineMessages({
 	},
 	description: {
 		id: 'layout.banner.preview.description',
-		defaultMessage: `If you meant to access the official Modrinth website, visit <link>https://modrinth.com</link>. This preview deploy is used by Modrinth staff for testing purposes. It was built using <branch-link>{owner}/{branch}</branch-link> @ {commit}.`,
+		defaultMessage: `If you meant to access the official Modrinth website, visit {url}. This preview deploy is used by Modrinth staff for testing purposes. It was built using {ref}.`,
 	},
 })
 
@@ -29,39 +29,33 @@ function hidePreviewBanner() {
 	flags.value.hidePreviewBanner = true
 	saveFeatureFlags()
 }
+
+const url = computed(() => `https://modrinth.com${route.fullPath}`)
 </script>
 
 <template>
-	<PagewideBanner v-if="!flags.hidePreviewBanner" variant="info">
+	<PagewideBanner v-if="!flags.hidePreviewBanner || flags.showAllBanners" variant="info">
 		<template #title>
 			<span>{{ formatMessage(messages.title) }}</span>
 		</template>
 		<template #description>
 			<span>
-				<IntlFormatted
-					:message-id="messages.description"
-					:values="{
-						owner: config.public.owner,
-						branch: config.public.branch,
-					}"
-				>
-					<template #link="{ children }">
-						<a href="https://modrinth.com" target="_blank" rel="noopener" class="text-link">
-							<component :is="() => normalizeChildren(children)" />
+				<IntlFormatted :message-id="messages.description">
+					<template #url>
+						<a :href="url" target="_blank" rel="noopener" class="text-link">
+							{{ url }}
 						</a>
 					</template>
-					<template #branch-link="{ children }">
+					<template #ref>
 						<a
 							:href="`https://github.com/${config.public.owner}/code/tree/${config.public.branch}`"
 							target="_blank"
 							rel="noopener"
 							class="hover:underline"
 						>
-							<component :is="() => normalizeChildren(children)" />
+							{{ config.public.owner }} / {{ config.public.branch }}
 						</a>
-					</template>
-					<template #commit>
-						<span v-if="config.public.hash === 'unknown'">unknown</span>
+						@ <span v-if="config.public.hash === 'unknown'">unknown</span>
 						<a
 							v-else
 							:href="`https://github.com/${config.public.owner}/code/commit/${config.public.hash}`"
@@ -75,7 +69,7 @@ function hidePreviewBanner() {
 				</IntlFormatted>
 			</span>
 		</template>
-		<template #actions_right>
+		<template #actions_top_right>
 			<ButtonStyled type="transparent" circular>
 				<button :aria-label="formatMessage(commonMessages.closeButton)" @click="hidePreviewBanner">
 					<XIcon aria-hidden="true" />

apps/frontend/src/components/ui/banner/RussiaBanner.vue

@@ -47,7 +47,7 @@ function hideRussiaCensorshipBanner() {
 						<span class="text-xs font-medium">(Перевод на русский)</span>
 					</nuxt-link>
 				</ButtonStyled>
-				<ButtonStyled>
+				<ButtonStyled type="transparent" hover-color-fill="background">
 					<nuxt-link to="/news/article/standing-by-our-values">
 						<BookTextIcon /> Read our full statement
 						<span class="text-xs font-medium">(English)</span>
@@ -55,7 +55,7 @@ function hideRussiaCensorshipBanner() {
 				</ButtonStyled>
 			</div>
 		</template>
-		<template #actions_right>
+		<template #actions_top_right>
 			<ButtonStyled circular type="transparent">
 				<button
 					v-tooltip="formatMessage(commonMessages.closeButton)"

apps/frontend/src/components/ui/banner/StagingBanner.vue

@@ -10,6 +10,7 @@ import {
 
 const { formatMessage } = useVIntl()
 const cosmetics = useCosmetics()
+const flags = useFeatureFlags()
 
 const messages = defineMessages({
 	title: {
@@ -29,14 +30,14 @@ function hideStagingBanner() {
 </script>
 
 <template>
-	<PagewideBanner v-if="!cosmetics.hideStagingBanner" variant="warning">
+	<PagewideBanner v-if="flags.showAllBanners || !cosmetics.hideStagingBanner" variant="warning">
 		<template #title>
 			<span>{{ formatMessage(messages.title) }}</span>
 		</template>
 		<template #description>
 			{{ formatMessage(messages.description) }}
 		</template>
-		<template #actions_right>
+		<template #actions_top_right>
 			<ButtonStyled type="transparent" circular>
 				<button :aria-label="formatMessage(commonMessages.closeButton)" @click="hideStagingBanner">
 					<XIcon aria-hidden="true" />

apps/frontend/src/components/ui/banner/SubscriptionPaymentFailedBanner.vue

@@ -29,8 +29,8 @@ const messages = defineMessages({
 		<template #description>
 			<span>{{ formatMessage(messages.description) }}</span>
 		</template>
-		<template #actions>
-			<ButtonStyled>
+		<template #actions_right>
+			<ButtonStyled color="red">
 				<nuxt-link to="/settings/billing">
 					<SettingsIcon aria-hidden="true" />
 					{{ formatMessage(messages.action) }}

apps/frontend/src/components/ui/banner/TaxComplianceBanner.vue

@@ -55,7 +55,7 @@ function openTaxForm(e: MouseEvent) {
 				formatMessage(messages.description, { threshold: formatMoney(taxThreshold) })
 			}}</span>
 		</template>
-		<template #actions>
+		<template #actions_right>
 			<ButtonStyled color="orange">
 				<button @click="openTaxForm"><FileTextIcon /> {{ formatMessage(messages.action) }}</button>
 			</ButtonStyled>

apps/frontend/src/components/ui/banner/TaxIdMismatchBanner.vue

@@ -29,7 +29,7 @@ const messages = defineMessages({
 		<template #description>
 			<span>{{ formatMessage(messages.description) }}</span>
 		</template>
-		<template #actions>
+		<template #actions_right>
 			<div class="flex w-fit flex-row">
 				<ButtonStyled color="red">
 					<nuxt-link to="https://support.modrinth.com" target="_blank" rel="noopener">

apps/frontend/src/components/ui/banner/VerifyEmailBanner.vue

@@ -96,14 +96,12 @@ async function handleResendEmailVerification() {
 				}}
 			</span>
 		</template>
-		<template #actions>
-			<ButtonStyled v-if="hasEmail">
-				<button @click="handleResendEmailVerification">
+		<template #actions_right>
+			<ButtonStyled color="orange">
+				<button v-if="hasEmail" @click="handleResendEmailVerification">
 					{{ formatMessage(verifyEmailBannerMessages.action) }}
 				</button>
-			</ButtonStyled>
-			<ButtonStyled v-else>
-				<nuxt-link to="/settings/account">
+				<nuxt-link v-else to="/settings/account">
 					<SettingsIcon aria-hidden="true" />
 					{{ formatMessage(addEmailBannerMessages.action) }}
 				</nuxt-link>

apps/frontend/src/components/ui/banner/ViewOnModrinthBanner.vue

@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import { PagewideBanner } from '@modrinth/ui'
+
+const flags = useFeatureFlags()
+const route = useRoute()
+
+const url = computed(() => `https://modrinth.com${route.fullPath}`)
+
+const bannerRoot = ref<HTMLElement | null>(null)
+
+function onProdLinkClick(e: MouseEvent) {
+	e.preventDefault()
+	const el = bannerRoot.value
+	if (el) {
+		const { height } = el.getBoundingClientRect()
+		window.scrollBy({ top: Math.ceil(height), behavior: 'auto' })
+	}
+	window.open(url.value, '_blank', 'noopener,noreferrer')
+}
+</script>
+
+<template>
+	<div v-if="flags.showViewProdRouteBanner || flags.showAllBanners" ref="bannerRoot">
+		<PagewideBanner variant="info" slim>
+			<template #description>
+				<span>
+					View route on production:
+					<a
+						:href="url"
+						target="_blank"
+						rel="noopener noreferrer"
+						class="text-link"
+						@click="onProdLinkClick"
+					>
+						{{ url }}
+					</a>
+				</span>
+			</template>
+		</PagewideBanner>
+	</div>
+</template>

apps/frontend/src/components/ui/create-project-version/stages/DetailsStage.vue

@@ -46,7 +46,7 @@
 			/>
 		</div>
 		<div class="flex flex-col gap-2">
-			<span class="font-semibold text-contrast"> Version changlog </span>
+			<span class="font-semibold text-contrast"> Version changelog </span>
 
 			<div class="w-full">
 				<MarkdownEditor

apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayDetailsStage.vue

@@ -131,10 +131,9 @@
 				class="h-10"
 			/>
 
-			<StyledInput
+			<DatePicker
 				v-else-if="field.type === 'date'"
 				v-model="formData[field.name]"
-				type="date"
 				wrapper-class="w-full"
 			/>
 
@@ -230,6 +229,7 @@ import {
 	Admonition,
 	Checkbox,
 	Combobox,
+	DatePicker,
 	defineMessages,
 	financialMessages,
 	formFieldLabels,

apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayKycStage.vue

@@ -95,11 +95,11 @@
 							<span class="text-red">*</span>
 						</span>
 					</label>
-					<StyledInput
+					<DatePicker
 						v-model="formData.dateOfBirth"
-						type="date"
-						:max="maxDate"
+						:max-date="maxDate"
 						autocomplete="bday"
+						placeholder="Select date of birth"
 						wrapper-class="w-full"
 					/>
 				</div>
@@ -213,6 +213,7 @@
 import {
 	Chips,
 	Combobox,
+	DatePicker,
 	defineMessages,
 	formFieldLabels,
 	formFieldPlaceholders,

apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue

@@ -233,7 +233,7 @@ const visibleNags = computed<Nag[]>(() => {
 			link: {
 				path: 'moderation',
 				title: messages.visitModerationPage,
-				shouldShow: () => props.routeName !== 'type-id-moderation',
+				shouldShow: () => props.routeName !== 'type-project-moderation',
 			},
 		})
 	}

apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="shadow-card rounded-2xl border border-solid border-surface-5 bg-surface-3 p-4">
+	<div class="shadow-card rounded-2xl border border-solid border-surface-4 bg-surface-3 p-4">
 		<div class="flex items-center justify-between">
 			<div class="flex items-center gap-4">
 				<NuxtLink
@@ -48,6 +48,16 @@
 							<span class="text-sm text-secondary">Requesting</span>
 							<Badge :type="queueEntry.project.requested_status" class="text-sm" />
 						</div>
+						<div
+							v-if="showExternalDependencies"
+							v-tooltip="'External dependencies'"
+							class="flex items-center gap-1 rounded-full border border-solid border-surface-5 bg-surface-4 px-2.5 py-1"
+						>
+							<FileIcon aria-hidden="true" class="size-4 text-secondary" />
+							<span class="text-sm font-medium text-secondary">
+								{{ queueEntry.external_dependencies_count }}
+							</span>
+						</div>
 					</div>
 					<div v-if="queueEntry.ownership?.kind === 'user'">
 						<NuxtLink
@@ -107,8 +117,8 @@
 							<LinkIcon />
 						</button>
 					</ButtonStyled>
-					<ButtonStyled v-tooltip="'Begin review'" circular color="orange">
-						<button @click="openProjectForReview">
+					<ButtonStyled circular color="orange">
+						<button v-tooltip="'Begin review'" @click="openProjectForReview">
 							<ScaleIcon />
 						</button>
 					</ButtonStyled>
@@ -119,7 +129,7 @@
 </template>
 
 <script setup lang="ts">
-import { ClipboardCopyIcon, LinkIcon, ScaleIcon } from '@modrinth/assets'
+import { ClipboardCopyIcon, FileIcon, LinkIcon, ScaleIcon } from '@modrinth/assets'
 import {
 	Avatar,
 	Badge,
@@ -151,6 +161,7 @@ const formatDateTimeFull = useFormatDateTime({
 
 const props = defineProps<{
 	queueEntry: ModerationProject
+	showExternalDependencies?: boolean
 }>()
 
 const emit = defineEmits<{

apps/frontend/src/components/ui/moderation/ModerationReportCard.vue

@@ -143,7 +143,7 @@
 			:expand-text="expandText"
 			collapse-text="Collapse thread"
 		>
-			<div class="bg-surface-2 p-4 pt-2">
+			<div class="bg-surface-2 pt-2">
 				<ThreadView
 					v-if="threadWithReportBody"
 					ref="reportThread"

apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue

@@ -1075,6 +1075,7 @@ async function handleSubmitReview(verdict: 'safe' | 'unsafe') {
 				mode="local"
 				:links="navTabsLinks"
 				:active-index="activeTabIndex"
+				class="bg-surface-3! shadow-none!"
 				@tab-click="handleTabClick"
 			/>
 		</div>
@@ -1087,7 +1088,7 @@ async function handleSubmitReview(verdict: 'safe' | 'unsafe') {
 					collapse-text="Collapse thread"
 					class="border-x border-b border-solid border-surface-3"
 				>
-					<div class="bg-surface-2 p-4 pt-0">
+					<div class="bg-surface-2 pt-0">
 						<!-- DEV-531 -->
 						<!-- @vue-expect-error TODO: will convert ThreadView to use api-client types at a later date -->
 						<ThreadView

apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue

@@ -358,26 +358,44 @@
 
 							<div v-else-if="generatedMessage" class="flex items-center gap-2">
 								<ButtonStyled>
-									<button @click="goBackToStages">
+									<button :disabled="loadingModerationDecision" @click="goBackToStages">
 										<LeftArrowIcon aria-hidden="true" />
 										Edit
 									</button>
 								</ButtonStyled>
 								<ButtonStyled color="red">
-									<button @click="sendMessage('rejected')">
-										<XIcon aria-hidden="true" />
+									<button :disabled="loadingModerationDecision" @click="sendMessage('rejected')">
+										<SpinnerIcon
+											v-if="moderationDecision === 'rejected'"
+											class="animate-spin"
+											aria-hidden="true"
+										/>
+										<XIcon v-else aria-hidden="true" />
 										Reject
 									</button>
 								</ButtonStyled>
 								<ButtonStyled color="orange">
-									<button @click="sendMessage('withheld')">
-										<EyeOffIcon aria-hidden="true" />
+									<button :disabled="loadingModerationDecision" @click="sendMessage('withheld')">
+										<SpinnerIcon
+											v-if="moderationDecision === 'withheld'"
+											class="animate-spin"
+											aria-hidden="true"
+										/>
+										<LinkIcon v-else aria-hidden="true" />
 										Withhold
 									</button>
 								</ButtonStyled>
 								<ButtonStyled color="green">
-									<button @click="sendMessage(projectV2.requested_status ?? 'approved')">
-										<CheckIcon aria-hidden="true" />
+									<button
+										:disabled="loadingModerationDecision"
+										@click="sendMessage(approveSendStatus)"
+									>
+										<SpinnerIcon
+											v-if="moderationDecision === approveSendStatus"
+											class="animate-spin"
+											aria-hidden="true"
+										/>
+										<CheckIcon v-else aria-hidden="true" />
 										Approve
 									</button>
 								</ButtonStyled>
@@ -428,14 +446,15 @@ import {
 	BrushCleaningIcon,
 	CheckIcon,
 	DropdownIcon,
-	EyeOffIcon,
 	FileTextIcon,
 	KeyboardIcon,
 	LeftArrowIcon,
+	LinkIcon,
 	ListBulletedIcon,
 	LockIcon,
 	RightArrowIcon,
 	ScaleIcon,
+	SpinnerIcon,
 	ToggleLeftIcon,
 	ToggleRightIcon,
 	XIcon,
@@ -682,11 +701,11 @@ async function navigateToNextUnlockedProject(): Promise<boolean> {
 
 	// Quick re-check if close to expiry (last 5 seconds of TTL)
 	if (now - next.validatedAt > PREFETCH_STALE_MS - 5000) {
-		const recheck = await moderationQueue.checkLock(next.projectId)
-		if (recheck.locked && !recheck.expired) {
-			// Project got locked, remove from queue and try next
+		const recheckResults = await batchCheckQueueCandidates([next.projectId])
+		const recheck = recheckResults.get(next.projectId)
+		if (!isEligibleQueueCandidate(recheck)) {
 			prefetchQueue.value.shift()
-			return navigateToNextUnlockedProject() // Recurse to try next
+			return navigateToNextUnlockedProject()
 		}
 	}
 
@@ -698,33 +717,14 @@ async function navigateToNextUnlockedProject(): Promise<boolean> {
 		next.skippedIds.map((id) => moderationQueue.completeCurrentProject(id, 'skipped')),
 	)
 
-	if (next.skippedIds.length > 0) {
-		addNotification({
-			title: 'Skipped locked projects',
-			text: `Skipped ${next.skippedIds.length} project(s) being moderated by others.`,
-			type: 'info',
-		})
-	}
+	notifySkippedQueueProjects(next.skippedIds.length)
 
-	// Trigger prefetch replenishment in background (don't await)
 	maintainPrefetchQueue()
 
-	// Navigate to canonical URL if we have metadata (avoids middleware redirect)
-	if (next.slug && next.projectType) {
-		const urlType = getProjectTypeForUrlShorthand(next.projectType, [], tags.value)
-
-		navigateTo({
-			path: `/${urlType}/${next.slug}`,
-			state: { showChecklist: true },
-		})
-	} else {
-		// Fallback: use project ID (will trigger middleware redirect)
-		navigateTo({
-			name: 'type-id',
-			params: { type: 'project', id: next.projectId },
-			state: { showChecklist: true },
-		})
-	}
+	navigateToQueueProject(
+		{ slug: next.slug, projectType: next.projectType, locked: false, isProcessing: true },
+		next.projectId,
+	)
 	return true
 }
 
@@ -760,6 +760,12 @@ const message = ref(
 )
 const generatedMessage = ref(persistedGeneratedMessage.generated === true)
 const loadingMessage = ref(false)
+const moderationDecision = ref<ProjectStatus | null>(null)
+const loadingModerationDecision = computed(() => moderationDecision.value !== null)
+const approveSendStatus = computed<ProjectStatus>(() => {
+	const requested = projectV2.value.requested_status
+	return requested ?? 'approved'
+})
 const done = ref(false)
 
 function persistGeneratedMessageState() {
@@ -844,53 +850,108 @@ function reviewAnyway() {
 	maintainPrefetchQueue()
 }
 
-// Batch check locks and fetch project metadata in parallel
-interface LockCheckResult {
+// Batch check locks, processing status, and fetch project metadata in parallel
+interface QueueCandidateCheck {
 	locked: boolean
 	expired?: boolean
 	isOwnLock?: boolean
 	slug?: string
 	projectType?: string
+	status?: string
+	isProcessing: boolean
 }
 
-async function batchCheckLocksWithMetadata(
+function isEligibleQueueCandidate(result: QueueCandidateCheck | undefined): boolean {
+	if (!result?.isProcessing) return false
+	return !result.locked || !!result.expired || !!result.isOwnLock
+}
+
+function notifySkippedQueueProjects(count: number) {
+	if (count <= 0) return
+	addNotification({
+		title: 'Skipped projects',
+		text: `Skipped ${count} project(s) already moderated or locked by others.`,
+		type: 'info',
+		autoCloseMs: 2000,
+	})
+}
+
+function navigateToQueueProject(result: QueueCandidateCheck, projectId: string) {
+	if (result.slug && result.projectType) {
+		const urlType = getProjectTypeForUrlShorthand(result.projectType, [], tags.value)
+		navigateTo({
+			path: `/${urlType}/${result.slug}`,
+			state: { showChecklist: true },
+		})
+	} else {
+		navigateTo({
+			name: 'type-project',
+			params: { type: 'project', project: projectId },
+			state: { showChecklist: true },
+		})
+	}
+}
+
+async function batchCheckQueueCandidates(
 	projectIds: string[],
-): Promise<Map<string, LockCheckResult>> {
-	const results = new Map<string, LockCheckResult>()
+): Promise<Map<string, QueueCandidateCheck>> {
+	const results = new Map<string, QueueCandidateCheck>()
 
-	// Check locks and fetch minimal project data in parallel
 	const checks = await Promise.allSettled(
 		projectIds.map(async (id) => {
-			// Parallel: check lock AND fetch project metadata
 			const [lockResponse, projectData] = await Promise.all([
 				moderationQueue.checkLock(id),
 				useBaseFetch(`project/${id}`, { method: 'GET' }).catch(() => null),
 			])
 
+			const status = (projectData as { status?: string } | null)?.status
+
 			return {
 				id,
 				locked: lockResponse.locked,
 				expired: lockResponse.expired,
 				isOwnLock: lockResponse.is_own_lock,
-				slug: (projectData as { slug?: string })?.slug,
-				projectType: (projectData as { project_type?: string })?.project_type,
+				slug: (projectData as { slug?: string } | null)?.slug,
+				projectType: (projectData as { project_type?: string } | null)?.project_type,
+				status,
+				isProcessing: projectData === null ? true : status === 'processing',
 			}
 		}),
 	)
 
-	// Use forEach with index to avoid indexOf bug on PromiseSettledResult
 	checks.forEach((result, index) => {
 		if (result.status === 'fulfilled') {
 			results.set(result.value.id, result.value)
 		} else {
-			// On error, mark as needing fallback (no metadata)
-			results.set(projectIds[index], { locked: false })
+			results.set(projectIds[index], { locked: false, isProcessing: true })
 		}
 	})
 
 	return results
 }
 
+async function findNextEligibleQueueProject(candidateIds: string[]) {
+	const skippedIds: string[] = []
+	let checkedCount = 0
+
+	while (checkedCount < candidateIds.length) {
+		const batch = candidateIds.slice(checkedCount, checkedCount + PREFETCH_BATCH_SIZE)
+		checkedCount += batch.length
+
+		const results = await batchCheckQueueCandidates(batch)
+
+		for (const id of batch) {
+			const result = results.get(id)
+			if (isEligibleQueueCandidate(result)) {
+				return { projectId: id, result: result!, skippedIds: [...skippedIds] }
+			}
+			skippedIds.push(id)
+		}
+	}
+
+	return null
+}
+
 // Maintain a queue of prefetched unlocked projects for instant navigation
 async function maintainPrefetchQueue() {
 	if (isPrefetching.value) return
@@ -922,13 +983,10 @@ async function maintainPrefetchQueue() {
 		const remainingItems =
 			currentIndex >= 0 ? queueItems.slice(currentIndex + 1) : queueItems.slice(1)
 
-		const candidateIds = remainingItems
-			.filter((id) => !prefetchedIds.has(id))
-			.slice(0, PREFETCH_BATCH_SIZE * 2) // Check up to 10 candidates
+		const candidateIds = remainingItems.filter((id) => !prefetchedIds.has(id))
 
 		if (candidateIds.length === 0) return
 
-		// 5. Batch check locks AND fetch metadata in parallel
 		const skippedIds: string[] = []
 		let checkedCount = 0
 
@@ -939,31 +997,18 @@ async function maintainPrefetchQueue() {
 			const batch = candidateIds.slice(checkedCount, checkedCount + PREFETCH_BATCH_SIZE)
 			checkedCount += batch.length
 
-			const results = await batchCheckLocksWithMetadata(batch)
+			const results = await batchCheckQueueCandidates(batch)
 
 			for (const id of batch) {
 				const result = results.get(id)
-				// Treat as unlocked if: not locked, OR expired, OR it's our own lock
-				if (!result?.locked || result?.expired || result?.isOwnLock) {
-					// Found unlocked project with metadata
-					if (result?.slug && result?.projectType) {
-						prefetchQueue.value.push({
-							projectId: id,
-							slug: result.slug,
-							projectType: result.projectType,
-							validatedAt: Date.now(),
-							skippedIds: [...skippedIds],
-						})
-					} else {
-						// No metadata - still add but will need fallback navigation
-						prefetchQueue.value.push({
-							projectId: id,
-							slug: '', // Empty = use fallback
-							projectType: '',
-							validatedAt: Date.now(),
-							skippedIds: [...skippedIds],
-						})
-					}
+				if (isEligibleQueueCandidate(result)) {
+					prefetchQueue.value.push({
+						projectId: id,
+						slug: result?.slug ?? '',
+						projectType: result?.projectType ?? '',
+						validatedAt: Date.now(),
+						skippedIds: [...skippedIds],
+					})
 
 					if (prefetchQueue.value.length >= PREFETCH_TARGET_COUNT) break
 				} else {
@@ -979,8 +1024,6 @@ async function maintainPrefetchQueue() {
 // Debounced prefetch to prevent spam from rapid stage changes
 const debouncedPrefetch = useDebounceFn(maintainPrefetchQueue, 300)
 
-const MAX_SKIP_ATTEMPTS = 10
-
 async function skipToNextProject() {
 	// Skip the current project
 	const currentProjectId = projectV2.value?.id
@@ -1004,60 +1047,28 @@ async function skipToNextProject() {
 
 	debug('[skipToNextProject] No prefetch, entering fallback with batch checking')
 
-	// Fallback: batch check remaining projects with metadata (excluding current)
-	const remainingIds: string[] = []
-	const queueItems = moderationQueue.currentQueue.items
-
-	// Build list of remaining projects, excluding current
-	for (const id of queueItems) {
-		if (id === currentProjectId) continue
-		if (remainingIds.length >= MAX_SKIP_ATTEMPTS) break
-		remainingIds.push(id)
-	}
+	const remainingIds = moderationQueue.currentQueue.items.filter((id) => id !== currentProjectId)
 
 	if (remainingIds.length > 0) {
-		const results = await batchCheckLocksWithMetadata(remainingIds)
+		const next = await findNextEligibleQueueProject(remainingIds)
 
-		let skippedCount = 0
-		for (const id of remainingIds) {
-			const result = results.get(id)
-			// Treat as unlocked if: not locked, OR expired, OR it's our own lock
-			if (!result?.locked || result?.expired || result?.isOwnLock) {
-				// Found unlocked - skip the locked ones before it
-				if (skippedCount > 0) {
-					addNotification({
-						title: 'Skipped locked projects',
-						text: `Skipped ${skippedCount} project(s) being moderated by others.`,
-						type: 'info',
-					})
-				}
-
-				// Navigate to canonical URL if we have metadata
-				if (result?.slug && result?.projectType) {
-					const urlType = getProjectTypeForUrlShorthand(result.projectType, [], tags.value)
-					navigateTo({
-						path: `/${urlType}/${result.slug}`,
-						state: { showChecklist: true },
-					})
-				} else {
-					// Fallback: use project ID
-					navigateTo({
-						name: 'type-id',
-						params: { type: 'project', id },
-						state: { showChecklist: true },
-					})
-				}
-				return
-			}
-			await moderationQueue.completeCurrentProject(id, 'skipped')
-			skippedCount++
+		if (next) {
+			await Promise.all(
+				next.skippedIds.map((id) => moderationQueue.completeCurrentProject(id, 'skipped')),
+			)
+			notifySkippedQueueProjects(next.skippedIds.length)
+			navigateToQueueProject(next.result, next.projectId)
+			return
 		}
 
-		// All checked were locked
-		debug('[skipToNextProject] All projects were locked, skippedCount:', skippedCount)
+		await Promise.all(
+			remainingIds.map((id) => moderationQueue.completeCurrentProject(id, 'skipped')),
+		)
+
+		debug('[skipToNextProject] No eligible projects in queue')
 		addNotification({
-			title: 'All projects locked',
-			text: 'All remaining projects are currently being moderated by others.',
+			title: 'No projects available',
+			text: 'All remaining projects are already moderated or locked by others.',
 			type: 'warning',
 		})
 	}
@@ -1074,6 +1085,7 @@ function resetProgress() {
 	done.value = false
 	clearGeneratedMessageState()
 	loadingMessage.value = false
+	moderationDecision.value = null
 
 	localStorage.removeItem(`modpack-permissions-${projectV2.value.id}`)
 	localStorage.removeItem(`modpack-permissions-index-${projectV2.value.id}`)
@@ -1190,7 +1202,7 @@ function handleKeybinds(event: KeyboardEvent) {
 				tryResetProgress: resetProgress,
 				tryExitModeration: handleExit,
 
-				tryApprove: () => sendMessage(projectV2.value.requested_status ?? 'approved'),
+				tryApprove: () => sendMessage(approveSendStatus.value),
 				tryReject: () => sendMessage('rejected'),
 				tryWithhold: () => sendMessage('withheld'),
 				tryEditMessage: goBackToStages,
@@ -1272,32 +1284,16 @@ onMounted(async () => {
 	document.addEventListener('visibilitychange', handleVisibilityChange)
 	notifications.setNotificationLocation('left')
 
-	// Check if project has already been reviewed (not in processing status)
 	if (projectV2.value.status !== 'processing') {
 		alreadyReviewed.value = true
 		return
 	}
 
-	// Try to acquire lock
 	const result = await moderationQueue.acquireLock(projectV2.value.id)
 
 	if (result.success) {
 		handleLockAcquired()
 	} else if (result.locked_by) {
-		// Actually locked by another moderator
-		// In queue mode with more projects - auto-skip to next project
-		if (moderationQueue.isQueueMode && moderationQueue.queueLength > 1) {
-			addNotification({
-				title: 'Project locked',
-				text: `Skipped project locked by @${result.locked_by.username}.`,
-				type: 'info',
-			})
-			// skipToNextProject already calls completeCurrentProject
-			await skipToNextProject()
-			return
-		}
-
-		// Single project mode or last in queue - show locked UI
 		lockStatus.value = {
 			locked: true,
 			lockedBy: result.locked_by,
@@ -1977,6 +1973,7 @@ async function sendMessage(status: ProjectStatus) {
 		return
 	}
 
+	moderationDecision.value = status
 	try {
 		await useBaseFetch(`project/${projectId}`, {
 			method: 'PATCH',
@@ -2026,6 +2023,8 @@ async function sendMessage(status: ProjectStatus) {
 			text: 'Failed to submit moderation decision. Please try again.',
 			type: 'error',
 		})
+	} finally {
+		moderationDecision.value = null
 	}
 }
 
@@ -2056,72 +2055,36 @@ async function endChecklist(status?: string) {
 			})
 		}
 	} else {
-		// Use prefetched data if available for instant navigation
 		if (!(await navigateToNextUnlockedProject())) {
-			// Fallback: batch check remaining projects with metadata
-			const remainingIds: string[] = []
 			const currentProjectId = projectV2.value?.id
-			const queueItems = moderationQueue.currentQueue.items
+			const remainingIds = moderationQueue.currentQueue.items.filter(
+				(id) => id !== currentProjectId,
+			)
 
-			// Build list of remaining projects, excluding current
-			for (const id of queueItems) {
-				if (id === currentProjectId) continue
-				if (remainingIds.length >= MAX_SKIP_ATTEMPTS) break
-				remainingIds.push(id)
-			}
-
-			let foundUnlocked = false
+			let foundEligible = false
 			if (remainingIds.length > 0) {
-				const results = await batchCheckLocksWithMetadata(remainingIds)
+				const next = await findNextEligibleQueueProject(remainingIds)
 
-				let skippedCount = 0
-				for (const id of remainingIds) {
-					const result = results.get(id)
-					// Treat as unlocked if: not locked, OR expired, OR it's our own lock
-					if (!result?.locked || result?.expired || result?.isOwnLock) {
-						// Found unlocked - skip the locked ones before it
-						if (skippedCount > 0) {
-							addNotification({
-								title: 'Skipped locked projects',
-								text: `Skipped ${skippedCount} project(s) being moderated by others.`,
-								type: 'info',
-							})
-						}
-
-						// Navigate to canonical URL if we have metadata
-						if (result?.slug && result?.projectType) {
-							const urlType = getProjectTypeForUrlShorthand(result.projectType, [], tags.value)
-							navigateTo({
-								path: `/${urlType}/${result.slug}`,
-								state: { showChecklist: true },
-							})
-						} else {
-							// Fallback: use project ID
-							navigateTo({
-								name: 'type-id',
-								params: { type: 'project', id },
-								state: { showChecklist: true },
-							})
-						}
-						foundUnlocked = true
-						break
-					}
-					await moderationQueue.completeCurrentProject(id, 'skipped')
-					skippedCount++
-				}
-
-				// If no unlocked projects found, show notification
-				if (!foundUnlocked && skippedCount > 0) {
+				if (next) {
+					await Promise.all(
+						next.skippedIds.map((id) => moderationQueue.completeCurrentProject(id, 'skipped')),
+					)
+					notifySkippedQueueProjects(next.skippedIds.length)
+					navigateToQueueProject(next.result, next.projectId)
+					foundEligible = true
+				} else {
+					await Promise.all(
+						remainingIds.map((id) => moderationQueue.completeCurrentProject(id, 'skipped')),
+					)
 					addNotification({
-						title: 'All projects locked',
-						text: 'All remaining projects are currently being moderated by others.',
+						title: 'No projects available',
+						text: 'All remaining projects are already moderated or locked by others.',
 						type: 'warning',
 					})
 				}
 			}
 
-			// If no unlocked projects found, go back to moderation queue
-			if (!foundUnlocked) {
+			if (!foundEligible) {
 				await navigateTo({
 					name: 'moderation',
 				})

apps/frontend/src/components/ui/report/ReportView.vue

@@ -1,17 +1,31 @@
 <template>
 	<div>
-		<section class="universal-card">
+		<section>
 			<Breadcrumbs
 				v-if="breadcrumbsStack"
 				:current-title="`Report ${reportId}`"
 				:link-stack="breadcrumbsStack"
 			/>
 			<h2>Report details</h2>
-			<ReportInfo :report="report" :show-thread="false" :show-message="false" :auth="auth" />
+			<ReportInfo
+				:report="report"
+				:show-thread="false"
+				:show-message="false"
+				:auth="auth"
+				class="card-shadow mb-4 rounded-2xl border border-solid border-surface-4 bg-surface-2 p-4"
+			/>
 		</section>
-		<section v-if="report && thread" class="universal-card">
-			<h2>Messages</h2>
+		<section
+			v-if="report && thread"
+			class="card-shadow rounded-2xl border border-solid border-surface-4 bg-surface-3"
+		>
+			<h2 class="m-4 mb-2 text-xl font-semibold text-contrast">Messages with the moderators</h2>
+			<p class="mx-4 mt-0">
+				Make sure to include evidence of all claims you make, or your report may be closed without
+				action.
+			</p>
 			<ConversationThread
+				class="overflow-clip rounded-b-2xl border-0 border-t border-solid border-surface-4 bg-surface-2"
 				:thread="thread"
 				:report="report"
 				:auth="auth"

apps/frontend/src/components/ui/thread/ConversationThread.vue

@@ -1,28 +1,45 @@
 <template>
 	<div>
-		<Modal
+		<NewModal
 			ref="modalSubmit"
-			:header="isRejected(project) ? 'Resubmit for review' : 'Submit for review'"
+			:header="
+				formatMessage(
+					isRejected(project)
+						? messages.resubmitModalHeaderResubmitting
+						: messages.resubmitModalHeaderSubmitting,
+				)
+			"
 		>
-			<div class="modal-submit universal-body">
-				<span>
-					You're submitting <span class="project-title">{{ project.title }}</span> to be reviewed
-					again by the moderators.
-				</span>
-				<span>
-					Make sure you have addressed the comments from the moderation team.
-					<span class="known-errors">
-						Repeated submissions without addressing the moderators' comments may result in an
-						account suspension.
-					</span>
-				</span>
+			<div class="flex max-w-[35rem] flex-col gap-3">
+				<p class="m-0">
+					<IntlFormatted
+						:message-id="messages.resubmitModalDescription"
+						:message-values="{ projectTitle: project.title }"
+					>
+						<template #project-title="{ children }">
+							<span class="font-semibold text-contrast">
+								<component :is="() => children" />
+							</span>
+						</template>
+					</IntlFormatted>
+				</p>
+				<p class="m-0">{{ formatMessage(messages.resubmitModalReminder) }}</p>
+				<p class="m-0 font-semibold text-red">
+					{{ formatMessage(messages.resubmitModalWarning) }}
+				</p>
 				<Checkbox
 					v-model="submissionConfirmation"
-					description="Confirm I have addressed the messages from the moderators"
+					:description="formatMessage(messages.resubmitModalConfirmationDescription)"
 				>
-					I confirm that I have properly addressed the moderators' comments.
+					{{ formatMessage(messages.resubmitModalConfirmationLabel) }}
 				</Checkbox>
-				<div class="input-group push-right">
+				<div class="flex flex-wrap items-center justify-end gap-2">
+					<ButtonStyled type="outlined">
+						<button @click="modalSubmit.hide()">
+							<XIcon aria-hidden="true" />
+							{{ formatMessage(commonMessages.cancelButton) }}
+						</button>
+					</ButtonStyled>
 					<ButtonStyled color="orange">
 						<button
 							:disabled="!submissionConfirmation || isLoading"
@@ -34,33 +51,37 @@
 								aria-hidden="true"
 							/>
 							<ScaleIcon v-else aria-hidden="true" />
-							Resubmit for review
+							{{ formatMessage(messages.actionResubmitForReview) }}
 						</button>
 					</ButtonStyled>
 				</div>
 			</div>
-		</Modal>
-		<Modal ref="modalReply" header="Reply to thread">
-			<div class="modal-submit universal-body">
-				<span>
-					Your project is already approved. As such, the moderation team does not actively monitor
-					this thread. However, they may still see your message if there is a problem with your
-					project.
-				</span>
-				<span>
-					If you need to get in contact with the moderation team, please use the
-					<a class="text-link" href="https://support.modrinth.com" target="_blank">
-						Modrinth Help Center
-					</a>
-					and click the green bubble to contact support.
-				</span>
+		</NewModal>
+		<NewModal ref="modalReply" :header="formatMessage(messages.replyModalHeader)">
+			<div class="flex max-w-[45rem] flex-col gap-3">
+				<p class="m-0">{{ formatMessage(messages.replyModalDescription) }}</p>
+				<p class="m-0">
+					<IntlFormatted :message-id="messages.replyModalHelpCenterNote">
+						<template #help-center-link="{ children }">
+							<a class="text-link" href="https://support.modrinth.com" target="_blank">
+								<component :is="() => children" />
+							</a>
+						</template>
+					</IntlFormatted>
+				</p>
 				<Checkbox
 					v-model="replyConfirmation"
-					description="Confirm moderators do not actively monitor this"
+					:description="formatMessage(messages.replyModalConfirmationDescription)"
 				>
-					I acknowledge that the moderators do not actively monitor the thread.
+					{{ formatMessage(messages.replyModalConfirmationLabel) }}
 				</Checkbox>
-				<div class="input-group push-right">
+				<div class="flex flex-wrap items-center justify-end gap-2">
+					<ButtonStyled type="outlined">
+						<button @click="modalReply.hide()">
+							<XIcon aria-hidden="true" />
+							{{ formatMessage(commonMessages.cancelButton) }}
+						</button>
+					</ButtonStyled>
 					<ButtonStyled color="brand">
 						<button
 							:disabled="!replyConfirmation || isLoading"
@@ -72,289 +93,318 @@
 								aria-hidden="true"
 							/>
 							<ReplyIcon v-else aria-hidden="true" />
-							Reply to thread
+							{{ formatMessage(messages.actionReplyToThread) }}
 						</button>
 					</ButtonStyled>
 				</div>
 			</div>
-		</Modal>
-		<div v-if="flags.developerMode" class="thread-id">
+		</NewModal>
+		<div v-if="flags.developerMode" class="mx-4 mb-3 font-semibold">
 			Thread ID:
 			<CopyCode :text="thread.id" />
 		</div>
-		<div v-if="sortedMessages.length > 0" class="messages universal-card recessed">
-			<ThreadMessage
-				v-for="message in sortedMessages"
-				:key="'message-' + message.id"
-				:thread="thread"
-				:message="message"
-				:members="members"
-				:report="report"
-				:auth="auth"
-				raised
-				@update-thread="() => updateThreadLocal()"
-			/>
-		</div>
-		<template v-if="report && report.closed">
-			<p>This thread is closed and new messages cannot be sent to it.</p>
-			<ButtonStyled v-if="isStaff(auth.user)">
-				<button :disabled="isLoading" @click="runBlockingAction('reopen', () => reopenReport())">
-					<SpinnerIcon v-if="loadingAction === 'reopen'" class="animate-spin" aria-hidden="true" />
-					<CheckCircleIcon v-else aria-hidden="true" />
-					Reopen thread
-				</button>
-			</ButtonStyled>
-		</template>
-		<template v-else-if="!report || !report.closed">
-			<div class="markdown-editor-spacing">
-				<MarkdownEditor
-					v-model="replyBody"
-					:placeholder="sortedMessages.length > 0 ? 'Reply to thread...' : 'Send a message...'"
-					:on-image-upload="onUploadImage"
+		<div v-bind="$attrs" class="flex flex-col">
+			<div v-if="sortedMessages.length > 0" class="flex flex-col pt-2">
+				<ThreadMessage
+					v-for="message in sortedMessages"
+					:key="'message-' + message.id"
+					:thread="thread"
+					:message="message"
+					:members="members"
+					:report="report"
+					:auth="auth"
+					raised
+					@update-thread="() => updateThreadLocal()"
 				/>
 			</div>
-			<div class="input-group">
-				<ButtonStyled color="brand">
-					<button
-						v-if="sortedMessages.length > 0"
-						:disabled="!replyBody || isLoading"
-						@click="
-							isApproved(project) && !isStaff(auth.user)
-								? openReplyModal()
-								: runBlockingAction('reply', () => sendReply())
-						"
-					>
-						<SpinnerIcon v-if="loadingAction === 'reply'" class="animate-spin" aria-hidden="true" />
-						<ReplyIcon v-else aria-hidden="true" />
-						Reply
-					</button>
-					<button
-						v-else
-						:disabled="!replyBody || isLoading"
-						@click="
-							isApproved(project) && !isStaff(auth.user)
-								? openReplyModal()
-								: runBlockingAction('send', () => sendReply())
-						"
-					>
-						<SpinnerIcon v-if="loadingAction === 'send'" class="animate-spin" aria-hidden="true" />
-						<SendIcon v-else aria-hidden="true" />
-						Send
-					</button>
-				</ButtonStyled>
+			<template v-if="report && report.closed">
+				<p>{{ formatMessage(messages.closedThreadDescription) }}</p>
 				<ButtonStyled v-if="isStaff(auth.user)">
-					<button
-						:disabled="!replyBody || isLoading"
-						@click="runBlockingAction('private-note', () => sendReply(null, true))"
-					>
+					<button :disabled="isLoading" @click="runBlockingAction('reopen', () => reopenReport())">
 						<SpinnerIcon
-							v-if="loadingAction === 'private-note'"
+							v-if="loadingAction === 'reopen'"
 							class="animate-spin"
 							aria-hidden="true"
 						/>
-						<ScaleIcon v-else aria-hidden="true" />
-						Add private note
+						<CheckCircleIcon v-else aria-hidden="true" />
+						{{ formatMessage(messages.actionReopenThread) }}
 					</button>
 				</ButtonStyled>
-				<template v-if="currentMember && !isStaff(auth.user)">
-					<template v-if="isRejected(project)">
-						<ButtonStyled color="orange">
-							<button v-if="replyBody" :disabled="isLoading" @click="openResubmitModal(true)">
-								<ScaleIcon aria-hidden="true" />
-								Resubmit for review with reply
+			</template>
+			<template v-else-if="!report || !report.closed">
+				<div class="mx-4 mb-2 mt-2">
+					<MarkdownEditor
+						v-model="replyBody"
+						:placeholder="
+							formatMessage(
+								sortedMessages.length > 0
+									? messages.replyEditorPlaceholderReply
+									: messages.replyEditorPlaceholderSend,
+							)
+						"
+						:on-image-upload="onUploadImage"
+					/>
+				</div>
+				<div class="m-4 mt-3 flex flex-wrap items-center justify-between gap-4">
+					<div class="flex flex-wrap items-center gap-2">
+						<ButtonStyled color="brand">
+							<button
+								v-if="sortedMessages.length > 0"
+								:disabled="!replyBody || isLoading"
+								@click="
+									isApproved(project)
+										? openReplyModal()
+										: runBlockingAction('reply', () => sendReply())
+								"
+							>
+								<SpinnerIcon
+									v-if="loadingAction === 'reply'"
+									class="animate-spin"
+									aria-hidden="true"
+								/>
+								<ReplyIcon v-else aria-hidden="true" />
+								{{ formatMessage(messages.actionReply) }}
 							</button>
-							<button v-else :disabled="isLoading" @click="openResubmitModal(false)">
-								<ScaleIcon aria-hidden="true" />
-								Resubmit for review
+							<button
+								v-else
+								:disabled="!replyBody || isLoading"
+								@click="
+									isApproved(project)
+										? openReplyModal()
+										: runBlockingAction('send', () => sendReply())
+								"
+							>
+								<SpinnerIcon
+									v-if="loadingAction === 'send'"
+									class="animate-spin"
+									aria-hidden="true"
+								/>
+								<SendIcon v-else aria-hidden="true" />
+								{{ formatMessage(messages.actionSend) }}
 							</button>
 						</ButtonStyled>
-					</template>
-				</template>
-				<div class="spacer"></div>
-				<div class="input-group extra-options">
-					<template v-if="report">
-						<template v-if="isStaff(auth.user)">
-							<ButtonStyled color="red">
-								<button
-									v-if="replyBody"
-									:disabled="isLoading"
-									@click="runBlockingAction('close-with-reply', () => closeReport(true))"
-								>
-									<SpinnerIcon
-										v-if="loadingAction === 'close-with-reply'"
-										class="animate-spin"
-										aria-hidden="true"
-									/>
-									<CheckCircleIcon v-else aria-hidden="true" />
-									Close with reply
-								</button>
-								<button
-									v-else
-									:disabled="isLoading"
-									@click="runBlockingAction('close', () => closeReport())"
-								>
-									<SpinnerIcon
-										v-if="loadingAction === 'close'"
-										class="animate-spin"
-										aria-hidden="true"
-									/>
-									<CheckCircleIcon v-else aria-hidden="true" />
-									Close thread
-								</button>
-							</ButtonStyled>
+						<ButtonStyled v-if="isStaff(auth.user)">
+							<button
+								:disabled="!replyBody || isLoading"
+								@click="runBlockingAction('private-note', () => sendReply(null, true))"
+							>
+								<SpinnerIcon
+									v-if="loadingAction === 'private-note'"
+									class="animate-spin"
+									aria-hidden="true"
+								/>
+								<ScaleIcon v-else aria-hidden="true" />
+								{{ formatMessage(messages.actionAddPrivateNote) }}
+							</button>
+						</ButtonStyled>
+						<template v-if="currentMember && !currentMember.staffOnly">
+							<template v-if="isRejected(project)">
+								<ButtonStyled color="orange">
+									<button v-if="replyBody" :disabled="isLoading" @click="openResubmitModal(true)">
+										<ScaleIcon aria-hidden="true" />
+										{{ formatMessage(messages.actionResubmitForReviewWithReply) }}
+									</button>
+									<button v-else :disabled="isLoading" @click="openResubmitModal(false)">
+										<ScaleIcon aria-hidden="true" />
+										{{ formatMessage(messages.actionResubmitForReview) }}
+									</button>
+								</ButtonStyled>
+							</template>
 						</template>
-					</template>
-					<template v-if="project">
-						<template v-if="isStaff(auth.user)">
-							<ButtonStyled v-if="replyBody" color="green">
-								<button
-									:disabled="isApproved(project) || isLoading"
-									@click="runBlockingAction('approve-with-reply', () => sendReply(requestedStatus))"
-								>
-									<SpinnerIcon
-										v-if="loadingAction === 'approve-with-reply'"
-										class="animate-spin"
-										aria-hidden="true"
-									/>
-									<CheckIcon v-else aria-hidden="true" />
-									Approve with reply
-								</button>
-							</ButtonStyled>
-							<ButtonStyled v-else color="green">
-								<button
-									:disabled="isApproved(project) || isLoading"
-									@click="runBlockingAction('approve', () => setStatus(requestedStatus))"
-								>
-									<SpinnerIcon
-										v-if="loadingAction === 'approve'"
-										class="animate-spin"
-										aria-hidden="true"
-									/>
-									<CheckIcon v-else aria-hidden="true" />
-									Approve
-								</button>
-							</ButtonStyled>
-							<div class="joined-buttons">
-								<ButtonStyled v-if="replyBody" color="red">
-									<button
-										:disabled="project.status === 'rejected' || isLoading"
-										@click="runBlockingAction('reject-with-reply', () => sendReply('rejected'))"
-									>
-										<SpinnerIcon
-											v-if="loadingAction === 'reject-with-reply'"
-											class="animate-spin"
-											aria-hidden="true"
-										/>
-										<XIcon v-else aria-hidden="true" />
-										Reject with reply
-									</button>
-								</ButtonStyled>
-								<ButtonStyled v-else color="red">
-									<button
-										:disabled="project.status === 'rejected' || isLoading"
-										@click="runBlockingAction('reject', () => setStatus('rejected'))"
-									>
-										<SpinnerIcon
-											v-if="loadingAction === 'reject'"
-											class="animate-spin"
-											aria-hidden="true"
-										/>
-										<XIcon v-else aria-hidden="true" />
-										Reject
-									</button>
-								</ButtonStyled>
+					</div>
+					<div class="flex flex-wrap items-center gap-2">
+						<template v-if="report">
+							<template v-if="isStaff(auth.user)">
 								<ButtonStyled color="red">
-									<OverflowMenu
-										class="btn-dropdown-animation"
+									<button
+										v-if="replyBody"
 										:disabled="isLoading"
-										:options="
-											replyBody
-												? [
-														{
-															id: 'withhold-reply',
-															color: 'danger',
-															action: () =>
-																runBlockingAction('withhold-reply', () => sendReply('withheld')),
-															hoverFilled: true,
-															disabled: project.status === 'withheld' || isLoading,
-														},
-														{
-															id: 'set-to-draft-reply',
-															action: () =>
-																runBlockingAction('set-to-draft-reply', () => sendReply('draft')),
-															hoverFilled: true,
-															disabled: project.status === 'draft' || isLoading,
-														},
-														{
-															id: 'send-to-review-reply',
-															action: () =>
-																runBlockingAction('send-to-review-reply', () =>
-																	sendReply('processing', true),
-																),
-															hoverFilled: true,
-															disabled: project.status === 'processing' || isLoading,
-														},
-													]
-												: [
-														{
-															id: 'withhold',
-															color: 'danger',
-															action: () =>
-																runBlockingAction('withhold', () => setStatus('withheld')),
-															hoverFilled: true,
-															disabled: project.status === 'withheld' || isLoading,
-														},
-														{
-															id: 'set-to-draft',
-															action: () =>
-																runBlockingAction('set-to-draft', () => setStatus('draft')),
-															hoverFilled: true,
-															disabled: project.status === 'draft' || isLoading,
-														},
-														{
-															id: 'send-to-review',
-															action: () =>
-																runBlockingAction('send-to-review', () => setStatus('processing')),
-															hoverFilled: true,
-															disabled: project.status === 'processing' || isLoading,
-														},
-													]
+										@click="runBlockingAction('close-with-reply', () => closeReport(true))"
+									>
+										<SpinnerIcon
+											v-if="loadingAction === 'close-with-reply'"
+											class="animate-spin"
+											aria-hidden="true"
+										/>
+										<CheckCircleIcon v-else aria-hidden="true" />
+										{{ formatMessage(messages.actionCloseWithReply) }}
+									</button>
+									<button
+										v-else
+										:disabled="isLoading"
+										@click="runBlockingAction('close', () => closeReport())"
+									>
+										<SpinnerIcon
+											v-if="loadingAction === 'close'"
+											class="animate-spin"
+											aria-hidden="true"
+										/>
+										<CheckCircleIcon v-else aria-hidden="true" />
+										{{ formatMessage(messages.actionCloseThread) }}
+									</button>
+								</ButtonStyled>
+							</template>
+						</template>
+						<template v-if="project">
+							<template v-if="isStaff(auth.user)">
+								<ButtonStyled v-if="replyBody" color="green">
+									<button
+										:disabled="isApproved(project) || isLoading"
+										@click="
+											runBlockingAction('approve-with-reply', () => sendReply(requestedStatus))
 										"
 									>
-										<SpinnerIcon v-if="isDropdownLoading" class="animate-spin" aria-hidden="true" />
-										<DropdownIcon v-else aria-hidden="true" />
-										<template #withhold-reply>
-											<EyeOffIcon aria-hidden="true" />
-											Withhold with reply
-										</template>
-										<template #withhold>
-											<EyeOffIcon aria-hidden="true" />
-											Withhold
-										</template>
-										<template #set-to-draft-reply>
-											<FileTextIcon aria-hidden="true" />
-											Set to draft with reply
-										</template>
-										<template #set-to-draft>
-											<FileTextIcon aria-hidden="true" />
-											Set to draft
-										</template>
-										<template #send-to-review-reply>
-											<ScaleIcon aria-hidden="true" />
-											Send to review with reply
-										</template>
-										<template #send-to-review>
-											<ScaleIcon aria-hidden="true" />
-											Send to review
-										</template>
-									</OverflowMenu>
+										<SpinnerIcon
+											v-if="loadingAction === 'approve-with-reply'"
+											class="animate-spin"
+											aria-hidden="true"
+										/>
+										<CheckIcon v-else aria-hidden="true" />
+										{{ formatMessage(messages.actionApproveWithReply) }}
+									</button>
 								</ButtonStyled>
-							</div>
+								<ButtonStyled v-else color="green">
+									<button
+										:disabled="isApproved(project) || isLoading"
+										@click="runBlockingAction('approve', () => setStatus(requestedStatus))"
+									>
+										<SpinnerIcon
+											v-if="loadingAction === 'approve'"
+											class="animate-spin"
+											aria-hidden="true"
+										/>
+										<CheckIcon v-else aria-hidden="true" />
+										{{ formatMessage(messages.actionApprove) }}
+									</button>
+								</ButtonStyled>
+								<div class="joined-buttons">
+									<ButtonStyled v-if="replyBody" color="red">
+										<button
+											:disabled="project.status === 'rejected' || isLoading"
+											@click="runBlockingAction('reject-with-reply', () => sendReply('rejected'))"
+										>
+											<SpinnerIcon
+												v-if="loadingAction === 'reject-with-reply'"
+												class="animate-spin"
+												aria-hidden="true"
+											/>
+											<XIcon v-else aria-hidden="true" />
+											{{ formatMessage(messages.actionRejectWithReply) }}
+										</button>
+									</ButtonStyled>
+									<ButtonStyled v-else color="red">
+										<button
+											:disabled="project.status === 'rejected' || isLoading"
+											@click="runBlockingAction('reject', () => setStatus('rejected'))"
+										>
+											<SpinnerIcon
+												v-if="loadingAction === 'reject'"
+												class="animate-spin"
+												aria-hidden="true"
+											/>
+											<XIcon v-else aria-hidden="true" />
+											{{ formatMessage(messages.actionReject) }}
+										</button>
+									</ButtonStyled>
+									<ButtonStyled color="red">
+										<OverflowMenu
+											class="btn-dropdown-animation"
+											:disabled="isLoading"
+											:options="
+												replyBody
+													? [
+															{
+																id: 'withhold-reply',
+																color: 'danger',
+																action: () =>
+																	runBlockingAction('withhold-reply', () => sendReply('withheld')),
+																hoverFilled: true,
+																disabled: project.status === 'withheld' || isLoading,
+															},
+															{
+																id: 'set-to-draft-reply',
+																action: () =>
+																	runBlockingAction('set-to-draft-reply', () => sendReply('draft')),
+																hoverFilled: true,
+																disabled: project.status === 'draft' || isLoading,
+															},
+															{
+																id: 'send-to-review-reply',
+																action: () =>
+																	runBlockingAction('send-to-review-reply', () =>
+																		sendReply('processing', true),
+																	),
+																hoverFilled: true,
+																disabled: project.status === 'processing' || isLoading,
+															},
+														]
+													: [
+															{
+																id: 'withhold',
+																color: 'danger',
+																action: () =>
+																	runBlockingAction('withhold', () => setStatus('withheld')),
+																hoverFilled: true,
+																disabled: project.status === 'withheld' || isLoading,
+															},
+															{
+																id: 'set-to-draft',
+																action: () =>
+																	runBlockingAction('set-to-draft', () => setStatus('draft')),
+																hoverFilled: true,
+																disabled: project.status === 'draft' || isLoading,
+															},
+															{
+																id: 'send-to-review',
+																action: () =>
+																	runBlockingAction('send-to-review', () =>
+																		setStatus('processing'),
+																	),
+																hoverFilled: true,
+																disabled: project.status === 'processing' || isLoading,
+															},
+														]
+											"
+										>
+											<SpinnerIcon
+												v-if="isDropdownLoading"
+												class="animate-spin"
+												aria-hidden="true"
+											/>
+											<DropdownIcon v-else aria-hidden="true" />
+											<template #withhold-reply>
+												<EyeOffIcon aria-hidden="true" />
+												{{ formatMessage(messages.actionWithholdWithReply) }}
+											</template>
+											<template #withhold>
+												<EyeOffIcon aria-hidden="true" />
+												{{ formatMessage(messages.actionWithhold) }}
+											</template>
+											<template #set-to-draft-reply>
+												<FileTextIcon aria-hidden="true" />
+												{{ formatMessage(messages.actionSetToDraftWithReply) }}
+											</template>
+											<template #set-to-draft>
+												<FileTextIcon aria-hidden="true" />
+												{{ formatMessage(messages.actionSetToDraft) }}
+											</template>
+											<template #send-to-review-reply>
+												<ScaleIcon aria-hidden="true" />
+												{{ formatMessage(messages.actionSendToReviewWithReply) }}
+											</template>
+											<template #send-to-review>
+												<ScaleIcon aria-hidden="true" />
+												{{ formatMessage(messages.actionSendToReview) }}
+											</template>
+										</OverflowMenu>
+									</ButtonStyled>
+								</div>
+							</template>
 						</template>
-					</template>
+					</div>
 				</div>
-			</div>
-		</template>
+			</template>
+		</div>
 	</div>
 </template>
 
@@ -374,19 +424,179 @@ import {
 import {
 	ButtonStyled,
 	Checkbox,
+	commonMessages,
 	CopyCode,
+	defineMessages,
 	injectNotificationManager,
+	IntlFormatted,
 	MarkdownEditor,
+	NewModal,
 	OverflowMenu,
+	useVIntl,
 } from '@modrinth/ui'
 
-import Modal from '~/components/ui/Modal.vue'
 import ThreadMessage from '~/components/ui/thread/ThreadMessage.vue'
 import { useImageUpload } from '~/composables/image-upload.ts'
 import { isApproved, isRejected } from '~/helpers/projects.js'
 import { isStaff } from '~/helpers/users.js'
 
 const { addNotification } = injectNotificationManager()
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	resubmitModalHeaderResubmitting: {
+		id: 'conversation-thread.resubmit-modal.header.resubmitting',
+		defaultMessage: 'Resubmitting for review',
+	},
+	resubmitModalHeaderSubmitting: {
+		id: 'conversation-thread.resubmit-modal.header.submitting',
+		defaultMessage: 'Submitting for review',
+	},
+	resubmitModalDescription: {
+		id: 'conversation-thread.resubmit-modal.description',
+		defaultMessage:
+			"You're submitting <project-title>{projectTitle}</project-title> to be reviewed again by the moderators.",
+	},
+	resubmitModalReminder: {
+		id: 'conversation-thread.resubmit-modal.reminder',
+		defaultMessage: 'Make sure you have addressed all the comments from the moderation team.',
+	},
+	resubmitModalWarning: {
+		id: 'conversation-thread.resubmit-modal.warning',
+		defaultMessage:
+			"Repeated submissions without addressing the moderators' comments may result in an account suspension.",
+	},
+	resubmitModalConfirmationDescription: {
+		id: 'conversation-thread.resubmit-modal.confirmation.description',
+		defaultMessage: 'Confirm I have addressed the messages from the moderators',
+	},
+	resubmitModalConfirmationLabel: {
+		id: 'conversation-thread.resubmit-modal.confirmation.label',
+		defaultMessage: "I confirm that I have properly addressed the moderators' comments.",
+	},
+	replyModalHeader: {
+		id: 'conversation-thread.reply-modal.header',
+		defaultMessage: 'Reply to thread',
+	},
+	replyModalDescription: {
+		id: 'conversation-thread.reply-modal.description',
+		defaultMessage:
+			'Your project is already approved. As such, the moderation team does not actively monitor this thread. However, they may still see your message if there is a problem with your project.',
+	},
+	replyModalHelpCenterNote: {
+		id: 'conversation-thread.reply-modal.help-center-note',
+		defaultMessage:
+			'If you need to get in contact with the moderation team, please use the <help-center-link>Modrinth Help Center</help-center-link> and click the blue bubble in the bottom right corner to contact support.',
+	},
+	replyModalConfirmationDescription: {
+		id: 'conversation-thread.reply-modal.confirmation.description',
+		defaultMessage: 'Confirm moderators do not actively monitor this',
+	},
+	replyModalConfirmationLabel: {
+		id: 'conversation-thread.reply-modal.confirmation.label',
+		defaultMessage: 'I acknowledge that the moderators do not actively monitor the thread.',
+	},
+	closedThreadDescription: {
+		id: 'conversation-thread.closed-thread.description',
+		defaultMessage: 'This thread is closed and new messages cannot be sent to it.',
+	},
+	replyEditorPlaceholderReply: {
+		id: 'conversation-thread.reply-editor.placeholder.reply',
+		defaultMessage: 'Reply to thread...',
+	},
+	replyEditorPlaceholderSend: {
+		id: 'conversation-thread.reply-editor.placeholder.send',
+		defaultMessage: 'Send a message...',
+	},
+	actionResubmitForReview: {
+		id: 'conversation-thread.action.resubmit-for-review',
+		defaultMessage: 'Resubmit for review',
+	},
+	actionReplyToThread: {
+		id: 'conversation-thread.action.reply-to-thread',
+		defaultMessage: 'Reply to thread',
+	},
+	actionReopenThread: {
+		id: 'conversation-thread.action.reopen-thread',
+		defaultMessage: 'Reopen thread',
+	},
+	actionReply: {
+		id: 'conversation-thread.action.reply',
+		defaultMessage: 'Reply',
+	},
+	actionSend: {
+		id: 'conversation-thread.action.send',
+		defaultMessage: 'Send',
+	},
+	actionAddPrivateNote: {
+		id: 'conversation-thread.action.add-private-note',
+		defaultMessage: 'Add private note',
+	},
+	actionResubmitForReviewWithReply: {
+		id: 'conversation-thread.action.resubmit-for-review-with-reply',
+		defaultMessage: 'Resubmit for review with reply',
+	},
+	actionCloseWithReply: {
+		id: 'conversation-thread.action.close-with-reply',
+		defaultMessage: 'Close with reply',
+	},
+	actionCloseThread: {
+		id: 'conversation-thread.action.close-thread',
+		defaultMessage: 'Close thread',
+	},
+	actionApproveWithReply: {
+		id: 'conversation-thread.action.approve-with-reply',
+		defaultMessage: 'Approve with reply',
+	},
+	actionApprove: {
+		id: 'conversation-thread.action.approve',
+		defaultMessage: 'Approve',
+	},
+	actionRejectWithReply: {
+		id: 'conversation-thread.action.reject-with-reply',
+		defaultMessage: 'Reject with reply',
+	},
+	actionReject: {
+		id: 'conversation-thread.action.reject',
+		defaultMessage: 'Reject',
+	},
+	actionWithholdWithReply: {
+		id: 'conversation-thread.action.withhold-with-reply',
+		defaultMessage: 'Withhold with reply',
+	},
+	actionWithhold: {
+		id: 'conversation-thread.action.withhold',
+		defaultMessage: 'Withhold',
+	},
+	actionSetToDraftWithReply: {
+		id: 'conversation-thread.action.set-to-draft-with-reply',
+		defaultMessage: 'Set to draft with reply',
+	},
+	actionSetToDraft: {
+		id: 'conversation-thread.action.set-to-draft',
+		defaultMessage: 'Set to draft',
+	},
+	actionSendToReviewWithReply: {
+		id: 'conversation-thread.action.send-to-review-with-reply',
+		defaultMessage: 'Send to review with reply',
+	},
+	actionSendToReview: {
+		id: 'conversation-thread.action.send-to-review',
+		defaultMessage: 'Send to review',
+	},
+	errorSendingMessage: {
+		id: 'conversation-thread.error.sending-message',
+		defaultMessage: 'Error sending message',
+	},
+	errorClosingReport: {
+		id: 'conversation-thread.error.closing-report',
+		defaultMessage: 'Error closing report',
+	},
+	errorReopeningReport: {
+		id: 'conversation-thread.error.reopening-report',
+		defaultMessage: 'Error reopening report',
+	},
+})
 
 const props = defineProps({
 	thread: {
@@ -532,7 +742,7 @@ async function sendReply(status = null, privateMessage = false) {
 		}
 	} catch (err) {
 		addNotification({
-			title: 'Error sending message',
+			title: formatMessage(messages.errorSendingMessage),
 			text: err.data ? err.data.description : err,
 			type: 'error',
 		})
@@ -554,7 +764,7 @@ async function closeReport(reply) {
 		await updateThreadLocal()
 	} catch (err) {
 		addNotification({
-			title: 'Error closing report',
+			title: formatMessage(messages.errorClosingReport),
 			text: err.data ? err.data.description : err,
 			type: 'error',
 		})
@@ -572,7 +782,7 @@ async function reopenReport() {
 		await updateThreadLocal()
 	} catch (err) {
 		addNotification({
-			title: 'Error reopening report',
+			title: formatMessage(messages.errorReopeningReport),
 			text: err.data ? err.data.description : err,
 			type: 'error',
 		})
@@ -604,44 +814,8 @@ async function resubmit() {
 }
 
 const requestedStatus = computed(() => props.project.requested_status ?? 'approved')
+
+defineOptions({
+	inheritAttrs: false,
+})
 </script>
-
-<style lang="scss" scoped>
-.markdown-editor-spacing {
-	margin-bottom: var(--gap-md);
-}
-
-.messages {
-	display: flex;
-	flex-direction: column;
-	padding: var(--spacing-card-md);
-}
-
-.thread-id {
-	margin-bottom: var(--spacing-card-md);
-	font-weight: bold;
-	color: var(--color-heading);
-}
-
-.input-group {
-	.spacer {
-		flex-grow: 1;
-		flex-shrink: 1;
-	}
-
-	.extra-options {
-		flex-basis: fit-content;
-	}
-}
-
-.modal-submit {
-	padding: var(--spacing-card-bg);
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-card-lg);
-
-	.project-title {
-		font-weight: bold;
-	}
-}
-</style>

apps/frontend/src/components/ui/thread/ThreadMessage.vue

@@ -1,10 +1,11 @@
 <template>
 	<div
-		class="message"
+		class="message px-4 py-3"
 		:class="{
 			'has-body': message.body.type === 'text' && !forceCompact,
 			'no-actions': noLinks,
 			private: isPrivateMessage,
+			'show-private-bg': flags.showModeratorPrivateMessageHighlight,
 		}"
 	>
 		<template v-if="members[message.author_id]">
@@ -22,11 +23,6 @@
 				/>
 			</AutoLink>
 			<span :class="`message__author role-${members[message.author_id].role}`">
-				<LockIcon
-					v-if="isPrivateMessage"
-					v-tooltip="'Only visible to moderators'"
-					class="private-icon"
-				/>
 				<AutoLink :to="noLinks ? '' : `/user/${members[message.author_id].username}`">
 					{{ members[message.author_id].username }}
 				</AutoLink>
@@ -35,6 +31,11 @@
 					v-else-if="members[message.author_id].role === 'admin'"
 					v-tooltip="'Modrinth Team'"
 				/>
+				<EyeOffIcon
+					v-if="isPrivateMessage"
+					v-tooltip="'Only visible to moderators'"
+					class="ml-1 text-orange"
+				/>
 				<MicrophoneIcon
 					v-if="report && message.author_id === report.reporter_user?.id"
 					v-tooltip="'Reporter'"
@@ -79,6 +80,12 @@
 				<span v-if="message.body.new_status === 'processing'">
 					submitted the project for review.
 				</span>
+				<span v-else-if="message.body.old_status === 'processing'">
+					reviewed the project and set its status to <Badge :type="message.body.new_status" />.
+				</span>
+				<span v-else-if="message.body.new_status === 'draft'">
+					reverted this project back to a <Badge :type="message.body.new_status" />.
+				</span>
 				<span v-else>
 					changed the project's status from <Badge :type="message.body.old_status" /> to
 					<Badge :type="message.body.new_status" />.
@@ -126,7 +133,7 @@
 
 <script setup>
 import {
-	LockIcon,
+	EyeOffIcon,
 	MicrophoneIcon,
 	ModrinthIcon,
 	MoreHorizontalIcon,
@@ -178,6 +185,7 @@ const props = defineProps({
 })
 
 const emit = defineEmits(['update-thread'])
+const flags = useFeatureFlags()
 
 const formattedMessage = computed(() => {
 	const body = renderString(props.message.body.body)
@@ -222,15 +230,13 @@ async function deleteMessage() {
 
 <style lang="scss" scoped>
 .message {
-	--gap-size: var(--spacing-card-xs);
 	display: flex;
 	flex-direction: row;
-	gap: var(--gap-size);
+	gap: var(--spacing-card-sm);
 	flex-wrap: wrap;
 	align-items: center;
-	border-radius: var(--size-rounded-card);
-	padding: var(--spacing-card-md);
 	word-break: break-word;
+	position: relative;
 
 	.avatar,
 	.backed-svg {
@@ -238,14 +244,12 @@ async function deleteMessage() {
 	}
 
 	&.has-body {
-		--gap-size: var(--spacing-card-sm);
 		display: grid;
 		grid-template:
 			'icon author actions'
 			'icon body actions'
 			'date date date';
 		grid-template-columns: min-content auto 1fr;
-		column-gap: var(--gap-size);
 		row-gap: var(--spacing-card-xs);
 
 		.message__icon {
@@ -260,13 +264,22 @@ async function deleteMessage() {
 
 	&:not(.no-actions):hover,
 	&:not(.no-actions):focus-within {
-		background-color: var(--color-table-alternate-row);
+		background-color: var(--surface-2-5);
 
 		.message__actions {
 			opacity: 1;
 		}
 	}
 
+	&.private.show-private-bg::before {
+		content: '';
+		inset: 0;
+		position: absolute;
+		background-color: var(--color-orange);
+		opacity: 0.05;
+		pointer-events: none;
+	}
+
 	&.no-actions {
 		padding: 0;
 
@@ -346,10 +359,6 @@ a:active + .message__author a,
 	color: var(--color-purple);
 }
 
-.private-icon {
-	color: var(--color-gray);
-}
-
 @media screen and (min-width: 600px) {
 	.message {
 		//grid-template:
@@ -363,6 +372,7 @@ a:active + .message__author a,
 				'icon body actions'
 				'date date date';
 			grid-template-columns: min-content auto 1fr;
+			grid-template-rows: min-content 1fr auto;
 		}
 	}
 }
@@ -377,7 +387,7 @@ a:active + .message__author a,
 				'icon author date actions'
 				'icon body body actions';
 			grid-template-columns: min-content auto 1fr;
-			grid-template-rows: min-content 1fr auto;
+			grid-template-rows: min-content 1fr;
 		}
 	}
 }

apps/frontend/src/components/ui/thread/ThreadView.vue

@@ -1,11 +1,11 @@
 <template>
 	<div>
-		<div v-if="flags.developerMode" class="mt-4 font-bold text-heading">
+		<div v-if="flags.developerMode" class="m-4 font-bold text-heading">
 			Thread ID:
 			<CopyCode :text="thread.id" />
 		</div>
 
-		<div v-if="sortedMessages.length > 0" class="flex flex-col space-y-4 rounded-xl p-3 sm:p-4">
+		<div v-if="sortedMessages.length > 0" class="flex flex-col rounded-xl">
 			<ThreadMessage
 				v-for="message in sortedMessages"
 				:key="'message-' + message.id"
@@ -28,7 +28,7 @@
 		</template>
 
 		<template v-else>
-			<div>
+			<div class="px-4 py-2">
 				<MarkdownEditor
 					v-model="replyBody"
 					:placeholder="sortedMessages.length > 0 ? 'Reply to thread...' : 'Send a message...'"
@@ -37,7 +37,7 @@
 			</div>
 
 			<div
-				class="mt-4 flex flex-col items-stretch justify-between gap-3 sm:flex-row sm:items-center sm:gap-2"
+				class="mt-4 flex flex-col items-stretch justify-between gap-3 px-4 pb-4 sm:flex-row sm:items-center sm:gap-2"
 			>
 				<div class="flex flex-col items-stretch gap-2 sm:flex-row sm:items-center">
 					<ButtonStyled v-if="sortedMessages.length > 0" color="brand">

apps/frontend/src/composables/auth.js

@@ -1,3 +1,10 @@
+function normalizeAuthToken(value) {
+	if (typeof value === 'string') {
+		return value
+	}
+	return ''
+}
+
 export const useAuth = async (oldToken = null) => {
 	const auth = useState('auth', () => ({
 		user: null,
@@ -32,27 +39,35 @@ export const initAuth = async (oldToken = null) => {
 	})
 
 	if (oldToken) {
-		authCookie.value = oldToken
+		const normalized = normalizeAuthToken(oldToken)
+		if (normalized) {
+			authCookie.value = normalized
+		}
 	}
 
-	if (route.query.code && !route.fullPath.includes('new_account=true')) {
-		authCookie.value = route.query.code
+	const oauthCode = normalizeAuthToken(route.query.code)
+	if (oauthCode && !route.fullPath.includes('new_account=true')) {
+		authCookie.value = oauthCode
 	}
 
 	if (route.fullPath.includes('new_account=true') && route.path !== '/auth/welcome') {
 		const redirect = route.path.startsWith('/auth/') ? null : route.fullPath
 
 		await navigateTo(
-			`/auth/welcome?authToken=${route.query.code}${
+			`/auth/welcome?authToken=${oauthCode}${
 				redirect ? `&redirect=${encodeURIComponent(redirect)}` : ''
 			}`,
 		)
 	}
 
-	if (authCookie.value) {
-		auth.token = authCookie.value
+	const tokenStr = normalizeAuthToken(authCookie.value)
 
-		if (!auth.token || !auth.token.startsWith('mra_')) {
+	if (authCookie.value != null && tokenStr === '') {
+		authCookie.value = null
+	} else if (tokenStr) {
+		auth.token = tokenStr
+
+		if (!auth.token.startsWith('mra_')) {
 			return auth
 		}
 
@@ -71,7 +86,7 @@ export const initAuth = async (oldToken = null) => {
 		}
 	}
 
-	if (!auth.user && auth.token) {
+	if (!auth.user && auth.token && typeof auth.token === 'string') {
 		try {
 			const session = await useBaseFetch(
 				'session/refresh',
@@ -84,18 +99,22 @@ export const initAuth = async (oldToken = null) => {
 				true,
 			)
 
-			auth.token = session.session
-			authCookie.value = auth.token
-
-			auth.user = await useBaseFetch(
-				'user',
-				{
-					headers: {
-						Authorization: auth.token,
+			auth.token = normalizeAuthToken(session.session)
+			if (auth.token) {
+				authCookie.value = auth.token
+				auth.user = await useBaseFetch(
+					'user',
+					{
+						headers: {
+							Authorization: auth.token,
+						},
 					},
-				},
-				true,
-			)
+					true,
+				)
+			} else {
+				authCookie.value = null
+				auth.token = ''
+			}
 		} catch {
 			authCookie.value = null
 		}

apps/frontend/src/composables/featureFlags.ts

@@ -49,6 +49,11 @@ export const DEFAULT_FEATURE_FLAGS = validateValues({
 	labrinthApiCanary: false,
 	dismissedExternalProjectsInfo: false,
 	modpackPermissionsPage: false,
+	showAllBanners: false,
+	alwaysIgnoreErrorBanner: false,
+	showViewProdRouteBanner: false,
+	showModeratorProjectMemberUi: false,
+	showModeratorPrivateMessageHighlight: true,
 } as const)
 
 export type FeatureFlag = keyof typeof DEFAULT_FEATURE_FLAGS

apps/frontend/src/composables/useCdnDownloadContext.ts

@@ -63,7 +63,11 @@ export function useCdnDownloadContext() {
 	})
 
 	function createProjectDownloadUrl(originalUrl: string, context?: DownloadContext): string {
-		if (!originalUrl.startsWith('https://cdn.modrinth.com')) {
+		if (
+			typeof originalUrl !== 'string' ||
+			!originalUrl ||
+			!originalUrl.startsWith('https://cdn.modrinth.com')
+		) {
 			return originalUrl
 		}
 

apps/frontend/src/helpers/moderation.ts

@@ -199,17 +199,20 @@ export type ModerationOwnership = ModerationOwnershipUser | ModerationOwnershipO
 
 export interface ProjectWithOwnership {
 	ownership: ModerationOwnership
+	external_dependencies_count: number
 	[key: string]: any
 }
 
 export interface ModerationProject {
 	project: any
 	ownership: ModerationOwnership | null
+	external_dependencies_count: number
 }
 
 export function toModerationProjects(projects: ProjectWithOwnership[]): ModerationProject[] {
-	return projects.map(({ ownership, ...project }) => ({
+	return projects.map(({ ownership, external_dependencies_count, ...project }) => ({
 		project,
 		ownership: ownership ?? null,
+		external_dependencies_count: external_dependencies_count,
 	}))
 }

apps/frontend/src/layouts/default.vue

@@ -34,25 +34,39 @@
 			'modrinth-parent__no-modal-blurs': !cosmetics.advancedRendering,
 		}"
 	>
-		<RussiaBanner v-if="isRussia" />
-		<TaxIdMismatchBanner v-if="showTinMismatchBanner" />
-		<TaxComplianceBanner v-if="showTaxComplianceBanner" />
+		<RussiaBanner v-if="flags.showAllBanners || isRussia" />
+		<TaxIdMismatchBanner v-if="flags.showAllBanners || showTinMismatchBanner" />
+		<TaxComplianceBanner v-if="flags.showAllBanners || showTaxComplianceBanner" />
 		<VerifyEmailBanner
-			v-if="auth.user && !auth.user.email_verified && route.path !== '/auth/verify-email'"
+			v-if="
+				flags.showAllBanners ||
+				(auth.user && !auth.user.email_verified && route.path !== '/auth/verify-email')
+			"
 			:has-email="!!auth?.user?.email"
 		/>
 		<SubscriptionPaymentFailedBanner
 			v-if="
-				user.subscriptions.some((x) => x.status === 'payment-failed') &&
-				route.path !== '/settings/billing'
+				flags.showAllBanners ||
+				(user.subscriptions.some((x) => x.status === 'payment-failed') &&
+					route.path !== '/settings/billing')
+			"
+		/>
+		<PreviewBanner
+			v-if="
+				flags.showAllBanners || (config.public.buildEnv === 'production' && config.public.preview)
+			"
+		/>
+		<StagingBanner
+			v-if="
+				flags.showAllBanners ||
+				config.public.apiBaseUrl.startsWith('https://staging-api.modrinth.com')
 			"
 		/>
-		<PreviewBanner v-if="config.public.buildEnv === 'production' && config.public.preview" />
-		<StagingBanner v-if="config.public.apiBaseUrl.startsWith('https://staging-api.modrinth.com')" />
 		<GeneratedStateErrorsBanner
 			:errors="generatedStateErrors"
 			:api-url="config.public.apiBaseUrl"
 		/>
+		<ViewOnModrinthBanner />
 		<header
 			class="desktop-only relative z-[5] mx-auto grid max-w-[1280px] grid-cols-[1fr_auto] items-center gap-2 px-6 py-4 lg:grid-cols-[auto_1fr_auto]"
 		>
@@ -747,9 +761,13 @@ import {
 	commonMessages,
 	commonProjectTypeCategoryMessages,
 	commonSettingsMessages,
+	createHostingIntercomIdentityKey,
 	defineMessages,
 	injectModrinthClient,
+	injectPageContext,
 	OverflowMenu,
+	providePageContext,
+	useHostingIntercom,
 	useVIntl,
 } from '@modrinth/ui'
 import TeleportOverflowMenu from '@modrinth/ui/src/components/base/TeleportOverflowMenu.vue'
@@ -767,6 +785,7 @@ import SubscriptionPaymentFailedBanner from '~/components/ui/banner/Subscription
 import TaxComplianceBanner from '~/components/ui/banner/TaxComplianceBanner.vue'
 import TaxIdMismatchBanner from '~/components/ui/banner/TaxIdMismatchBanner.vue'
 import VerifyEmailBanner from '~/components/ui/banner/VerifyEmailBanner.vue'
+import ViewOnModrinthBanner from '~/components/ui/banner/ViewOnModrinthBanner.vue'
 import CollectionCreateModal from '~/components/ui/create/CollectionCreateModal.vue'
 import OrganizationCreateModal from '~/components/ui/create/OrganizationCreateModal.vue'
 import ProjectCreateModal from '~/components/ui/create/ProjectCreateModal.vue'
@@ -793,6 +812,25 @@ const router = useNativeRouter()
 const signInRouteObj = computed(() => getSignInRouteObj(route))
 const link = config.public.siteUrl + route.path.replace(/\/+$/, '')
 const client = injectModrinthClient()
+const pageContext = injectPageContext()
+const hostingIntercomActive = computed(() => route.path.startsWith('/hosting') && !!auth.value.user)
+const hostingIntercomServerId = computed(() => {
+	const rawId = route.params.id
+	return Array.isArray(rawId) ? rawId[0] : rawId
+})
+const hostingIntercom = useHostingIntercom({
+	enabled: hostingIntercomActive,
+	appId: computed(() => config.public.intercomAppId),
+	fetchToken: fetchIntercomToken,
+	identityKey: computed(() =>
+		createHostingIntercomIdentityKey(auth.value.user, hostingIntercomServerId.value),
+	),
+})
+
+providePageContext({
+	...pageContext,
+	intercomBubble: hostingIntercom.intercomBubble,
+})
 
 const { data: payoutBalance } = useQuery({
 	queryKey: ['payout', 'balance'],
@@ -821,6 +859,12 @@ const showTinMismatchBanner = computed(() => {
 
 const basePopoutId = useId()
 
+async function fetchIntercomToken() {
+	return $fetch('/api/intercom/messenger-jwt', {
+		query: hostingIntercomServerId.value ? { server_id: hostingIntercomServerId.value } : {},
+	})
+}
+
 const navMenuMessages = defineMessages({
 	home: {
 		id: 'layout.nav.home',
@@ -1133,7 +1177,7 @@ const isDiscovering = computed(
 )
 
 const isDiscoveringSubpage = computed(
-	() => route.name && route.name.startsWith('type-id') && !route.query.sid,
+	() => route.name && route.name.startsWith('type-project') && !route.query.sid,
 )
 
 const isRussia = computed(() => country.value === 'ru')

apps/frontend/src/locales/ar-SA/index.json

@@ -942,7 +942,7 @@
     "message": "موعد"
   },
   "dashboard.withdraw.completion.email-confirmation": {
-    "message": "ستتلقى رسالة بريد إلكتروني في <b>{email}<b> مع تعليمات لاسترداد المبلغ المسحوب. "
+    "message": "ستتلقى رسالة بريد إلكتروني في <b>{email}</b> مع تعليمات لاسترداد المبلغ المسحوب. "
   },
   "dashboard.withdraw.completion.exchange-rate": {
     "message": "سعر الصرف "

apps/frontend/src/locales/cs-CZ/index.json

@@ -38,6 +38,9 @@
   "app-marketing.download.options-title": {
     "message": "Stahovácí možnosti"
   },
+  "app-marketing.download.terms": {
+    "message": "Stažením aplikace Modrinth vyjadřujete souhlas s našimi <terms-link>Podmínkami</terms-link> a <privacy-link>Zásadami ochrany osobních údajů</privacy-link>."
+  },
   "app-marketing.download.title": {
     "message": "Stáhnout Modrinth App (Beta)"
   },
@@ -104,6 +107,9 @@
   "app-marketing.features.performance.cpu-percent": {
     "message": "% CPU"
   },
+  "app-marketing.features.performance.description": {
+    "message": "Aplikace Modrinth je výkonnější než mnoho předních  správců modů a využívá pouze 150MB paměti RAM!"
+  },
   "app-marketing.features.performance.discord": {
     "message": "Discord"
   },
@@ -398,6 +404,48 @@
   "collection.title": {
     "message": "{name} - Kolekce"
   },
+  "conversation-thread.action.add-private-note": {
+    "message": "Přidat soukromou poznámku"
+  },
+  "conversation-thread.action.close-thread": {
+    "message": "Uzavřít vlákno"
+  },
+  "conversation-thread.action.close-with-reply": {
+    "message": "Uzavřít s odpovědí"
+  },
+  "conversation-thread.action.reject": {
+    "message": "Zamítnout"
+  },
+  "conversation-thread.action.reject-with-reply": {
+    "message": "Zamítnout s odpovědí"
+  },
+  "conversation-thread.action.reopen-thread": {
+    "message": "Znovuotevřít vlákno"
+  },
+  "conversation-thread.action.reply": {
+    "message": "Odpovědět"
+  },
+  "conversation-thread.action.reply-to-thread": {
+    "message": "Odpovědět vláknu"
+  },
+  "conversation-thread.action.send": {
+    "message": "Odeslat"
+  },
+  "conversation-thread.action.send-to-review": {
+    "message": "Odeslat ke kontrole"
+  },
+  "conversation-thread.action.send-to-review-with-reply": {
+    "message": "Odeslat ke kontrole s odpovědí"
+  },
+  "conversation-thread.reply-editor.placeholder.reply": {
+    "message": "Odpovědět vláknu..."
+  },
+  "conversation-thread.reply-editor.placeholder.send": {
+    "message": "Odeslat zprávu..."
+  },
+  "conversation-thread.reply-modal.header": {
+    "message": "Odpovědět vláknu"
+  },
   "create-project-version.create-modal.stage.add-files.admonition": {
     "message": "Doplňkové soubory slouží jako podpůrné materiály (např. zdrojový kód), ne jako alternativní verze či varianty."
   },
@@ -494,6 +542,9 @@
   "create.project.name-placeholder": {
     "message": "Zadejte název projektu..."
   },
+  "create.project.owner-label": {
+    "message": "Vlastník"
+  },
   "create.project.summary-description": {
     "message": "Popiště vaši organizace dvěma nebo jednou větou."
   },
@@ -545,9 +596,18 @@
   "dashboard.affiliate-links.revoke-confirm.title": {
     "message": "Jste si jistý, že chcete zrušit svůj affiliate odkaz „{title}“?"
   },
+  "dashboard.analytics.total-downloads": {
+    "message": "Celková stažení"
+  },
+  "dashboard.analytics.total-followers": {
+    "message": "Celkoví sledující"
+  },
   "dashboard.collections.button.create-new": {
     "message": "Vytvořit novou"
   },
+  "dashboard.collections.empty.get-started-hint": {
+    "message": "Vytvořte svou první kolekci a začněte!"
+  },
   "dashboard.collections.label.projects-count": {
     "message": "{count} {countPlural, plural, one {project} other {projects}}"
   },
@@ -557,6 +617,15 @@
   "dashboard.collections.long-title": {
     "message": "Vaše kolekce"
   },
+  "dashboard.collections.sort.name-ascending": {
+    "message": "Jméno (A-Z)"
+  },
+  "dashboard.collections.sort.recently-created": {
+    "message": "Nedávno vytvořeno"
+  },
+  "dashboard.collections.sort.recently-updated": {
+    "message": "Nedávno aktualizováno"
+  },
   "dashboard.creator-tax-form-modal.confirmation.title": {
     "message": "Hotovo! 🎉"
   },
@@ -572,9 +641,18 @@
   "dashboard.creator-withdraw-modal.details-label": {
     "message": "Detaily"
   },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Množství"
+  },
   "dashboard.creator-withdraw-modal.fee-breakdown-fee": {
     "message": "Poplatek"
   },
+  "dashboard.creator-withdraw-modal.fee-breakdown-gift-card-value": {
+    "message": "Hodnota dárkové karty"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-usd-equivalent": {
+    "message": "Ekvivalent americkému dolaru"
+  },
   "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
     "message": "Zvolte vaši zemi"
   },
@@ -623,9 +701,18 @@
   "dashboard.creator-withdraw-modal.stage.tax-form": {
     "message": ""
   },
+  "dashboard.creator-withdraw-modal.tremendous-details.enter-denomination-placeholder": {
+    "message": "Zadejte množství"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
+    "message": "Platební metoda"
+  },
   "dashboard.creator-withdraw-modal.tremendous-details.reward": {
     "message": "Odměna"
   },
+  "dashboard.creator-withdraw-modal.tremendous-details.reward-placeholder": {
+    "message": "Vyberte odměnu"
+  },
   "dashboard.creator-withdraw-modal.tremendous-details.reward-plural": {
     "message": "Odměny"
   },
@@ -635,9 +722,57 @@
   "dashboard.creator-withdraw-modal.withdraw-limit-used": {
     "message": "Vyčerpali jste svůj limit pro výběr <b>{withdrawLimit}</b>. Pro vyšší výběr musíte vyplnit daňový formulář."
   },
+  "dashboard.organizations.button.create": {
+    "message": "Vytvořit organizaci"
+  },
+  "dashboard.organizations.empty.cta": {
+    "message": "Vytvořte organizaci!"
+  },
+  "dashboard.organizations.error.fetch": {
+    "message": "Nepodařilo se načíst organizace"
+  },
+  "dashboard.overview.notifications.button.mark-all-as-read": {
+    "message": "Označit vše jako přečtené"
+  },
+  "dashboard.overview.notifications.button.view-history": {
+    "message": "Ukázat historii"
+  },
+  "dashboard.overview.notifications.history.label": {
+    "message": "Historie"
+  },
+  "dashboard.overview.notifications.history.title": {
+    "message": "Historie oznámení"
+  },
+  "dashboard.overview.notifications.loading": {
+    "message": "Načítání oznámení..."
+  },
+  "dashboard.projects.head-title": {
+    "message": "Projekty"
+  },
+  "dashboard.projects.links.discord-invite.label": {
+    "message": "Discord pozvánka"
+  },
+  "dashboard.projects.links.placeholder.valid-url": {
+    "message": "Zadejte platnou URL"
+  },
+  "dashboard.projects.sort.option.name": {
+    "message": "Jméno"
+  },
+  "dashboard.projects.sort.option.status": {
+    "message": "Stav"
+  },
+  "dashboard.projects.table.name": {
+    "message": "Jméno"
+  },
+  "dashboard.projects.table.status": {
+    "message": "Stav"
+  },
   "dashboard.revenue.available-now": {
     "message": "K dispozici nyní"
   },
+  "dashboard.revenue.balance": {
+    "message": "Zůstatek"
+  },
   "dashboard.revenue.estimated-with-date": {
     "message": "Odhadováno {date}"
   },
@@ -647,18 +782,39 @@
   "dashboard.revenue.transactions.btn.download-csv": {
     "message": "Stáhnout jako CSV"
   },
+  "dashboard.sidebar.label.creators": {
+    "message": "Tvůrci"
+  },
+  "dashboard.sidebar.label.notifications": {
+    "message": "Oznámení"
+  },
+  "dashboard.sidebar.label.organizations": {
+    "message": "Organizace"
+  },
+  "dashboard.sidebar.label.projects": {
+    "message": "Projekty"
+  },
   "dashboard.withdraw.completion.account": {
     "message": "Účet"
   },
+  "dashboard.withdraw.completion.amount": {
+    "message": "Množství"
+  },
   "dashboard.withdraw.completion.date": {
     "message": "Datum"
   },
   "dashboard.withdraw.completion.fee": {
     "message": "Poplatek"
   },
+  "dashboard.withdraw.completion.transactions-button": {
+    "message": "Transakce"
+  },
   "dashboard.withdraw.completion.wallet": {
     "message": "Peněženka"
   },
+  "discover.install.back-to-server": {
+    "message": "Zpět na server"
+  },
   "error.collection.404.list_item.1": {
     "message": "Možná jste zadali URL adresu kolekce špatně."
   },
@@ -749,6 +905,9 @@
   "frog.title": {
     "message": "Žába"
   },
+  "hosting-marketing.included.custom-url": {
+    "message": "Vlastní URL"
+  },
   "landing.creator.feature.monetization.title": {
     "message": "Monetizace"
   },

apps/frontend/src/locales/da-DK/index.json

@@ -1013,9 +1013,6 @@
   "hosting-marketing.faq.location": {
     "message": "Hvor er Modrinth Hosting servere placeret? Kan jeg vælge et område?"
   },
-  "hosting-marketing.faq.location.answer": {
-    "message": "Vi har servere tilgængelig i Nord Amerika, Europa, og Sydøst Asien på nuværende tidspunkt som du kan vælge imellem under købet. Flere områder kommer i fremtiden! Hvis du gerne vil skifte til dit område, venligst kontakt support."
-  },
   "hosting-marketing.faq.versions-loaders": {
     "message": "Hvilken Minecraft version og loaders kan blive brugt?"
   },

apps/frontend/src/locales/de-CH/index.json

@@ -407,6 +407,51 @@
   "collection.title": {
     "message": "{name} - Kollektion"
   },
+  "conversation-thread.action.add-private-note": {
+    "message": "Private Notiz hinzufügen"
+  },
+  "conversation-thread.action.approve": {
+    "message": "Genehmigen"
+  },
+  "conversation-thread.action.approve-with-reply": {
+    "message": "Mit Antwort genehmigen"
+  },
+  "conversation-thread.action.close-thread": {
+    "message": ""
+  },
+  "conversation-thread.action.reject": {
+    "message": "Ablehnen"
+  },
+  "conversation-thread.action.reject-with-reply": {
+    "message": "Mit Antwort ablehnen"
+  },
+  "conversation-thread.action.reply": {
+    "message": "Antworten"
+  },
+  "conversation-thread.action.send": {
+    "message": "Senden"
+  },
+  "conversation-thread.action.withhold": {
+    "message": "Zurückhalten"
+  },
+  "conversation-thread.action.withhold-with-reply": {
+    "message": "Mit Antwort zurückhalten"
+  },
+  "conversation-thread.reply-editor.placeholder.send": {
+    "message": "Sende eine Nachricht..."
+  },
+  "conversation-thread.reply-modal.confirmation.label": {
+    "message": "Mir ist bewusst, dass dieser Thread nicht aktiv von den Moderatoren überwacht wird."
+  },
+  "conversation-thread.resubmit-modal.description": {
+    "message": "Du schickst <project-title>{projectTitle}</project-title> zur Wiederprüfung."
+  },
+  "conversation-thread.resubmit-modal.header.resubmitting": {
+    "message": "Erneut zur Überprüfung einreichen"
+  },
+  "conversation-thread.resubmit-modal.header.submitting": {
+    "message": "Erneut zur Überprüfung einreichen"
+  },
   "create-project-version.create-modal.stage.add-files.admonition": {
     "message": "Ergänzende Dateien dienen zur unterstützung von Ressourcen wie Quellcode, nicht für alternative Versionen oder Varianten."
   },
@@ -875,23 +920,8 @@
   "dashboard.head-title": {
     "message": "Dashboard"
   },
-  "dashboard.notifications.button.mark-all-as-read": {
-    "message": "Alle als gelesen markieren"
-  },
-  "dashboard.notifications.button.view-history": {
-    "message": "Verlauf ansehen"
-  },
   "dashboard.notifications.empty.no-unread": {
-    "message": "Du hast keine ungelesenen Nachrichten."
-  },
-  "dashboard.notifications.error.loading": {
-    "message": "Fehler beim laden von Benachrichtigungen:"
-  },
-  "dashboard.notifications.history.label": {
-    "message": "Verlauf"
-  },
-  "dashboard.notifications.history.title": {
-    "message": "Benachrichtigungsverlauf"
+    "message": "Du hast keine ungelesenen Benachrichtigungen."
   },
   "dashboard.notifications.link.see-all": {
     "message": "Alle ansehen"
@@ -902,9 +932,6 @@
   "dashboard.notifications.link.view-more": {
     "message": "Siehe {extraNotifs} weitere {extraNotifs, plural, one {Benachrichtigung} other {Benachrichtigungen}}"
   },
-  "dashboard.notifications.loading": {
-    "message": "Lade Benachrichtigungen..."
-  },
   "dashboard.organizations.button.create": {
     "message": "Organisation erstellen"
   },
@@ -920,6 +947,27 @@
   "dashboard.organizations.title": {
     "message": "Organisationen"
   },
+  "dashboard.overview.notifications.button.mark-all-as-read": {
+    "message": "Alle als gelesen markieren"
+  },
+  "dashboard.overview.notifications.button.view-history": {
+    "message": "Verlauf ansehen"
+  },
+  "dashboard.overview.notifications.empty.no-unread": {
+    "message": "Du hast keine ungelesenen Benachrichtigungen."
+  },
+  "dashboard.overview.notifications.error.loading": {
+    "message": "Fehler beim Laden von Benachrichtigungen:"
+  },
+  "dashboard.overview.notifications.history.label": {
+    "message": "Verlauf"
+  },
+  "dashboard.overview.notifications.history.title": {
+    "message": "Benachrichtigungsverlauf"
+  },
+  "dashboard.overview.notifications.loading": {
+    "message": "Benachrichtigungen werden geladen..."
+  },
   "dashboard.projects.bulk-edit-hint": {
     "message": "Du kannst mehrere Projekte gleichzeitig bearbeiten, indem du sie unden auswählst."
   },
@@ -1421,9 +1469,6 @@
   "hosting-marketing.faq.location": {
     "message": "Wo befinden sich Server von Modrinth Hosting? Kann ich eine Region auswählen?"
   },
-  "hosting-marketing.faq.location.answer": {
-    "message": "Derzeit sind Server in Nordamerika, Europa und Südostasien verfügbar, die du beim Kauf auswählen kannst. Weitere Regionen werden in Zukunft dazukommen! Falls du deine Region wechseln möchtest, wende dich bitte an den Support."
-  },
   "hosting-marketing.faq.versions-loaders": {
     "message": "Welche Minecraft-Versionen und Loader können verwendet werden?"
   },
@@ -1754,14 +1799,20 @@
   "layout.banner.add-email.description": {
     "message": "Aus Sicherheitsgründen verlangt Modrinth, dass du eine E-Mail Adresse für dein Konto registrierst."
   },
+  "layout.banner.build-fail.always-ignore": {
+    "message": "Immer ignorieren"
+  },
   "layout.banner.build-fail.description": {
     "message": "Diese Deployment von Modrinth's Frontend konnte keinen Status von der API generieren. Dies könnte aufgrund eines Ausfalls oder eines Konfigurationsfehlers sein. Erstelle neu wenn die API verfügbar ist. Fehlercodes: {errors}; Aktuelle API URL ist: {url}"
   },
+  "layout.banner.build-fail.ignore": {
+    "message": "Ignorieren"
+  },
   "layout.banner.build-fail.title": {
     "message": "Fehler beim generieren des Status von der API beim erstellen."
   },
   "layout.banner.preview.description": {
-    "message": "Falls du die offizielle Modrinth-Website aufrufen wolltest, besuch <link>https://modrinth.com</link>. Diese Vorschauversion wird von Modrinth-Mitarbeitern zu Testzwecken genutzt. Sie wurde unter Verwendung von <branch-link>{owner}/{branch}</branch-link> @ {commit} erstellt."
+    "message": "Falls du die offizielle Modrinth-Website aufrufen wolltest, besuche {url}. Diese Vorschauversion wird von Modrinth-Mitarbeitern zu Testzwecken genutzt. Sie wurde unter Verwendung von <branch-link>{owner}/{branch}</branch-link> @ {commit} erstellt."
   },
   "layout.banner.preview.title": {
     "message": "Dies ist eine Vorschauversion der Modrinth-Webseite."
@@ -2591,6 +2642,30 @@
   "project.license.title": {
     "message": "Lizenz"
   },
+  "project.moderation.admonition.approved.body.private": {
+    "message": "Dein Projekt ist privat, was bedeutet, dass nur du und von dir eingeladene Personen darauf zugreifen können."
+  },
+  "project.moderation.admonition.approved.header": {
+    "message": "Projekt genehmigt"
+  },
+  "project.moderation.admonition.rejected.header": {
+    "message": "Änderungen angefragt"
+  },
+  "project.moderation.admonition.under-review.body.1": {
+    "message": "Dein Projekt ist in der Warteschlange, um von Modrinths Moderationsteam überprüft zu werden."
+  },
+  "project.moderation.admonition.under-review.header": {
+    "message": "Projekt wird überprüft"
+  },
+  "project.moderation.admonition.withheld.header": {
+    "message": "Von Mitarbeitern entlistet"
+  },
+  "project.moderation.error.unauthorized": {
+    "message": "Nicht autorisiert"
+  },
+  "project.moderation.thread.title": {
+    "message": "Moderationsnachrichten"
+  },
   "project.moderation.title": {
     "message": "Moderation"
   },

apps/frontend/src/locales/de-DE/index.json

@@ -407,6 +407,51 @@
   "collection.title": {
     "message": "{name} - Kollektion"
   },
+  "conversation-thread.action.add-private-note": {
+    "message": "Private Notiz hinzufügen"
+  },
+  "conversation-thread.action.approve": {
+    "message": "Genehmigen"
+  },
+  "conversation-thread.action.approve-with-reply": {
+    "message": "Mit Antwort genehmigen"
+  },
+  "conversation-thread.action.close-thread": {
+    "message": ""
+  },
+  "conversation-thread.action.reject": {
+    "message": "Ablehnen"
+  },
+  "conversation-thread.action.reject-with-reply": {
+    "message": "Mit Antwort ablehnen"
+  },
+  "conversation-thread.action.reply": {
+    "message": "Antworten"
+  },
+  "conversation-thread.action.send": {
+    "message": "Senden"
+  },
+  "conversation-thread.action.withhold": {
+    "message": "Zurückhalten"
+  },
+  "conversation-thread.action.withhold-with-reply": {
+    "message": "Mit Antwort zurückhalten"
+  },
+  "conversation-thread.reply-editor.placeholder.send": {
+    "message": "Sende eine Nachricht..."
+  },
+  "conversation-thread.reply-modal.confirmation.label": {
+    "message": "Mir ist bewusst, dass dieser Thread nicht aktiv von den Moderatoren überwacht wird."
+  },
+  "conversation-thread.resubmit-modal.description": {
+    "message": "Du schickst <project-title>{projectTitle}</project-title> zur Wiederprüfung."
+  },
+  "conversation-thread.resubmit-modal.header.resubmitting": {
+    "message": "Erneut zur Überprüfung einreichen"
+  },
+  "conversation-thread.resubmit-modal.header.submitting": {
+    "message": "Erneut zur Überprüfung einreichen"
+  },
   "create-project-version.create-modal.stage.add-files.admonition": {
     "message": "Ergänzende Dateien dienen zur Unterstützung von Ressourcen wie Quellcode, nicht für alternative Versionen oder Varianten."
   },
@@ -875,24 +920,9 @@
   "dashboard.head-title": {
     "message": "Dashboard"
   },
-  "dashboard.notifications.button.mark-all-as-read": {
-    "message": "Alle als gelesen markieren"
-  },
-  "dashboard.notifications.button.view-history": {
-    "message": "Verlauf ansehen"
-  },
   "dashboard.notifications.empty.no-unread": {
     "message": "Du hast keine ungelesenen Benachrichtigungen."
   },
-  "dashboard.notifications.error.loading": {
-    "message": "Fehler beim Laden von Benachrichtigungen:"
-  },
-  "dashboard.notifications.history.label": {
-    "message": "Verlauf"
-  },
-  "dashboard.notifications.history.title": {
-    "message": "Benachrichtigungsverlauf"
-  },
   "dashboard.notifications.link.see-all": {
     "message": "Alle ansehen"
   },
@@ -902,9 +932,6 @@
   "dashboard.notifications.link.view-more": {
     "message": "Siehe {extraNotifs} weitere {extraNotifs, plural, one {Benachrichtigung} other {Benachrichtigungen}} an"
   },
-  "dashboard.notifications.loading": {
-    "message": "Benachrichtigungen werden geladen..."
-  },
   "dashboard.organizations.button.create": {
     "message": "Organisation erstellen"
   },
@@ -920,6 +947,27 @@
   "dashboard.organizations.title": {
     "message": "Organisationen"
   },
+  "dashboard.overview.notifications.button.mark-all-as-read": {
+    "message": "Alle als gelesen markieren"
+  },
+  "dashboard.overview.notifications.button.view-history": {
+    "message": "Verlauf ansehen"
+  },
+  "dashboard.overview.notifications.empty.no-unread": {
+    "message": "Du hast keine ungelesenen Benachrichtigungen."
+  },
+  "dashboard.overview.notifications.error.loading": {
+    "message": "Fehler beim Laden von Benachrichtigungen:"
+  },
+  "dashboard.overview.notifications.history.label": {
+    "message": "Verlauf"
+  },
+  "dashboard.overview.notifications.history.title": {
+    "message": "Benachrichtigungsverlauf"
+  },
+  "dashboard.overview.notifications.loading": {
+    "message": "Benachrichtigungen werden geladen..."
+  },
   "dashboard.projects.bulk-edit-hint": {
     "message": "Du kannst mehrere Projekte gleichzeitig bearbeiten, indem du sie unten auswählst."
   },
@@ -1241,6 +1289,12 @@
   "discover.install.error.no-server-world": {
     "message": "Keine Serverwelt ist zur Installation verfügbar."
   },
+  "discover.install.error.unsupported-content-type": {
+    "message": "Dieser Inhaltstyp kann nicht vom Durchstöbern zu einem Server hinzugefügt werden."
+  },
+  "discover.install.heading.reset-modpack": {
+    "message": "Modpack zur Installation nach dem Zurücksetzen auswählen"
+  },
   "discover.seo.description": {
     "message": "Durchsuche und entdecke tausende Minecraft {projectType, select, mod {Mods} modpack {Modpacks} resourcepack {Ressourcenpakete} shader {Shader} plugin {Plugins} datapack {Datenpakete} other {Projekte}} auf Modrinth mit sofortigen und präzisen Suchergebnissen. Unsere Filter helfen dir dabei, schnell die besten Minecraft {projectType, select, mod {Mods} modpack {Modpacks} resourcepack {Ressourcenpakete} shader {Shader} plugin {Plugins} datapack {Datenpakete} other {Projekte}} zu finden."
   },
@@ -1415,9 +1469,6 @@
   "hosting-marketing.faq.location": {
     "message": "Wo befinden sich Server von Modrinth Hosting? Kann ich eine Region auswählen?"
   },
-  "hosting-marketing.faq.location.answer": {
-    "message": "Derzeit sind Server in Nordamerika, Europa und Südostasien verfügbar, die du beim Kauf auswählen kannst. Weitere Regionen werden in Zukunft dazukommen! Falls du deine Region wechseln möchtest, wende dich bitte an den Support."
-  },
   "hosting-marketing.faq.versions-loaders": {
     "message": "Welche Minecraft-Versionen und Loader können verwendet werden?"
   },
@@ -1748,14 +1799,20 @@
   "layout.banner.add-email.description": {
     "message": "Aus Sicherheitsgründen verlangt Modrinth, dass du eine E-Mail-Adresse für dein Konto registrierst."
   },
+  "layout.banner.build-fail.always-ignore": {
+    "message": "Immer ignorieren"
+  },
   "layout.banner.build-fail.description": {
     "message": "Dieses Deployment des Modrinth-Frontends konnte keinen Status aus der API generieren. Dies kann an einer Störung oder einem Fehler in der Konfiguration liegen. Erneut erstellen, wenn die API verfügbar ist. Fehlercodes: {errors}; Aktuelle API-URL lautet: {url}"
   },
+  "layout.banner.build-fail.ignore": {
+    "message": "Ignorieren"
+  },
   "layout.banner.build-fail.title": {
     "message": "Fehler beim Generieren des Status aus der API beim Erstellen."
   },
   "layout.banner.preview.description": {
-    "message": "Falls du die offizielle Modrinth-Website aufrufen wolltest, besuch <link>https://modrinth.com</link>. Diese Vorschauversion wird von Modrinth-Mitarbeitern zu Testzwecken genutzt. Sie wurde unter Verwendung von <branch-link>{owner}/{branch}</branch-link> @ {commit} erstellt."
+    "message": "Falls du die offizielle Modrinth-Website aufrufen wolltest, besuche {url}. Diese Vorschauversion wird von Modrinth-Mitarbeitern zu Testzwecken genutzt. Sie wurde unter Verwendung von <branch-link>{owner}/{branch}</branch-link> @ {commit} erstellt."
   },
   "layout.banner.preview.title": {
     "message": "Dies ist eine Vorschauversion der Modrinth-Website."
@@ -2585,6 +2642,30 @@
   "project.license.title": {
     "message": "Lizenz"
   },
+  "project.moderation.admonition.approved.body.private": {
+    "message": "Dein Projekt ist privat, was bedeutet, dass nur du und von dir eingeladene Personen darauf zugreifen können."
+  },
+  "project.moderation.admonition.approved.header": {
+    "message": "Projekt genehmigt"
+  },
+  "project.moderation.admonition.rejected.header": {
+    "message": "Änderungen angefragt"
+  },
+  "project.moderation.admonition.under-review.body.1": {
+    "message": "Dein Projekt ist in der Warteschlange, um von Modrinths Moderationsteam überprüft zu werden."
+  },
+  "project.moderation.admonition.under-review.header": {
+    "message": "Projekt wird überprüft"
+  },
+  "project.moderation.admonition.withheld.header": {
+    "message": "Von Mitarbeitern entlistet"
+  },
+  "project.moderation.error.unauthorized": {
+    "message": "Nicht autorisiert"
+  },
+  "project.moderation.thread.title": {
+    "message": "Moderationsnachrichten"
+  },
   "project.moderation.title": {
     "message": "Moderation"
   },
@@ -3645,7 +3726,7 @@
     "message": "Methode aktualisieren"
   },
   "settings.billing.upgrade": {
-    "message": "Verbessern"
+    "message": "Upgraden"
   },
   "settings.display.banner.developer-mode.button": {
     "message": "Entwicklermodus deaktivieren"

apps/frontend/src/locales/en-US/index.json

@@ -407,6 +407,117 @@
   "collection.title": {
     "message": "{name} - Collection"
   },
+  "conversation-thread.action.add-private-note": {
+    "message": "Add private note"
+  },
+  "conversation-thread.action.approve": {
+    "message": "Approve"
+  },
+  "conversation-thread.action.approve-with-reply": {
+    "message": "Approve with reply"
+  },
+  "conversation-thread.action.close-thread": {
+    "message": "Close thread"
+  },
+  "conversation-thread.action.close-with-reply": {
+    "message": "Close with reply"
+  },
+  "conversation-thread.action.reject": {
+    "message": "Reject"
+  },
+  "conversation-thread.action.reject-with-reply": {
+    "message": "Reject with reply"
+  },
+  "conversation-thread.action.reopen-thread": {
+    "message": "Reopen thread"
+  },
+  "conversation-thread.action.reply": {
+    "message": "Reply"
+  },
+  "conversation-thread.action.reply-to-thread": {
+    "message": "Reply to thread"
+  },
+  "conversation-thread.action.resubmit-for-review": {
+    "message": "Resubmit for review"
+  },
+  "conversation-thread.action.resubmit-for-review-with-reply": {
+    "message": "Resubmit for review with reply"
+  },
+  "conversation-thread.action.send": {
+    "message": "Send"
+  },
+  "conversation-thread.action.send-to-review": {
+    "message": "Send to review"
+  },
+  "conversation-thread.action.send-to-review-with-reply": {
+    "message": "Send to review with reply"
+  },
+  "conversation-thread.action.set-to-draft": {
+    "message": "Set to draft"
+  },
+  "conversation-thread.action.set-to-draft-with-reply": {
+    "message": "Set to draft with reply"
+  },
+  "conversation-thread.action.withhold": {
+    "message": "Withhold"
+  },
+  "conversation-thread.action.withhold-with-reply": {
+    "message": "Withhold with reply"
+  },
+  "conversation-thread.closed-thread.description": {
+    "message": "This thread is closed and new messages cannot be sent to it."
+  },
+  "conversation-thread.error.closing-report": {
+    "message": "Error closing report"
+  },
+  "conversation-thread.error.reopening-report": {
+    "message": "Error reopening report"
+  },
+  "conversation-thread.error.sending-message": {
+    "message": "Error sending message"
+  },
+  "conversation-thread.reply-editor.placeholder.reply": {
+    "message": "Reply to thread..."
+  },
+  "conversation-thread.reply-editor.placeholder.send": {
+    "message": "Send a message..."
+  },
+  "conversation-thread.reply-modal.confirmation.description": {
+    "message": "Confirm moderators do not actively monitor this"
+  },
+  "conversation-thread.reply-modal.confirmation.label": {
+    "message": "I acknowledge that the moderators do not actively monitor the thread."
+  },
+  "conversation-thread.reply-modal.description": {
+    "message": "Your project is already approved. As such, the moderation team does not actively monitor this thread. However, they may still see your message if there is a problem with your project."
+  },
+  "conversation-thread.reply-modal.header": {
+    "message": "Reply to thread"
+  },
+  "conversation-thread.reply-modal.help-center-note": {
+    "message": "If you need to get in contact with the moderation team, please use the <help-center-link>Modrinth Help Center</help-center-link> and click the blue bubble in the bottom right corner to contact support."
+  },
+  "conversation-thread.resubmit-modal.confirmation.description": {
+    "message": "Confirm I have addressed the messages from the moderators"
+  },
+  "conversation-thread.resubmit-modal.confirmation.label": {
+    "message": "I confirm that I have properly addressed the moderators' comments."
+  },
+  "conversation-thread.resubmit-modal.description": {
+    "message": "You're submitting <project-title>{projectTitle}</project-title> to be reviewed again by the moderators."
+  },
+  "conversation-thread.resubmit-modal.header.resubmitting": {
+    "message": "Resubmitting for review"
+  },
+  "conversation-thread.resubmit-modal.header.submitting": {
+    "message": "Submitting for review"
+  },
+  "conversation-thread.resubmit-modal.reminder": {
+    "message": "Make sure you have addressed all the comments from the moderation team."
+  },
+  "conversation-thread.resubmit-modal.warning": {
+    "message": "Repeated submissions without addressing the moderators' comments may result in an account suspension."
+  },
   "create-project-version.create-modal.stage.add-files.admonition": {
     "message": "Supplementary files are for supporting resources like source code, not for alternative versions or variants."
   },
@@ -875,23 +986,8 @@
   "dashboard.head-title": {
     "message": "Dashboard"
   },
-  "dashboard.notifications.button.mark-all-as-read": {
-    "message": "Mark all as read"
-  },
-  "dashboard.notifications.button.view-history": {
-    "message": "View history"
-  },
   "dashboard.notifications.empty.no-unread": {
-    "message": "You don't have any unread notifications."
-  },
-  "dashboard.notifications.error.loading": {
-    "message": "Error loading notifications:"
-  },
-  "dashboard.notifications.history.label": {
-    "message": "History"
-  },
-  "dashboard.notifications.history.title": {
-    "message": "Notification history"
+    "message": "You have no unread notifications."
   },
   "dashboard.notifications.link.see-all": {
     "message": "See all"
@@ -902,9 +998,6 @@
   "dashboard.notifications.link.view-more": {
     "message": "View {extraNotifs} more {extraNotifs, plural, one {notification} other {notifications}}"
   },
-  "dashboard.notifications.loading": {
-    "message": "Loading notifications..."
-  },
   "dashboard.organizations.button.create": {
     "message": "Create organization"
   },
@@ -920,6 +1013,27 @@
   "dashboard.organizations.title": {
     "message": "Organizations"
   },
+  "dashboard.overview.notifications.button.mark-all-as-read": {
+    "message": "Mark all as read"
+  },
+  "dashboard.overview.notifications.button.view-history": {
+    "message": "View history"
+  },
+  "dashboard.overview.notifications.empty.no-unread": {
+    "message": "You don't have any unread notifications."
+  },
+  "dashboard.overview.notifications.error.loading": {
+    "message": "Error loading notifications:"
+  },
+  "dashboard.overview.notifications.history.label": {
+    "message": "History"
+  },
+  "dashboard.overview.notifications.history.title": {
+    "message": "Notification history"
+  },
+  "dashboard.overview.notifications.loading": {
+    "message": "Loading notifications..."
+  },
   "dashboard.projects.bulk-edit-hint": {
     "message": "You can edit multiple projects at once by selecting them below."
   },
@@ -1422,7 +1536,7 @@
     "message": "Where are Modrinth Hosting servers located? Can I choose a region?"
   },
   "hosting-marketing.faq.location.answer": {
-    "message": "We have servers available in North America, Europe, and Southeast Asia at the moment that you can choose upon purchase. More regions to come in the future! If you'd like to switch your region, please contact support."
+    "message": "We have servers available across North America, Europe, and Southeast Asia at the moment that you can choose upon purchase. More regions to come in the future! If you'd like to switch your region, please contact support."
   },
   "hosting-marketing.faq.versions-loaders": {
     "message": "What Minecraft versions and loaders can be used?"
@@ -1754,14 +1868,20 @@
   "layout.banner.add-email.description": {
     "message": "For security reasons, Modrinth needs you to register an email address to your account."
   },
+  "layout.banner.build-fail.always-ignore": {
+    "message": "Always ignore"
+  },
   "layout.banner.build-fail.description": {
     "message": "This deploy of Modrinth's frontend failed to generate state from the API. This may be due to an outage or an error in configuration. Rebuild when the API is available. Error codes: {errors}; Current API URL is: {url}"
   },
+  "layout.banner.build-fail.ignore": {
+    "message": "Ignore"
+  },
   "layout.banner.build-fail.title": {
     "message": "Error generating state from API when building."
   },
   "layout.banner.preview.description": {
-    "message": "If you meant to access the official Modrinth website, visit <link>https://modrinth.com</link>. This preview deploy is used by Modrinth staff for testing purposes. It was built using <branch-link>{owner}/{branch}</branch-link> @ {commit}."
+    "message": "If you meant to access the official Modrinth website, visit {url}. This preview deploy is used by Modrinth staff for testing purposes. It was built using {ref}."
   },
   "layout.banner.preview.title": {
     "message": "This is a preview deploy of the Modrinth website."
@@ -2591,6 +2711,84 @@
   "project.license.title": {
     "message": "License"
   },
+  "project.moderation.admonition.approved.body.private": {
+    "message": "Your project is private, meaning it can only be accessed by you and people you invite."
+  },
+  "project.moderation.admonition.approved.body.public": {
+    "message": "Your project is published and discoverable on Modrinth."
+  },
+  "project.moderation.admonition.approved.body.unlisted": {
+    "message": "Your project is unlisted, meaning it can only be accessed with a direct link and is not discoverable on Modrinth."
+  },
+  "project.moderation.admonition.approved.body.visibility-message": {
+    "message": "You can change the visibility of your project in your project's <visibility-settings-link>visibility settings</visibility-settings-link>."
+  },
+  "project.moderation.admonition.approved.header": {
+    "message": "Project approved"
+  },
+  "project.moderation.admonition.draft.body": {
+    "message": "This is a draft project that cannot be seen by others until submitted for review and approved by Modrinth's moderation team."
+  },
+  "project.moderation.admonition.draft.header": {
+    "message": "Draft project"
+  },
+  "project.moderation.admonition.draft.submit-for-review": {
+    "message": "Once you have completed all required steps and ensured your project complies with Modrinth's <rules-link>Content Rules</rules-link> you can submit your project for review."
+  },
+  "project.moderation.admonition.rejected.address-all-concerns": {
+    "message": "Please address all moderation concerns, including any issues listed in messages below, before resubmitting this project."
+  },
+  "project.moderation.admonition.rejected.header": {
+    "message": "Changes requested"
+  },
+  "project.moderation.admonition.rejected.spam-notice": {
+    "message": "Repeatedly submitting your project without addressing all moderation concerns first may result in account suspension."
+  },
+  "project.moderation.admonition.under-review.body.1": {
+    "message": "Your project is in queue to be reviewed by Modrinth's moderation team."
+  },
+  "project.moderation.admonition.under-review.body.2": {
+    "message": "Your project will be scanned and then reviewed by human moderators to ensure it meets Modrinth's <rules-link>Content Rules</rules-link> and <terms-link>Terms of Use</terms-link>."
+  },
+  "project.moderation.admonition.under-review.body.3": {
+    "message": "You can still modify your project, it won't affect your position in the queue."
+  },
+  "project.moderation.admonition.under-review.body.4": {
+    "message": "We aim to review submissions in 24-48 hours, but some projects may face delays. This does not reflect an issue with your submission."
+  },
+  "project.moderation.admonition.under-review.body.5": {
+    "message": "<emphasis>We appreciate your patience while our moderators work hard to keep Modrinth safe, and look forward to helping you share your content! 💚</emphasis>"
+  },
+  "project.moderation.admonition.under-review.header": {
+    "message": "Project under review"
+  },
+  "project.moderation.admonition.withheld.body": {
+    "message": "Your project will not appear publicly and can only be accessed with a direct link.{requestedStatus, select, unlisted { Based on your selected <visibility-settings-link>visibility settings</visibility-settings-link>, most likely no action is necessary.} other { Please address all moderation concerns, including any issues listed in messages below before resubmitting this project.}}"
+  },
+  "project.moderation.admonition.withheld.header": {
+    "message": "Unlisted by staff"
+  },
+  "project.moderation.error.unauthorized": {
+    "message": "Unauthorized"
+  },
+  "project.moderation.thread.approved-warning": {
+    "message": "This thread is not actively monitored, but may be reviewed for information about your project if needed."
+  },
+  "project.moderation.thread.help-center-note.1": {
+    "message": "Content moderators cannot provide support for most issues and messages to this thread do not notify staff."
+  },
+  "project.moderation.thread.help-center-note.2": {
+    "message": "If you need assistance or have additional inquiries, please visit the <help-center-link>Modrinth Help Center</help-center-link> and click the blue bubble to contact support."
+  },
+  "project.moderation.thread.moderator-see-user-ui-toggle": {
+    "message": "Show member UI"
+  },
+  "project.moderation.thread.private-description": {
+    "message": "This is a private conversation thread with the Modrinth moderators. They may message you with issues concerning this project."
+  },
+  "project.moderation.thread.title": {
+    "message": "Moderation messages"
+  },
   "project.moderation.title": {
     "message": "Moderation"
   },

apps/frontend/src/locales/es-419/index.json

@@ -42,7 +42,7 @@
     "message": "Al descargar la Modrinth App, aceptas nuestros <terms-link>Términos</terms-link> y <privacy-link>Política de Privacidad</privacy-link>."
   },
   "app-marketing.download.title": {
-    "message": "Descargar la Modrinth App (Beta)"
+    "message": "Descarga Modrinth App (Beta)"
   },
   "app-marketing.download.windows": {
     "message": "Windows"
@@ -407,6 +407,117 @@
   "collection.title": {
     "message": "{name} - Colección"
   },
+  "conversation-thread.action.add-private-note": {
+    "message": "Añadir nota privada"
+  },
+  "conversation-thread.action.approve": {
+    "message": "Aprovar"
+  },
+  "conversation-thread.action.approve-with-reply": {
+    "message": "Aprovar con respuesta"
+  },
+  "conversation-thread.action.close-thread": {
+    "message": "Cerrar hilo"
+  },
+  "conversation-thread.action.close-with-reply": {
+    "message": "Cerrar con respuesta"
+  },
+  "conversation-thread.action.reject": {
+    "message": "Rechazar"
+  },
+  "conversation-thread.action.reject-with-reply": {
+    "message": "Rechazar con respuesta"
+  },
+  "conversation-thread.action.reopen-thread": {
+    "message": "Reabrir hilo"
+  },
+  "conversation-thread.action.reply": {
+    "message": "Responder"
+  },
+  "conversation-thread.action.reply-to-thread": {
+    "message": "Responder hilo"
+  },
+  "conversation-thread.action.resubmit-for-review": {
+    "message": "Resubir para revisión"
+  },
+  "conversation-thread.action.resubmit-for-review-with-reply": {
+    "message": "Resubir para revisión con respuesta"
+  },
+  "conversation-thread.action.send": {
+    "message": "Enviar"
+  },
+  "conversation-thread.action.send-to-review": {
+    "message": "Enviar a revisión"
+  },
+  "conversation-thread.action.send-to-review-with-reply": {
+    "message": "Enviar a revisión con respuesta"
+  },
+  "conversation-thread.action.set-to-draft": {
+    "message": "Cambiar a borrador"
+  },
+  "conversation-thread.action.set-to-draft-with-reply": {
+    "message": "Cambiar a borrador con respuesta"
+  },
+  "conversation-thread.action.withhold": {
+    "message": "Retener"
+  },
+  "conversation-thread.action.withhold-with-reply": {
+    "message": "Retener con respuesta"
+  },
+  "conversation-thread.closed-thread.description": {
+    "message": "Este hilo está cerrado y no se pueden enviar nuevos mensajes."
+  },
+  "conversation-thread.error.closing-report": {
+    "message": "Error cerrando el reporte"
+  },
+  "conversation-thread.error.reopening-report": {
+    "message": "Error al reabrir el reporte"
+  },
+  "conversation-thread.error.sending-message": {
+    "message": "Error al enviar el mensaje"
+  },
+  "conversation-thread.reply-editor.placeholder.reply": {
+    "message": "Respuesta al hilo..."
+  },
+  "conversation-thread.reply-editor.placeholder.send": {
+    "message": "Envía un mensaje..."
+  },
+  "conversation-thread.reply-modal.confirmation.description": {
+    "message": "Confirmación que moderadores no monitorean esto activamente"
+  },
+  "conversation-thread.reply-modal.confirmation.label": {
+    "message": "Comprendo que los moderadores no monitorean este hilo activamente."
+  },
+  "conversation-thread.reply-modal.description": {
+    "message": "Tu proyecto ya ha sido aprovado. Por ello, el equipo de moderación no monitorea activamente este hilo. Sin embargo, puede que vean tu mensaje de todos modos de haber algún problema con tu proyecto."
+  },
+  "conversation-thread.reply-modal.header": {
+    "message": "Responder al hilo"
+  },
+  "conversation-thread.reply-modal.help-center-note": {
+    "message": "Si necesitas ponerte en contacto con el equipo de moderación, por favor utiliza el <help-center-link>Centro de ayuda de Modrinth</help-center-link> y haz clic en la burbuja azúl en la esquina inferior derecha para contactar soporte."
+  },
+  "conversation-thread.resubmit-modal.confirmation.description": {
+    "message": "Confirma que has atendido las observaciones de los moderadores"
+  },
+  "conversation-thread.resubmit-modal.confirmation.label": {
+    "message": "Confirmo que he atendido correctamente las observaciones de los moderadores."
+  },
+  "conversation-thread.resubmit-modal.description": {
+    "message": "Estás enviando <project-title>{projectTitle}</project-title> para ser revisado de nuevo por los moderadores."
+  },
+  "conversation-thread.resubmit-modal.header.resubmitting": {
+    "message": "Enviando de nuevo para revisión"
+  },
+  "conversation-thread.resubmit-modal.header.submitting": {
+    "message": "Enviando para revisión"
+  },
+  "conversation-thread.resubmit-modal.reminder": {
+    "message": "Asegúrate de haber leído y resuelto todas las observaciones del equipo de moderación."
+  },
+  "conversation-thread.resubmit-modal.warning": {
+    "message": "Envíos repetidos sin atender las observaciones de los moderadores pueden resultar en la suspensión de la cuenta."
+  },
   "create-project-version.create-modal.stage.add-files.admonition": {
     "message": "Los archivos complementarios sirven para recursos de apoyo, como código fuente, no para versiones o variantes alternativas."
   },
@@ -875,23 +986,8 @@
   "dashboard.head-title": {
     "message": "Panel de control"
   },
-  "dashboard.notifications.button.mark-all-as-read": {
-    "message": "Marcar todas cómo leídas"
-  },
-  "dashboard.notifications.button.view-history": {
-    "message": "Ver historial"
-  },
   "dashboard.notifications.empty.no-unread": {
-    "message": "No tienes ningúna notificación sin leer."
-  },
-  "dashboard.notifications.error.loading": {
-    "message": "Error al cargar las notificaciones:"
-  },
-  "dashboard.notifications.history.label": {
-    "message": "Historial"
-  },
-  "dashboard.notifications.history.title": {
-    "message": "Historial de notificaciones"
+    "message": "No tienes notificaciones sin leer."
   },
   "dashboard.notifications.link.see-all": {
     "message": "Ver todas"
@@ -902,9 +998,6 @@
   "dashboard.notifications.link.view-more": {
     "message": "Ver {extraNotifs} {extraNotifs, plural,one {notificación} other {notificaciones}} más"
   },
-  "dashboard.notifications.loading": {
-    "message": "Cargando notificaciones..."
-  },
   "dashboard.organizations.button.create": {
     "message": "Crear organización"
   },
@@ -912,7 +1005,7 @@
     "message": "¡Haz una organización!"
   },
   "dashboard.organizations.error.fetch": {
-    "message": "No se pudo obtener las organizaciones"
+    "message": "Fallo en obtener las organizaciones"
   },
   "dashboard.organizations.member-count": {
     "message": "{count} {count, plural,one {miembro} other {miembros}}"
@@ -920,6 +1013,27 @@
   "dashboard.organizations.title": {
     "message": "Organizaciones"
   },
+  "dashboard.overview.notifications.button.mark-all-as-read": {
+    "message": "Marcar todo como leído"
+  },
+  "dashboard.overview.notifications.button.view-history": {
+    "message": "Ver historial"
+  },
+  "dashboard.overview.notifications.empty.no-unread": {
+    "message": "No tienes notificaciones sin leer."
+  },
+  "dashboard.overview.notifications.error.loading": {
+    "message": "Error cargando notificaciones:"
+  },
+  "dashboard.overview.notifications.history.label": {
+    "message": "Historial"
+  },
+  "dashboard.overview.notifications.history.title": {
+    "message": "Historial de notificaciones"
+  },
+  "dashboard.overview.notifications.loading": {
+    "message": "Cargando notificaciones..."
+  },
   "dashboard.projects.bulk-edit-hint": {
     "message": "Puedes editar varios proyectos a la vez seleccionándolos a continuación."
   },
@@ -1229,6 +1343,33 @@
   "dashboard.withdraw.error.tax-form.title": {
     "message": "Por favor, llena el formulario fiscal"
   },
+  "discover.install.back-to-server": {
+    "message": "Volver al servidor"
+  },
+  "discover.install.back-to-setup": {
+    "message": "Volver al setup"
+  },
+  "discover.install.cancel-reset": {
+    "message": "Cancelar reinicio"
+  },
+  "discover.install.error.no-server-world": {
+    "message": "No hay mundos de servidores disponibles para la instalación."
+  },
+  "discover.install.error.unsupported-content-type": {
+    "message": "Este tipo de contenido no puede ser instalado a un servidor por búsqueda."
+  },
+  "discover.install.heading.reset-modpack": {
+    "message": "Seleccionando modpack para instalar antes del reinicio"
+  },
+  "discover.seo.description": {
+    "message": "Busca y navega miles de {projectType, select, mod {mods} modpack {modpacks}  resourcepack {packs de recursos} shader {shaders} plugin {plugins} datapack {datapacks} other {proyectos}} para Minecraft en Modrinth con resultados de busqueda instantáneos y precisos. Nuestros filtradores te ayudarán a encontrar rápidamente los mejores {projectType, select, mod {mods} modpack {modpacks}  resourcepack {packs de recursos} shader {shaders} plugin {plugins} datapack {datapacks} other {projects}} para Minecraft."
+  },
+  "discover.seo.title": {
+    "message": "Buscar {projectType, select, mod {mods} modpack {modpacks} resourcepack {paquetes de recursos} shader {shaders} plugin {plugins} datapack {datapacks} other {projects}}"
+  },
+  "discover.seo.title-with-query": {
+    "message": "Buscar {projectType, select, mod {mods} modpack {modpacks}  resourcepack {paquetes de recursos} shader {shaders} plugin {plugins} datapack {datapacks} other {projects}} | {query}"
+  },
   "error.collection.404.list_item.1": {
     "message": "Puede que hayas escrito mal la URL de la colección."
   },
@@ -1395,7 +1536,7 @@
     "message": "¿Dónde se encuentran los servidores de Modrinth Hosting? ¿Puedo elegir una región?"
   },
   "hosting-marketing.faq.location.answer": {
-    "message": "Actualmente disponemos de servidores en Norteamérica, Europa y el Sudeste Asiático entre los que puede elegir al realizar la compra. ¡En el futuro añadiremos más regiones! Si deseas cambiar de región, ponte en contacto con soporte."
+    "message": "Tenemos servidores disponibles a través de Norteamérica, Europa y el sudeste asiático que puedes seleccionar en el momento de tu compra. ¡Más regiones en el futuro! Si deseas cambiar tu región, por favor contacta con soporte."
   },
   "hosting-marketing.faq.versions-loaders": {
     "message": "¿Qué versiones y loaders de Minecraft se pueden utilizar?"
@@ -1727,14 +1868,20 @@
   "layout.banner.add-email.description": {
     "message": "Por motivos de seguridad, Modrinth necesita que registres una dirección de correo electrónico en tu cuenta."
   },
+  "layout.banner.build-fail.always-ignore": {
+    "message": "Ignorar siempre"
+  },
   "layout.banner.build-fail.description": {
     "message": "Esta implementación del frontend de Modrinth no pudo generar el estado desde la API. Esto puede deberse a una interrupción del servicio o a un error de configuración. Vuelve a construir cuando la API esté disponible. Códigos de error: {errors}; La URL actual de la API es: {url}"
   },
+  "layout.banner.build-fail.ignore": {
+    "message": "Ignorar"
+  },
   "layout.banner.build-fail.title": {
     "message": "Error al generar el estado desde la API durante la compilación."
   },
   "layout.banner.preview.description": {
-    "message": "Si desea acceder al sitio web oficial de Modrinth, visite <link>https://modrinth.com</link>. El equipo de Modrinth utiliza esta versión preliminar para realizar pruebas. Se creó con <branch-link>{owner}/{branch}</branch-link> @ {commit}.."
+    "message": "Si buscas acceder al sitio oficial de Modrinth visita {url}. Este sitio de previsualización es usado por el staff de Modrinth para fines de pruebas. Fue creado usando <branch-link>{owner}/{branch}</branch-link> @{commit}."
   },
   "layout.banner.preview.title": {
     "message": "Esta es una vista previa de la implementación del sitio web de Modrinth."
@@ -2564,6 +2711,84 @@
   "project.license.title": {
     "message": "Licencia"
   },
+  "project.moderation.admonition.approved.body.private": {
+    "message": "Tu proyecto es privado, lo que significa que solo pueden acceder tú y las personas a las que invites."
+  },
+  "project.moderation.admonition.approved.body.public": {
+    "message": "Tu proyecto está publicado y aparece en las búsquedas de Modrinth."
+  },
+  "project.moderation.admonition.approved.body.unlisted": {
+    "message": "Tu proyecto no está listado, lo que significa que solo se puede acceder a él a través de un link directo y no aparece en las búsquedas de Modrinth."
+  },
+  "project.moderation.admonition.approved.body.visibility-message": {
+    "message": "Puedes cambiar la visibilidad de tu proyecto en la <visibility-settings-link>configuración de visibilidad</visibility-settings-link> de tu proyecto."
+  },
+  "project.moderation.admonition.approved.header": {
+    "message": "Proyecto aprobado"
+  },
+  "project.moderation.admonition.draft.body": {
+    "message": "Este es un borrador de tu proyecto que nadie puede ver hasta que sea enviado para ser revisado y aprobado por el equipo de moderación de Modrinth."
+  },
+  "project.moderation.admonition.draft.header": {
+    "message": "Borrador"
+  },
+  "project.moderation.admonition.draft.submit-for-review": {
+    "message": "Una vez que hayas completado todos los pasos necesarios y te hayas asegurado de que tu proyecto cumple con las <rules-link>Reglas de contenido</rules-link> de Modrinth, puedes enviar tu proyecto a revisión."
+  },
+  "project.moderation.admonition.rejected.address-all-concerns": {
+    "message": "Por favor resuelve todas las observaciones de moderación, incluyendo cualquiera listada abajo, antes de enviar de nuevo el proyecto."
+  },
+  "project.moderation.admonition.rejected.header": {
+    "message": "Cambios solicitados"
+  },
+  "project.moderation.admonition.rejected.spam-notice": {
+    "message": "Enviar en repetidas ocasiones tu proyecto sin atender antes todas las observaciones de moderación puede resultar en la suspensión de la cuenta."
+  },
+  "project.moderation.admonition.under-review.body.1": {
+    "message": "Tu proyecto está en lista de espera para ser revisado por el equipo de moderación de Modrinth."
+  },
+  "project.moderation.admonition.under-review.body.2": {
+    "message": "Tu proyecto será escaneado y después revisado por moderadores humanos para asegurarnos de que esté de acuerdo con las <rules-link>Reglas de contenido</rules-link> y los <terms-link>Términos de uso</terms-link> de Modrinth."
+  },
+  "project.moderation.admonition.under-review.body.3": {
+    "message": "Aún puedes modificar tu proyecto, no afectará tu posición en la cola."
+  },
+  "project.moderation.admonition.under-review.body.4": {
+    "message": "Buscamos revisar envíos en un plazo de 24-48 horas, pero algunos proyectos pueden sufrir retrasos. Esto no indica ningún problema con tu envío."
+  },
+  "project.moderation.admonition.under-review.body.5": {
+    "message": "<emphasis>¡Apreciamos tu paciencia mientras nuestros moderadores trabajan duro para mantener Modrinth seguro y estaremos encantados de poder ayudarte a compartir tu contenido! 💚</emphasis>"
+  },
+  "project.moderation.admonition.under-review.header": {
+    "message": "Proyecto bajo revisión"
+  },
+  "project.moderation.admonition.withheld.body": {
+    "message": "Tu proyecto no aparecerá públicamente y solo se podrá acceder a él por un enlace directo.{requestedStatus, select,unlisted { Según tu <visibility-settings-link>configuración de visibilidad</visibility-settings-link>, es muy probable que no se necesite ninguna acción adicional.} other { Por favor resuelve todas las observaciones de moderación, incluyendo las listadas abajo, antes de enviar de nuevo el proyecto.}}"
+  },
+  "project.moderation.admonition.withheld.header": {
+    "message": "Deslistado por el staff"
+  },
+  "project.moderation.error.unauthorized": {
+    "message": "Sin autorización"
+  },
+  "project.moderation.thread.approved-warning": {
+    "message": "Este hilo no esta siendo monitorizado de manera activa, pero puede ser revisado para más información sobre tu proyecto de ser necesario."
+  },
+  "project.moderation.thread.help-center-note.1": {
+    "message": "Los moderadores de contenido no pueden dar soporte a la mayoría de los problemas y los mensajes de este hilo no notifican al staff."
+  },
+  "project.moderation.thread.help-center-note.2": {
+    "message": "Si necesitas ayuda o tienes consultas adicionales, por favor visita el <help-center-link>Centro de ayuda de Modrinth</help-center-link> y haz click en la burbuja azúl para contactar con soporte."
+  },
+  "project.moderation.thread.moderator-see-user-ui-toggle": {
+    "message": "Mostrar vista de miembro"
+  },
+  "project.moderation.thread.private-description": {
+    "message": "Este es un hilo de conversación con los moderadores de Modrinth. Podrían enviarte un mensaje con observaciones relacionadas a este proyecto."
+  },
+  "project.moderation.thread.title": {
+    "message": "Mensajes de moredación"
+  },
   "project.moderation.title": {
     "message": "Moderación"
   },
@@ -3062,6 +3287,9 @@
   "search.filter.locked.server.sync": {
     "message": "Sincronizar con el servidor"
   },
+  "servers.manage.content.title": {
+    "message": "Contenido - {serverName} - Modrinth"
+  },
   "servers.notice.actions": {
     "message": "Acciones"
   },
@@ -3561,7 +3789,7 @@
     "message": "Error al renovar la suscripción"
   },
   "settings.billing.pyro.resubscribe.request-submitted.text": {
-    "message": "Si el servidor se encuentra cancelado, puede tomar 10-15 minutos en preparar el servidor"
+    "message": "Si el servidor se encuentra cancelado, puede tomar de 10 a 15 minutos en preparar el servidor."
   },
   "settings.billing.pyro.resubscribe.request-submitted.title": {
     "message": "Solicitud de renovación de suscripción enviada"

apps/frontend/src/locales/es-ES/index.json

@@ -875,24 +875,6 @@
   "dashboard.head-title": {
     "message": "Panel de control"
   },
-  "dashboard.notifications.button.mark-all-as-read": {
-    "message": "Marcar todo como leido"
-  },
-  "dashboard.notifications.button.view-history": {
-    "message": "Ver historial"
-  },
-  "dashboard.notifications.empty.no-unread": {
-    "message": "No tienes ninguna notificación sin leer."
-  },
-  "dashboard.notifications.error.loading": {
-    "message": "Error al cargar las notificaciones:"
-  },
-  "dashboard.notifications.history.label": {
-    "message": "Historial"
-  },
-  "dashboard.notifications.history.title": {
-    "message": "Historial de notificaciones"
-  },
   "dashboard.notifications.link.see-all": {
     "message": "Ver todos"
   },
@@ -902,9 +884,6 @@
   "dashboard.notifications.link.view-more": {
     "message": "Mostrar {extraNotifs} {extraNotifs, plural,one {notificación}other {otras notificaciones}}"
   },
-  "dashboard.notifications.loading": {
-    "message": "Cargando notificaciones..."
-  },
   "dashboard.organizations.button.create": {
     "message": "Crear organización"
   },
@@ -1388,9 +1367,6 @@
   "hosting-marketing.faq.location": {
     "message": "¿Dónde están localizados los servidores de Modrinth Hosting? ¿Puedo elegir la región?"
   },
-  "hosting-marketing.faq.location.answer": {
-    "message": "Tenemos servidores disponibles en América del Norte, Europa y Sureste de Asia por el momento, que puedes elegir al momento de comprarlo. ¡Más regiones estarán disponibles en el futuro! Si te gustaría cambiar tu región por favor contáctate con soporte."
-  },
   "hosting-marketing.faq.versions-loaders": {
     "message": "¿Que versiones de Minecraft y loaders se pueden usar?"
   },
@@ -1724,9 +1700,6 @@
   "layout.banner.build-fail.title": {
     "message": "Error al generar el estado desde la API durante la compilación."
   },
-  "layout.banner.preview.description": {
-    "message": "Si quieres acceder al sitio web oficial de Modrinth, visita <link>https://modrinth.com</link>. El personal de Modrinth utiliza esta implementación de vista previa para fines de prueba. Se creó con <branch-link>{owner}/{branch}</branch-link> @ {commit}."
-  },
   "layout.banner.preview.title": {
     "message": "Esta es una vista previa de la implementación del sitio web de Modrinth."
   },

apps/frontend/src/locales/fi-FI/index.json

@@ -191,9 +191,21 @@
   "app-marketing.hero.download-modrinth-app-for-os": {
     "message": "Lataa Modrinth App alustalle {os}"
   },
+  "app-marketing.hero.minecraft-screenshot-alt": {
+    "message": "Kuvakaappaus Cobblemon instanssin pää valikko näytöstä."
+  },
   "app-marketing.hero.more-download-options": {
     "message": "Lisää lataus vaihtoehtoja"
   },
+  "app-marketing.hide-other-packages": {
+    "message": "Piilota muut paketit"
+  },
+  "app-marketing.not-recommended": {
+    "message": "Emme suosittele että käytät näitä ellet tiedä mitä teet."
+  },
+  "app-marketing.show-other-packages": {
+    "message": "Näytä muut paketit"
+  },
   "auth.authorize.action.authorize": {
     "message": "Valtuuta"
   },
@@ -335,36 +347,171 @@
   "collection.button.edit-icon": {
     "message": "Muokkaa kuvaketta"
   },
+  "collection.button.remove-icon": {
+    "message": "Poista kuvake"
+  },
   "collection.button.remove-project": {
     "message": "Poista projekti"
   },
+  "collection.button.replace-icon": {
+    "message": "Korvaa kuvake"
+  },
+  "collection.button.select-icon": {
+    "message": "Valitse kuvake"
+  },
   "collection.button.unfollow-project": {
     "message": "Lopeta projektin seuraaminen"
   },
+  "collection.delete-modal.description": {
+    "message": "Tämä poistaa pysyvästi tämän kokoelman. Tätä toimea ei voida peruuttaa."
+  },
   "collection.delete-modal.title": {
     "message": "Oletko varma että haluat poistaa tämän kokoelman?"
   },
+  "collection.editing": {
+    "message": "Muokataan kokoelmaa"
+  },
   "collection.error.not-found": {
     "message": "Kokoelmaa ei löydy"
   },
   "collection.label.created-at": {
     "message": "Luotu {ago}"
   },
+  "collection.label.curated-by": {
+    "message": "Kuratoinut"
+  },
+  "collection.label.no-projects": {
+    "message": "Ei vielä projekteja kokelmassa"
+  },
   "collection.label.projects-count": {
     "message": "{count, plural, =0 {No projects yet} other {<stat>{count}</stat> {type}}}"
   },
   "collection.label.updated-at": {
     "message": "Päivitetty {ago}"
   },
+  "collection.return-link.dashboard-collections": {
+    "message": "Kokoelmasi"
+  },
   "collection.return-link.user": {
     "message": "{user}:n profiili"
   },
   "collection.title": {
     "message": "{name} - kokoelma"
   },
+  "conversation-thread.action.add-private-note": {
+    "message": "Lisää yksityinen muistiinpano"
+  },
+  "conversation-thread.action.approve": {
+    "message": "Hyväksy"
+  },
+  "conversation-thread.action.approve-with-reply": {
+    "message": "Hyväksy vastauksella"
+  },
+  "conversation-thread.action.close-thread": {
+    "message": "Sulje keskustelu"
+  },
+  "conversation-thread.action.close-with-reply": {
+    "message": "Sulje vastauksella"
+  },
+  "conversation-thread.action.reject": {
+    "message": "Hylkää"
+  },
+  "conversation-thread.action.reject-with-reply": {
+    "message": "Hylkää vastauksella"
+  },
+  "conversation-thread.action.reopen-thread": {
+    "message": "Avaa keskustelu uudelleen"
+  },
+  "conversation-thread.action.reply": {
+    "message": "Vastaa"
+  },
+  "conversation-thread.action.reply-to-thread": {
+    "message": "Vastaa keskusteluun"
+  },
+  "conversation-thread.action.resubmit-for-review": {
+    "message": "Lähetä uudelleen arvioitavaksi"
+  },
+  "conversation-thread.action.resubmit-for-review-with-reply": {
+    "message": "Lähetä uudelleen arvioitavaksi vastauksella"
+  },
+  "conversation-thread.action.send": {
+    "message": "Lähetä"
+  },
+  "conversation-thread.action.send-to-review": {
+    "message": "Lähetä arvioitavaksi"
+  },
+  "conversation-thread.action.send-to-review-with-reply": {
+    "message": "Lähetä arvioitavaksi vastauksella"
+  },
+  "conversation-thread.reply-editor.placeholder.reply": {
+    "message": "Vastaa keskusteluun..."
+  },
+  "conversation-thread.reply-editor.placeholder.send": {
+    "message": "Lähetä viesti..."
+  },
+  "conversation-thread.reply-modal.header": {
+    "message": "Vastaa keskusteluun"
+  },
   "create.collection.collection-info": {
     "message": "Sinun uusi kokoelma luodaan julkiseksi kokoelmaksi {count, plural, =0 {no projects} one {# project} other {# projects}}:lla. "
   },
+  "create.collection.create-collection": {
+    "message": "Luo kokoelma"
+  },
+  "create.collection.name-label": {
+    "message": "Nimi"
+  },
+  "create.collection.name-placeholder": {
+    "message": "Syötä kokoelman nimi..."
+  },
+  "create.collection.summary-label": {
+    "message": "Yhteenveto"
+  },
+  "create.collection.title": {
+    "message": "Luodaan kokoelmaa"
+  },
+  "create.limit-alert.contact-support": {
+    "message": "Ota yhteyttä tukeen"
+  },
+  "create.limit-alert.type-collection": {
+    "message": "kokoelma"
+  },
+  "create.limit-alert.type-organization": {
+    "message": "organisaatio"
+  },
+  "create.limit-alert.type-plural-collection": {
+    "message": "kokoelmat"
+  },
+  "create.limit-alert.type-plural-organization": {
+    "message": "organisaatiot"
+  },
+  "create.limit-alert.type-plural-project": {
+    "message": "projektit"
+  },
+  "create.limit-alert.type-project": {
+    "message": "projekti"
+  },
+  "create.organization.create-organization": {
+    "message": "Luo organisaatio"
+  },
+  "create.organization.name-label": {
+    "message": "Nimi"
+  },
+  "create.organization.name-placeholder": {
+    "message": "Syötä organisaation nimi..."
+  },
+  "create.organization.summary-label": {
+    "message": "Yhteenveto"
+  },
+  "create.project.visibility-private": {
+    "message": "Yksityinen"
+  },
+  "create.project.visibility-public": {
+    "message": "Julkinen"
+  },
+  "create.project.visibility-unlisted": {
+    "message": "Piilotettu"
+  },
   "dashboard.collections.button.create-new": {
     "message": "Luo uusi"
   },
@@ -374,18 +521,165 @@
   "dashboard.collections.long-title": {
     "message": "Kokoelmasi"
   },
+  "dashboard.collections.sort.name-ascending": {
+    "message": "Nimi (A-Z)"
+  },
+  "dashboard.collections.sort.recently-created": {
+    "message": "Äskettäin luotu"
+  },
+  "dashboard.collections.sort.recently-updated": {
+    "message": "Äskettäin päivitetty"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.download-button": {
+    "message": "Lataa {formType}"
+  },
+  "dashboard.creator-tax-form-modal.confirmation.title": {
+    "message": "Kaikki valmista! 🎉"
+  },
+  "dashboard.creator-tax-form-modal.entity.private-individual": {
+    "message": "Yksityishenkilö"
+  },
   "dashboard.creator-tax-form-modal.header": {
     "message": "Vero lomake"
   },
+  "dashboard.creator-tax-form-modal.us-citizen.question": {
+    "message": "Oletko Yhdysvaltain kansalainen?"
+  },
+  "dashboard.creator-withdraw-modal.details-label": {
+    "message": "Lisätiedot"
+  },
+  "dashboard.creator-withdraw-modal.fee-breakdown-amount": {
+    "message": "Määrä"
+  },
+  "dashboard.creator-withdraw-modal.kyc.private-individual": {
+    "message": "Yksityishenkilö"
+  },
   "dashboard.creator-withdraw-modal.muralpay-details.crypto-warning-header": {
     "message": "Vahvista lompakkosi osoite"
   },
+  "dashboard.creator-withdraw-modal.paypal-details.payment-method": {
+    "message": "Maksutapa"
+  },
+  "dashboard.creator-withdraw-modal.paypal-details.paypal-account": {
+    "message": "PayPal-tili"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.unverified-email-header": {
+    "message": "Vavhistamaton sähköposti"
+  },
   "dashboard.creator-withdraw-modal.tremendous-details.usd-paypal-warning-header": {
     "message": "Matalammat maksut saatavilla"
   },
+  "dashboard.head-title": {
+    "message": "Hallintapaneeli"
+  },
+  "dashboard.notifications.empty.no-unread": {
+    "message": "Sinulla ei ole lukemattomia ilmoituksia."
+  },
+  "dashboard.notifications.link.see-all": {
+    "message": "Näytä kaikki"
+  },
+  "dashboard.notifications.link.view-history": {
+    "message": "Näytä ilmoitushistoria"
+  },
+  "dashboard.organizations.button.create": {
+    "message": "Luo organisaatio"
+  },
+  "dashboard.organizations.empty.cta": {
+    "message": "Tee organisaatio!"
+  },
+  "dashboard.organizations.error.fetch": {
+    "message": "Organisaatioiden haku epäonnistui"
+  },
+  "dashboard.organizations.member-count": {
+    "message": "{count} {count, plural, one {jäsen} other {jäsentä}}"
+  },
+  "dashboard.projects.head-title": {
+    "message": "Projektit"
+  },
+  "dashboard.projects.links.and-more": {
+    "message": "ja {count} lisää..."
+  },
+  "dashboard.projects.links.button.clear-link": {
+    "message": "Tyhjennä linkki"
+  },
+  "dashboard.projects.links.button.edit": {
+    "message": "Muokkaa linkkejä"
+  },
+  "dashboard.projects.links.discord-invite.description": {
+    "message": "Kutsulinkki sinun Discord-palvelimellesi."
+  },
+  "dashboard.projects.links.discord-invite.label": {
+    "message": "Discord-kutsu"
+  },
+  "dashboard.projects.links.placeholder.cleared": {
+    "message": "Olemassa oleva linkki tyhjennetään"
+  },
+  "dashboard.projects.links.placeholder.valid-discord-url": {
+    "message": "Syötä kelvollinen Discord-kutsu URL"
+  },
+  "dashboard.projects.links.placeholder.valid-url": {
+    "message": "Syötä kelvollinen URL"
+  },
+  "dashboard.projects.links.show-all-projects": {
+    "message": "Näytä kaikki projektit"
+  },
+  "dashboard.projects.links.source-code.label": {
+    "message": "Lähdekoodi"
+  },
+  "dashboard.projects.links.wiki-page.label": {
+    "message": "Wikisivu"
+  },
+  "dashboard.projects.project.icon-alt": {
+    "message": "Kuvake projektille {title}"
+  },
+  "dashboard.projects.sort.ascending": {
+    "message": "Nouseva"
+  },
+  "dashboard.projects.sort.descending": {
+    "message": "Laskeva"
+  },
+  "dashboard.projects.sort.option.name": {
+    "message": "Nimi"
+  },
+  "dashboard.projects.sort.option.status": {
+    "message": "Tila"
+  },
+  "dashboard.projects.sort.option.type": {
+    "message": "Tyyppi"
+  },
+  "dashboard.projects.table.icon": {
+    "message": "Kuvake"
+  },
+  "dashboard.projects.table.id": {
+    "message": "ID"
+  },
+  "dashboard.projects.table.name": {
+    "message": "Nimi"
+  },
+  "dashboard.projects.table.status": {
+    "message": "Tila"
+  },
+  "dashboard.projects.table.type": {
+    "message": "Tyyppi"
+  },
+  "dashboard.report.title": {
+    "message": "Raportti {id}"
+  },
+  "dashboard.reports.active-title": {
+    "message": "Aktiiviset raportit"
+  },
+  "dashboard.reports.title": {
+    "message": "Raportit"
+  },
+  "dashboard.revenue.available-now": {
+    "message": "Saatavilla nyt"
+  },
   "dashboard.revenue.processing": {
     "message": "Prosessoidaan"
   },
+  "dashboard.revenue.transactions.btn.download-csv": {
+    "message": "Lataa CSV-tiedostona"
+  },
   "error.collection.404.list_item.1": {
     "message": "Saatoit kirjoittaa kokoelman URL osoitteen väärin."
   },
@@ -419,12 +713,51 @@
   "error.project.404.list_title": {
     "message": "Miksi?"
   },
+  "error.project.404.title": {
+    "message": "Projektia ei löytynyt"
+  },
   "error.user.404.list_title": {
     "message": "Miksi?"
   },
+  "error.user.404.title": {
+    "message": "Käyttäjää ei löytynyt"
+  },
+  "frog": {
+    "message": "Löysit sammakon! 🐸"
+  },
   "frog.title": {
     "message": "Sammakko"
   },
+  "hosting-marketing.included.backups-included": {
+    "message": "Varmuuskopiot sisällyttäen"
+  },
+  "hosting-marketing.included.file-manager": {
+    "message": "Helppokäyttöinen tiedostoselain"
+  },
+  "hosting-marketing.included.file-manager.description": {
+    "message": "Etsi, hallinnoi, muokkaa ja lataa tiedostoja suoraan palvelimellesi helposti."
+  },
+  "hosting-marketing.included.help": {
+    "message": "Apua kun sitä tarvitset"
+  },
+  "hosting-marketing.included.help.description": {
+    "message": "Ota yhteyttä Modrinthin tiimiin milloin tahansa palvelinasioissa."
+  },
+  "hosting-marketing.included.sftp-access": {
+    "message": "SFTP pääsy"
+  },
+  "hosting-marketing.know-what-you-need": {
+    "message": "Tiedät jo mitä tarvitset?"
+  },
+  "hosting-marketing.medal.info": {
+    "message": "Kokeile ilmaista <orange>3Gt palvelinta</orange> 5 päivän ajan, jonka tarjoaa <orange>Medal</orange>"
+  },
+  "hosting-marketing.medal.learn-more": {
+    "message": "Lue lisää"
+  },
+  "hosting.plan.out-of-stock": {
+    "message": "Loppuunmyyty"
+  },
   "landing.button.discover-mods": {
     "message": "Löydä modeja"
   },
@@ -512,6 +845,9 @@
   "layout.action.new-project": {
     "message": "Uusi projekti"
   },
+  "layout.action.publish": {
+    "message": "Julkaise"
+  },
   "layout.avatar.alt": {
     "message": "Avatarisi"
   },

apps/frontend/src/locales/fil-PH/index.json

@@ -875,24 +875,6 @@
   "dashboard.head-title": {
     "message": "Dashboard"
   },
-  "dashboard.notifications.button.mark-all-as-read": {
-    "message": "Tratuhing binasa na"
-  },
-  "dashboard.notifications.button.view-history": {
-    "message": "Tingnan ang kasaysayan"
-  },
-  "dashboard.notifications.empty.no-unread": {
-    "message": "Wala kang di-nababasang notipikasyon."
-  },
-  "dashboard.notifications.error.loading": {
-    "message": "Error sa paglo-load ng mga notipikasyon:"
-  },
-  "dashboard.notifications.history.label": {
-    "message": "Kasaysayan"
-  },
-  "dashboard.notifications.history.title": {
-    "message": "Kasaysayan ng notipikasyon"
-  },
   "dashboard.notifications.link.see-all": {
     "message": "Tingnan lahat"
   },
@@ -902,9 +884,6 @@
   "dashboard.notifications.link.view-more": {
     "message": "Tingnan ang {extraNotifs} pang {extraNotifs, plural, other {notipikasyon}}"
   },
-  "dashboard.notifications.loading": {
-    "message": "Naglo-load ang mga notipikasyon..."
-  },
   "dashboard.organizations.button.create": {
     "message": "Lumikha ng organisasyon"
   },
@@ -1256,9 +1235,6 @@
   "hosting-marketing.faq.location": {
     "message": "Nasaan ang mga server ng Modrinth Hosting? Makapipili ba ako ng rehiyon?"
   },
-  "hosting-marketing.faq.location.answer": {
-    "message": "Mayroon kaming mga server na magagamit sa Hilagang Amerika, Yuropa, at Timog-silangang Asya sa kasalukuyang sandali na maaari mong piliin pagkatapos bumili. Dadating ang higit pang rehiyon sa hinaharap! Kung nais mong magpalit ng rehiyon, mangyaring abutin ang suporta."
-  },
   "hosting-marketing.faq.versions-loaders": {
     "message": "Ano bang bersiyon ng Minecraft at loader ang magagamit?"
   },
@@ -1592,9 +1568,6 @@
   "layout.banner.build-fail.title": {
     "message": "Error sa pagbubuo ng estado galing sa API habang nagpapatayo."
   },
-  "layout.banner.preview.description": {
-    "message": "Kung ibig mong maakses ang opisyal na website ng Modrinth, bisitahin ang <link>https://modrinth.com</link>. Ito ay isang pinakalat na pasilip na ginagamit lamang ng kawani ng Modrinth sa pagsusubok nito. Ito ay pinatayo gamit ang <branch-link>{owner}/{branch}</branch-link> @ {commit}."
-  },
   "layout.banner.preview.title": {
     "message": "Ito ay isang pinakalat na pasilip ng website ng Modrinth."
   },

apps/frontend/src/locales/fr-FR/index.json

@@ -407,6 +407,117 @@
   "collection.title": {
     "message": "{name} - Collection"
   },
+  "conversation-thread.action.add-private-note": {
+    "message": "Ajouter une note privée"
+  },
+  "conversation-thread.action.approve": {
+    "message": "Approuver"
+  },
+  "conversation-thread.action.approve-with-reply": {
+    "message": "Approuver avec réponse"
+  },
+  "conversation-thread.action.close-thread": {
+    "message": "Fermer le fil"
+  },
+  "conversation-thread.action.close-with-reply": {
+    "message": "Fermer avec réponse"
+  },
+  "conversation-thread.action.reject": {
+    "message": "Rejeter"
+  },
+  "conversation-thread.action.reject-with-reply": {
+    "message": "Rejeter avec réponse"
+  },
+  "conversation-thread.action.reopen-thread": {
+    "message": "Rouvrir le fil"
+  },
+  "conversation-thread.action.reply": {
+    "message": "Répondre"
+  },
+  "conversation-thread.action.reply-to-thread": {
+    "message": "Répondre au fil"
+  },
+  "conversation-thread.action.resubmit-for-review": {
+    "message": "Soumettre de nouveau à la révision"
+  },
+  "conversation-thread.action.resubmit-for-review-with-reply": {
+    "message": "Soumettre de nouveau avec réponse"
+  },
+  "conversation-thread.action.send": {
+    "message": "Envoyer"
+  },
+  "conversation-thread.action.send-to-review": {
+    "message": "Envoyer à la révision"
+  },
+  "conversation-thread.action.send-to-review-with-reply": {
+    "message": "Envoyer"
+  },
+  "conversation-thread.action.set-to-draft": {
+    "message": "Ajouter aux brouillons"
+  },
+  "conversation-thread.action.set-to-draft-with-reply": {
+    "message": "Ajouter aux brouillons avec réponse"
+  },
+  "conversation-thread.action.withhold": {
+    "message": "Retenir"
+  },
+  "conversation-thread.action.withhold-with-reply": {
+    "message": "Retenir avec réponse"
+  },
+  "conversation-thread.closed-thread.description": {
+    "message": "Ce fil est fermé et aucun message ne peut y être envoyé."
+  },
+  "conversation-thread.error.closing-report": {
+    "message": "Impossible de fermer le rapport"
+  },
+  "conversation-thread.error.reopening-report": {
+    "message": "Impossible de rouvrir le rapport"
+  },
+  "conversation-thread.error.sending-message": {
+    "message": "Impossible d'envoyer le message"
+  },
+  "conversation-thread.reply-editor.placeholder.reply": {
+    "message": "Répondre au fil..."
+  },
+  "conversation-thread.reply-editor.placeholder.send": {
+    "message": "Envoyer un message..."
+  },
+  "conversation-thread.reply-modal.confirmation.description": {
+    "message": "Confirmer que les modérateurs ne surveillent pas activement cela"
+  },
+  "conversation-thread.reply-modal.confirmation.label": {
+    "message": "Je comprends que les modérateurs ne sont pas actifs sur ce fil."
+  },
+  "conversation-thread.reply-modal.description": {
+    "message": "Votre projet est déjà approuvé. De ce fait, l'équipe de modération ne surveillent pas beaucoup ce fil. En revanche, ils pourront quand même voir votre message s'il y a un problème avec votre projet."
+  },
+  "conversation-thread.reply-modal.header": {
+    "message": "Répondre au fil"
+  },
+  "conversation-thread.reply-modal.help-center-note": {
+    "message": "Si vous devez entrer en contact avec l'équipe de modération, veuillez utiliser le <help-center-link>Modrinth Help Center</help-center-link> et cliquez sur la bulle bleue dans le coin inférieur droit pour contacter le support."
+  },
+  "conversation-thread.resubmit-modal.confirmation.description": {
+    "message": "Confirmer que j'ai adressé les messages des modérateurs"
+  },
+  "conversation-thread.resubmit-modal.confirmation.label": {
+    "message": "Je confirme que j'ai bel et bien adressé les messages des modérateurs."
+  },
+  "conversation-thread.resubmit-modal.description": {
+    "message": "Vous soumettez <project-title>{projectTitle}</project-title> à revoir de nouveau par les modérateurs."
+  },
+  "conversation-thread.resubmit-modal.header.resubmitting": {
+    "message": "Soumettre de nouveau à la révision"
+  },
+  "conversation-thread.resubmit-modal.header.submitting": {
+    "message": "Nouvelle soumission à la révision en cours"
+  },
+  "conversation-thread.resubmit-modal.reminder": {
+    "message": "Assurez-vous d’avoir répondu à tous les commentaires de l’équipe de modération."
+  },
+  "conversation-thread.resubmit-modal.warning": {
+    "message": "Les soumissions répétées sans répondre aux commentaires des modérateurs peuvent entraîner une suspension de compte."
+  },
   "create-project-version.create-modal.stage.add-files.admonition": {
     "message": "Les fichiers supplémentaires servent à fournir des ressources complémentaires comme le code source, et non des versions alternatives ou des variantes."
   },
@@ -875,24 +986,9 @@
   "dashboard.head-title": {
     "message": "Tableau de bord"
   },
-  "dashboard.notifications.button.mark-all-as-read": {
-    "message": "Marquer tout comme lu"
-  },
-  "dashboard.notifications.button.view-history": {
-    "message": "Voir l'historique"
-  },
   "dashboard.notifications.empty.no-unread": {
     "message": "Vous n'avez pas de notifications non lues."
   },
-  "dashboard.notifications.error.loading": {
-    "message": "Échec lors du chargement des notifications :"
-  },
-  "dashboard.notifications.history.label": {
-    "message": "Historique"
-  },
-  "dashboard.notifications.history.title": {
-    "message": "Historique des notifications"
-  },
   "dashboard.notifications.link.see-all": {
     "message": "Voir tout"
   },
@@ -902,9 +998,6 @@
   "dashboard.notifications.link.view-more": {
     "message": "Voir {extraNotifs} {extraNotifs, plural, one {notification} other {notifications}} de plus"
   },
-  "dashboard.notifications.loading": {
-    "message": "Chargement des notifications..."
-  },
   "dashboard.organizations.button.create": {
     "message": "Créer une organisation"
   },
@@ -920,6 +1013,27 @@
   "dashboard.organizations.title": {
     "message": "Organisations"
   },
+  "dashboard.overview.notifications.button.mark-all-as-read": {
+    "message": "Marquer tout comme lu"
+  },
+  "dashboard.overview.notifications.button.view-history": {
+    "message": "Voire l'historique"
+  },
+  "dashboard.overview.notifications.empty.no-unread": {
+    "message": "Vous n'avez pas de notifications non lues."
+  },
+  "dashboard.overview.notifications.error.loading": {
+    "message": "Erreur en essayant de charger les notifications :"
+  },
+  "dashboard.overview.notifications.history.label": {
+    "message": "Historique"
+  },
+  "dashboard.overview.notifications.history.title": {
+    "message": "Historique des notifications"
+  },
+  "dashboard.overview.notifications.loading": {
+    "message": "Chargement des notifications..."
+  },
   "dashboard.projects.bulk-edit-hint": {
     "message": "Vous pouvez modifier plusieurs projets en même temps en les sélectionnant ci-dessous."
   },
@@ -1422,7 +1536,7 @@
     "message": "Où se trouvent les serveurs de Modrinth Hosting ? Puis-je choisir une région ?"
   },
   "hosting-marketing.faq.location.answer": {
-    "message": "Nous avons des serveurs disponibles en Amérique du Nord, en Europe et en Asie du Sud-Est en ce moment-même que vous pouvez choisir dès l'achat. Plus de régions à venir dans le futur ! Si vous souhaitez changer de région, veuillez contacter le support."
+    "message": "Nous avons des serveurs disponibles en Amérique du Nord, en Europe et en Asie du Sud-Est pour le moment que vous pouvez choisir lors de l'achat. Plus de régions sont à venir ! Si vous voulez changer de région, contactez le support."
   },
   "hosting-marketing.faq.versions-loaders": {
     "message": "Quelles versions de Minecraft et loaders peuvent-être utilisés ?"
@@ -1754,14 +1868,20 @@
   "layout.banner.add-email.description": {
     "message": "Pour des raisons de sécurité, Modrinth a besoin que vous enregistriez une adresse e-mail sur votre compte."
   },
+  "layout.banner.build-fail.always-ignore": {
+    "message": "Toujours ignorer"
+  },
   "layout.banner.build-fail.description": {
     "message": "Ce déploiement du frontend de Modrinth n’a pas pu générer l’état à partir de l’API. Cela peut être dû à une panne ou à une erreur de configuration. Rebuild lorsque l’API sera disponible. Codes d’erreur : {errors} ; L’URL actuelle de l’API est : {url}"
   },
+  "layout.banner.build-fail.ignore": {
+    "message": "ignorer"
+  },
   "layout.banner.build-fail.title": {
     "message": "Erreur lors de la génération de l’état à partir de l’API pendant la construction."
   },
   "layout.banner.preview.description": {
-    "message": "Si vous souhaitez accéder au site officiel de Modrinth, visitez <link>https://modrinth.com</link>. Ce déploiement d'aperçu est utilisé par le personnel de Modrinth à des fins de test. ​Il a été construit en utilisant <branch-link>{owner}/{branch}</branch-link> @ {commit}."
+    "message": "Si vous voulez accéder au site officiel de Modrinth, visitez {url}. Cet aperçu\nde déploiement est utilisée par le staff de Modrinth pour des raisons d'essai.\nIl a été construit en utilisant <branch-link>{owner}/{branch}</branch-link> @ {commit}."
   },
   "layout.banner.preview.title": {
     "message": "Ceci est un déploiement de prévisualisation du site Modrinth."
@@ -2591,6 +2711,84 @@
   "project.license.title": {
     "message": "License"
   },
+  "project.moderation.admonition.approved.body.private": {
+    "message": "Votre projet est privé, il n'est accessible que par vous et les personnes que vous invitez."
+  },
+  "project.moderation.admonition.approved.body.public": {
+    "message": "Votre projet est publié et est découvrable sur Modrinth."
+  },
+  "project.moderation.admonition.approved.body.unlisted": {
+    "message": "Votre projet est non répertorié, ce qui signifie qu'il n'est accessible qu'avec un lien direct et ne sera pas découvrable sur Modrinth."
+  },
+  "project.moderation.admonition.approved.body.visibility-message": {
+    "message": "Vous pouvez changer la visibilité de votre projet dans les <visibility-settings-link>paramètres de visibilité</visibility-settings-link> de votre projet."
+  },
+  "project.moderation.admonition.approved.header": {
+    "message": "Projet approuvé"
+  },
+  "project.moderation.admonition.draft.body": {
+    "message": "Ce projet est un brouillon et ne peut être vu par les autres jusqu'à ce qu'il soit soumis à la révision et approuvé par les modérateurs de Modrinth."
+  },
+  "project.moderation.admonition.draft.header": {
+    "message": "Brouillon"
+  },
+  "project.moderation.admonition.draft.submit-for-review": {
+    "message": "Une fois que vous avez terminé toutes les étapes requises et que vous vous êtes assuré que votre projet est conforme aux <rules-link>Règles de contenu</rules-link>, vous pouvez soumettre votre projet pour examen."
+  },
+  "project.moderation.admonition.rejected.address-all-concerns": {
+    "message": "Veuillez répondre à toutes les préoccupations de modération, y compris les problèmes énumérés dans les messages ci-dessous, avant de soumettre à nouveau ce projet."
+  },
+  "project.moderation.admonition.rejected.header": {
+    "message": "Changements demandés"
+  },
+  "project.moderation.admonition.rejected.spam-notice": {
+    "message": "Soumettre à plusieurs reprises votre projet sans répondre à toutes les préoccupations de modération peut d'abord entraîner une suspension de compte."
+  },
+  "project.moderation.admonition.under-review.body.1": {
+    "message": "Votre projet est en file d'attente pour être examiné par l'équipe de modération de Modrinth."
+  },
+  "project.moderation.admonition.under-review.body.2": {
+    "message": "Votre projet sera scanné puis examiné par les modérateurs humains pour s'assurer qu'il répond aux règles des <rules-link>règle du contenu</rules-link> et des <terms-link>conditions d'utilisation</terms-link> de Modrinth."
+  },
+  "project.moderation.admonition.under-review.body.3": {
+    "message": "Vous pouvez toujours modifier votre projet, cela n'affectera pas votre position dans la file d'attente."
+  },
+  "project.moderation.admonition.under-review.body.4": {
+    "message": "Nous visons à examiner les soumissions dans les 24 à 48 heures, mais certains projets peuvent être menacés. Cela ne reflète pas un problème avec votre soumission."
+  },
+  "project.moderation.admonition.under-review.body.5": {
+    "message": "<emphasis>Nous apprécions votre patience pendant que nos modérateurs travaillent dur pour garder Modrinth en sécurité, et nous sommes impatients de vous aider à partager votre contenu !</emphasis>"
+  },
+  "project.moderation.admonition.under-review.header": {
+    "message": "Projet en cours de révision"
+  },
+  "project.moderation.admonition.withheld.body": {
+    "message": "Votre projet n'apparaîtra pas en public et ne peut être accédé qu'avec un lien direct. {requestedStatus, select, unlisted {Vu vos <visibility-settings-link>paramètres de visibilité </visibility-settings-link> sélectionnés, il est fort probable qu'aucune action ne soit nécessaire.} other {Veuillez répondre à toutes les préoccupations de modération, y compris tout problème énuméré dans les messages ci-dessous avant de soumettre à nouveau ce projet.}}"
+  },
+  "project.moderation.admonition.withheld.header": {
+    "message": "Non répertorié par le personnel"
+  },
+  "project.moderation.error.unauthorized": {
+    "message": "Non autorisé"
+  },
+  "project.moderation.thread.approved-warning": {
+    "message": "Ce fil n’est pas surveillé activement, mais peut être examiné pour obtenir des informations sur votre projet si nécessaire."
+  },
+  "project.moderation.thread.help-center-note.1": {
+    "message": "Les modérateurs de contenu ne peuvent pas fournir de support pour la plupart des problèmes et les messages à ce fil ne notifient pas le personnel."
+  },
+  "project.moderation.thread.help-center-note.2": {
+    "message": "Si vous avez besoin d'aide ou si vous avez des demandes de renseignements supplémentaires, veuillez visiter le <help-center-link>Modrinth Help Center</help-center-link> et cliquez sur la bulle bleue pour contacter le support."
+  },
+  "project.moderation.thread.moderator-see-user-ui-toggle": {
+    "message": "Montrer l'interface des membres"
+  },
+  "project.moderation.thread.private-description": {
+    "message": "Il s'agit d'un fil de conversation privé avec les modérateurs du Modrinthe. Ils peuvent vous envoyer un message avec des problèmes concernant ce projet."
+  },
+  "project.moderation.thread.title": {
+    "message": "Messages de modération"
+  },
   "project.moderation.title": {
     "message": "Modération"
   },

apps/frontend/src/locales/he-IL/index.json

@@ -1163,9 +1163,6 @@
   "hosting-marketing.faq.location": {
     "message": "היכן ממוקמים שרתי האחסון של Modrinth? האם ניתן לבחור אזור?"
   },
-  "hosting-marketing.faq.location.answer": {
-    "message": "כרגע זמינים עבורכם שרתים בצפון אמריקה, אירופה ודרום-מזרח אסיה, אותם ניתן לבחור בעמד הרכישה. אזורים נוספים יתווספו בעתיד! אם תרצו להחליף את האזור שלכם, אנא צרו קשר עם התמיכה."
-  },
   "hosting-marketing.faq.versions-loaders": {
     "message": "באילו גרסאות של מיינקראפט ובאילו Loaders ניתן להשתמש?"
   },
@@ -1499,9 +1496,6 @@
   "layout.banner.build-fail.title": {
     "message": "שגיאה ביצירת נתונים מהAPI במהלך הבנייה."
   },
-  "layout.banner.preview.description": {
-    "message": "אם התכוונת לגשת לאתר הרשמי של Modrinth, בקר בכתובת <link>https://modrinth.com</link>. פריסת תצוגה מקדימה זו משמשת את צוות Modrinth למטרות בדיקה בלבד. היא נבנתה באמצעות <branch-link>{owner}/{branch}</branch-link> @ {commit}."
-  },
   "layout.banner.preview.title": {
     "message": "זוהי פריסת תצוגה מקדימה של אתר Modrinth."
   },

apps/frontend/src/locales/hu-HU/index.json

@@ -258,10 +258,10 @@
     "message": "Jelszavad visszaállítása"
   },
   "auth.sign-in.2fa.description": {
-    "message": "Kérjük írja be a kétlépcsős hitelesítés kódját a folytatáshoz."
+    "message": "Kérlek írd be a kétlépcsős hitelesítés kódját a folytatáshoz."
   },
   "auth.sign-in.2fa.label": {
-    "message": "Írja be a kétlépcsős hitelesítés kódját"
+    "message": "Írd be a kétlépcsős hitelesítés kódját"
   },
   "auth.sign-in.2fa.placeholder": {
     "message": "Kód beírása..."
@@ -291,7 +291,7 @@
     "message": "Már van fiókod?"
   },
   "auth.sign-up.subscribe.label": {
-    "message": "Iratkozzon fel a Modrinth frissítéseiről szóló értesítésekre"
+    "message": "Feliratkozás a Modrinth híreire és frissítéseire"
   },
   "auth.sign-up.title": {
     "message": "Regisztráció"
@@ -333,7 +333,7 @@
     "message": "Email-cím hitelesítése"
   },
   "auth.welcome.checkbox.subscribe": {
-    "message": "Iratkozzon fel a Modrinth frissítéseiről szóló értesítésekre"
+    "message": "Feliratkozás a Modrinth híreire és frissítéseire"
   },
   "auth.welcome.description": {
     "message": "Most már része vagy annak a fantasztikus fejlesztők és felfedezők közösségének, akik már építenek, letöltenek és naprakészek maradnak a csodálatos modokkal kapcsolatban."
@@ -407,6 +407,87 @@
   "collection.title": {
     "message": "{name} - Gyűjtemény"
   },
+  "conversation-thread.action.add-private-note": {
+    "message": "Privát megjegyzés"
+  },
+  "conversation-thread.action.approve": {
+    "message": "Jóváhagyás"
+  },
+  "conversation-thread.action.approve-with-reply": {
+    "message": "Jóváhagyás és válasz"
+  },
+  "conversation-thread.action.close-thread": {
+    "message": "Gondolatmenet lezárása"
+  },
+  "conversation-thread.action.close-with-reply": {
+    "message": "Bezárás és válasz"
+  },
+  "conversation-thread.action.reject": {
+    "message": "Elutasítás"
+  },
+  "conversation-thread.action.reject-with-reply": {
+    "message": "Elutasítás és válasz"
+  },
+  "conversation-thread.action.reopen-thread": {
+    "message": "Szál újramegnyitása"
+  },
+  "conversation-thread.action.reply": {
+    "message": "Válasz"
+  },
+  "conversation-thread.action.reply-to-thread": {
+    "message": "Válasz a beszélgetésre"
+  },
+  "conversation-thread.action.resubmit-for-review": {
+    "message": "Benyújtás újra felülvizsgálatra"
+  },
+  "conversation-thread.action.send": {
+    "message": "Küldés"
+  },
+  "conversation-thread.action.send-to-review": {
+    "message": "Küldés áttekintésre"
+  },
+  "conversation-thread.action.send-to-review-with-reply": {
+    "message": "Küldés áttekintésre válasszal"
+  },
+  "conversation-thread.action.set-to-draft": {
+    "message": "Beállítás vázlatként"
+  },
+  "conversation-thread.action.withhold": {
+    "message": "Visszatartás"
+  },
+  "conversation-thread.action.withhold-with-reply": {
+    "message": "Visszatartás és válasz"
+  },
+  "conversation-thread.error.closing-report": {
+    "message": "Hiba a jelentés bezárásában"
+  },
+  "conversation-thread.error.reopening-report": {
+    "message": "Hiba a jelentés újranyitásában"
+  },
+  "conversation-thread.error.sending-message": {
+    "message": "Hiba történt az üzenet elküldésekor"
+  },
+  "conversation-thread.reply-editor.placeholder.send": {
+    "message": "Üzenet írása..."
+  },
+  "conversation-thread.reply-modal.description": {
+    "message": "A projekted már jóváhagyásra került, ezért a moderátorcsapat nem követi aktívan ezt a témát. Ugyanakkor előfordulhat, hogy meglátják az üzenetedet, ha valami probléma adódik a projekteddel kapcsolatban."
+  },
+  "conversation-thread.reply-modal.help-center-note": {
+    "message": "Ha kapcsolatba szeretnél lépni a moderátorcsapattal, kérjük, használd a <help-center-link>Modrinth Súgó</help-center-link> oldalt, és kattints a jobb alsó sarokban található kék buborékra az ügyfélszolgálat elérése érdekében."
+  },
+  "conversation-thread.resubmit-modal.confirmation.label": {
+    "message": "Megerősítem, hogy a moderátorok észrevételeit megfelelően figyelembe vettem."
+  },
+  "conversation-thread.resubmit-modal.description": {
+    "message": "A(z) <project-title>{projectTitle}</project-title> projektet újra benyújtod a moderátorok felülvizsgálatára."
+  },
+  "conversation-thread.resubmit-modal.header.resubmitting": {
+    "message": "Benyújtás újra felülvizsgálatra"
+  },
+  "conversation-thread.resubmit-modal.header.submitting": {
+    "message": "Benyújtás felülvizsgálatra"
+  },
   "create-project-version.create-modal.stage.add-files.admonition": {
     "message": "A kiegészítő fájlok olyan kiegészítő forrásokhoz tartoznak, mint például a forráskód, nem pedig alternatív verziókhoz vagy változatokhoz."
   },
@@ -474,7 +555,7 @@
     "message": "Név"
   },
   "create.organization.name-placeholder": {
-    "message": "Adj meg a szerverzetednek egy nevet..."
+    "message": "Adj meg a szervezetednek egy nevet..."
   },
   "create.organization.ownership-info": {
     "message": "Át fogod ruházni a tulajdonjogod erre a szervezetre, de már meghívhatsz másokat és átruházhatod a tulajdonjogot bármikor."
@@ -872,24 +953,9 @@
   "dashboard.head-title": {
     "message": "Irányítópult"
   },
-  "dashboard.notifications.button.mark-all-as-read": {
-    "message": "Összes megjelölése olvasottként"
-  },
-  "dashboard.notifications.button.view-history": {
-    "message": "Előzmények megtekintése"
-  },
   "dashboard.notifications.empty.no-unread": {
     "message": "Nincsenek olvasatlan értesítéseid."
   },
-  "dashboard.notifications.error.loading": {
-    "message": "Hiba az értesítések betöltése során:"
-  },
-  "dashboard.notifications.history.label": {
-    "message": "Előzmények"
-  },
-  "dashboard.notifications.history.title": {
-    "message": "Értesítési előzmények"
-  },
   "dashboard.notifications.link.see-all": {
     "message": "Összes megtekintése"
   },
@@ -899,9 +965,6 @@
   "dashboard.notifications.link.view-more": {
     "message": "További {extraNotifs} értesítés megtekintése"
   },
-  "dashboard.notifications.loading": {
-    "message": "Értesítések betöltése"
-  },
   "dashboard.organizations.button.create": {
     "message": "Szervezet létrehozása"
   },
@@ -914,6 +977,27 @@
   "dashboard.organizations.title": {
     "message": "Szervezetek"
   },
+  "dashboard.overview.notifications.button.mark-all-as-read": {
+    "message": "Összes megjelölése olvasottként"
+  },
+  "dashboard.overview.notifications.button.view-history": {
+    "message": "Előzmények megtekintése"
+  },
+  "dashboard.overview.notifications.empty.no-unread": {
+    "message": "Nincsenek olvasatlan értesítéseid."
+  },
+  "dashboard.overview.notifications.error.loading": {
+    "message": "Hiba az értesítések betöltése során:"
+  },
+  "dashboard.overview.notifications.history.label": {
+    "message": "Előzmények"
+  },
+  "dashboard.overview.notifications.history.title": {
+    "message": "Értesítési előzmények"
+  },
+  "dashboard.overview.notifications.loading": {
+    "message": "Értesítések betöltése..."
+  },
   "dashboard.projects.bulk-edit-hint": {
     "message": "Több projektet is szerkeszthetsz egyszerre, ha kiválasztod őket alább."
   },
@@ -924,10 +1008,10 @@
     "message": "Projektek"
   },
   "dashboard.projects.links.and-more": {
-    "message": "és még {count} további..."
+    "message": "és még {count} másik..."
   },
   "dashboard.projects.links.button.clear-link": {
-    "message": "Link törlése"
+    "message": "Hivatkozás törlése"
   },
   "dashboard.projects.links.button.edit": {
     "message": "Linkek szerkesztése"
@@ -974,6 +1058,9 @@
   "dashboard.projects.project.moderator-message-aria": {
     "message": "A projekt üzenetet kapott a moderátoroktól. További információkért nézd meg a projektet."
   },
+  "dashboard.projects.project.review-environment-metadata": {
+    "message": "Kérlek ellenőrizd a környezeti metaadatokat"
+  },
   "dashboard.projects.sort.ascending": {
     "message": "Növekvő"
   },
@@ -1211,6 +1298,27 @@
   "discover.install.back-to-server": {
     "message": "Vissza a szerverhez"
   },
+  "discover.install.back-to-setup": {
+    "message": "Vissza a beállításhoz"
+  },
+  "discover.install.cancel-reset": {
+    "message": "Visszaállítás visszavonása"
+  },
+  "discover.install.error.no-server-world": {
+    "message": "Nem található szerver világ ami letölthető."
+  },
+  "discover.install.error.unsupported-content-type": {
+    "message": "Ez a tartalomtípus nem telepíthető a szerverre a „” menüpontból."
+  },
+  "discover.seo.description": {
+    "message": "Keress és böngéssz több ezer Minecraft-{projectType, select, mod {mod} modpack {modcsomag} resourcepack {forráscsomag} shader {shader} plugin {bővítmény} datapack {adatcsomag} other {projekt}} között a Modrinthon gyors és pontos keresési találatokkal. Szűrőink segítenek gyorsan megtalálni a legjobb Minecraft-{projectType, select, mod {modokat} modpack {modcsomagokat} resourcepack {forráscsomagokat} shader {shadereket} plugin {bővítményeket} datapack {adatcsomagokat} other {projekteket}}."
+  },
+  "discover.seo.title": {
+    "message": "{projectType, select, mod {Modok} modpack {Modcsomagok} resourcepack {Forráscsomagok} shader {Shaderek} plugin {Bővítmények} datapack {Adatcsomagok} other {Projektek}} keresése"
+  },
+  "discover.seo.title-with-query": {
+    "message": "{projectType, select, mod {Modok} modpack {Modcsomagok} resourcepack {Forráscsomagok} shader {Shaderek} plugin {Bővítmények} datapack {Adatcsomagok} other {Projektek}} keresése | {query}"
+  },
   "error.collection.404.list_item.1": {
     "message": "Elírhatad a gyűjtemémyed linkjét."
   },
@@ -1226,6 +1334,12 @@
   "error.collection.404.title": {
     "message": "Nem található gyűjtemény"
   },
+  "error.generic.401.signed-in-as": {
+    "message": "Jelenleg a következőként vagy bejelentkezve:"
+  },
+  "error.generic.401.title": {
+    "message": "Nincs hozzáférésed ehhez az oldalhoz"
+  },
   "error.generic.404.subtitle": {
     "message": "Ez az oldal ami iránt érdeklődsz úgy látszik, hogy nem létezik."
   },
@@ -1370,9 +1484,6 @@
   "hosting-marketing.faq.location": {
     "message": "Hol találhatók a Modrinth Hosting szerverei? Kiválaszthatom a régiót?"
   },
-  "hosting-marketing.faq.location.answer": {
-    "message": "Jelenleg Észak-Amerikában, Európában és Délkelet-Ázsiában állnak rendelkezésre szerverek, amelyek közül vásárláskor választhatsz. A jövőben további régiók is elérhetővé válnak! Ha szeretnéd megváltoztatni a régiót, vedd fel a kapcsolatot az ügyfélszolgálattal."
-  },
   "hosting-marketing.faq.versions-loaders": {
     "message": "Melyik Minecraft verziók és betöltők használhatók?"
   },
@@ -1641,7 +1752,7 @@
     "message": "Játékosoknak"
   },
   "landing.section.for-players.tagline": {
-    "message": "Fedez fel több mint {count, number} alkotást"
+    "message": "Fedezz fel több mint {count, number} alkotást"
   },
   "landing.subheading": {
     "message": "Fedezz fel, játssz és ossz meg Minecraft-tartalmakat a közösség számára létrehozott nyílt forráskódú platformunkon."
@@ -1652,6 +1763,9 @@
   "layout.action.create-new": {
     "message": "Új létrehozása..."
   },
+  "layout.action.external-projects": {
+    "message": "Külső projektek"
+  },
   "layout.action.file-lookup": {
     "message": "Fájl keresés"
   },
@@ -1700,17 +1814,23 @@
   "layout.banner.add-email.description": {
     "message": "Biztonsági okok miatt a Modrinthon kell egy e-mail cím a fiókodhoz."
   },
+  "layout.banner.build-fail.always-ignore": {
+    "message": "Mindig mellőzd"
+  },
   "layout.banner.build-fail.description": {
-    "message": "A Modrinth felhasználói felületének jelenlegi telepítése nem tudta az API-ból lekérni az állapotadatokat. Ennek oka lehet egy szolgáltatáskimaradás vagy konfigurációs hiba. Kérünk, próbáld meg újra, amikor az API újra elérhetővé válik. Hibakódok: {errors}; Az API jelenlegi linkje: {url}"
+    "message": "A Modrinth felhasználói felületének jelenlegi telepítése nem tudta az API-ból lekérni az állapotadatokat. Ennek oka lehet egy szolgáltatáskimaradás vagy konfigurációs hiba. Kérlek próbáld meg újra, amikor az API újra elérhetővé válik. Hibakódok: {errors}; Az API jelenlegi linkje: {url}"
+  },
+  "layout.banner.build-fail.ignore": {
+    "message": "Mellőz"
   },
   "layout.banner.build-fail.title": {
     "message": "Hiba történt az API állapotának generálása közben a fordítás során."
   },
   "layout.banner.preview.description": {
-    "message": "Ha a hivatalos Modrinth weboldalt szeretnéd elérni, látogass el az <link>https://modrinth.com</link> oldalra. Ezt az előzetes telepítést a Modrinth munkatársai tesztelési célokra használják. A <branch-link>{owner}/{branch</branch-link> @ {commit} használatával készült."
+    "message": "Ha a hivatalos Modrinth weboldalt szeretnéd elérni, látogass el a {url} oldalra. Ezt az előzetes verziót a Modrinth munkatársai tesztelési célokra használják. A <branch-link>{owner}/{branch</branch-link> @ {commit} használatával készült."
   },
   "layout.banner.preview.title": {
-    "message": "Ez a Modrinth weboldal előzetes telepítése."
+    "message": "Ez a Modrinth weboldal előzetes verziója."
   },
   "layout.banner.staging.description": {
     "message": "A tesztelési környezet teljesen elkülönül az éles Modrinth adatbázistól. Ezt tesztelési és hibakeresési célokra használják, és a Modrinth backend vagy frontend fejlesztés alatt álló, az éles példánynál újabb verzióit futtathatja."
@@ -1904,12 +2024,18 @@
   "moderation.moderate": {
     "message": "Moderált"
   },
+  "moderation.page.external-projects": {
+    "message": "Külső projektek"
+  },
   "moderation.page.projects": {
     "message": "Projektek"
   },
   "moderation.page.reports": {
     "message": "Jelentések"
   },
+  "moderation.page.technicalReview": {
+    "message": "Technikai áttekintés"
+  },
   "muralpay.account-type.checking": {
     "message": "Ellenőrzés"
   },
@@ -2478,7 +2604,7 @@
     "message": "Játékverziók keresése..."
   },
   "project.download.search-game-versions-label": {
-    "message": "Játékverziók keresése…"
+    "message": "Játékverziók keresése..."
   },
   "project.download.select-game-version": {
     "message": "Játékverzió kiválasztása"
@@ -2505,10 +2631,10 @@
     "message": "Átdolgoztuk a Modrinth Környezetek rendszerét, és új lehetőségek érhetők el. Kérjük, ellenőrizd, hogy a metaadatok helyesek-e."
   },
   "project.environment.migration.review-button": {
-    "message": "Környezet beállítások Átnézése"
+    "message": "Környezeti beállítások áttekintése"
   },
   "project.environment.migration.title": {
-    "message": "Kérjük, tekintse át a környezet metaadatait"
+    "message": "Kérlek tekintsd át a környezeti metaadatokat"
   },
   "project.error.loading": {
     "message": "Hiba a projektadatok {message} betöltése közben"
@@ -2531,6 +2657,33 @@
   "project.license.title": {
     "message": "Licensz"
   },
+  "project.moderation.admonition.approved.body.private": {
+    "message": "A projekted privát, vagyis csak te és az általad meghívott személyek férhetnek hozzá."
+  },
+  "project.moderation.admonition.approved.header": {
+    "message": "Projekt jóváhagyva"
+  },
+  "project.moderation.admonition.draft.body": {
+    "message": "Ez egy projektvázlat, amelyet mások nem láthatnak, amíg azt felülvizsgálatra nem nyújtják be, és a Modrinth moderátori csapata jóvá nem hagyja."
+  },
+  "project.moderation.admonition.draft.header": {
+    "message": "Projektvázlat"
+  },
+  "project.moderation.admonition.draft.submit-for-review": {
+    "message": "Miután elvégezted az összes szükséges lépést, és meggyőződtél arról, hogy a projekted megfelel a Modrinth <rules-link>Tartalmi szabályainak</rules-link>, benyújthatod a projektedet felülvizsgálatra."
+  },
+  "project.moderation.admonition.rejected.header": {
+    "message": "Változtatások kérve lettek"
+  },
+  "project.moderation.admonition.under-review.body.5": {
+    "message": "<emphasis>Köszönjük türelmedet, amíg moderátoraink keményen dolgoznak a Modrinth biztonságának fenntartásán, és alig várjuk, hogy segíthessünk tartalmaid megosztásában! 💚</emphasis>"
+  },
+  "project.moderation.admonition.under-review.header": {
+    "message": "Projekt áttekintés alatt"
+  },
+  "project.moderation.thread.title": {
+    "message": "Moderációs üzenetek"
+  },
   "project.moderation.title": {
     "message": "Moderáció"
   },
@@ -2594,6 +2747,18 @@
   "project.settings.general.url.title": {
     "message": "Link"
   },
+  "project.settings.permissions.empty-state.description": {
+    "message": "Egyik verziód sem tartalmaz külső tartalmat, így nem kell aggódnod a jogosultságok beszerzése miatt."
+  },
+  "project.settings.permissions.empty-state.heading": {
+    "message": "Kész is van!"
+  },
+  "project.settings.permissions.learn-more": {
+    "message": "További információ"
+  },
+  "project.settings.permissions.search-placeholder": {
+    "message": "Keresés {count} külső projekt között..."
+  },
   "project.settings.title": {
     "message": "Beállítások"
   },
@@ -2612,6 +2777,15 @@
   "project.versions.title": {
     "message": "Verziók"
   },
+  "project.versions.withheld-versions-warning.description": {
+    "message": "{count, plural, one {Ez a verzió} other {Ezek a verziók}} jelenleg vissza van tartva, és nem érhető{count, plural, one {} other {k}} el nyilvánosan. Kérjük, igazold, hogy engedéllyel rendelkezel a modcsomag {count, plural, one {verziójában} other {verzióiban}} található bizonyos fájlok terjesztésére."
+  },
+  "project.versions.withheld-versions-warning.resolve-button": {
+    "message": "Megoldás"
+  },
+  "project.versions.withheld-versions-warning.title": {
+    "message": "{count, plural, one {A(z) {version_name} verzió} other {A verziók}} ismeretlen beágyazott tartalom miatt vissza lett{count, plural, one {} other {ek}} tartva"
+  },
   "report.already-reported": {
     "message": "Már feljelentetted ezt: {title}"
   },
@@ -2981,6 +3155,9 @@
   "search.filter.locked.server.sync": {
     "message": "Szinkronizálás a szerverrel"
   },
+  "servers.manage.content.title": {
+    "message": "Tartalom – {serverName} – Modrinth"
+  },
   "servers.notice.actions": {
     "message": "Műveletek"
   },
@@ -3318,10 +3495,10 @@
     "message": "által"
   },
   "settings.authorizations.description": {
-    "message": "Amikor engedélyezel egy alkalmazást a Modrinth-fiókjoddal, hozzáférést biztosítasz számára a fiókodhoz. A fiókodhoz való hozzáférést bármikor kezelheted és ellenőrizheted itt."
+    "message": "Amikor engedélyezel egy alkalmazást a Modrinth fiókoddal, hozzáférést biztosítasz számára a fiókodhoz. A fiókodhoz való hozzáférést bármikor kezelheted és ellenőrizheted itt."
   },
   "settings.authorizations.empty-state": {
-    "message": "Jelenleg nem tudjuk megjeleníteni a jogosult alkalmazásait, dolgozunk a probléma megoldásán. Kérjük, látogassa meg ezt az oldalt később!"
+    "message": "Jelenleg nem tudjuk megjeleníteni az azonosított alkalmazásokat, dolgozunk a probléma megoldásán. Kérlek látogasd meg ezt az oldalt később!"
   },
   "settings.authorizations.head-title": {
     "message": "Engedélyek"
@@ -3699,7 +3876,7 @@
     "message": "Bemutatkozás"
   },
   "settings.profile.description": {
-    "message": "A rofiladataid nyilvánosan megtekinthetők a Modrinth oldalon és a <docs-link>Modrinth API</docs-link>-n keresztül."
+    "message": "A profiladataid nyilvánosan megtekinthetők a Modrinthon és a <docs-link>Modrinth API</docs-link>-n keresztül."
   },
   "settings.profile.head-title": {
     "message": "Profilbeállítások"

apps/frontend/src/locales/id-ID/index.json

@@ -1163,9 +1163,6 @@
   "hosting-marketing.faq.location": {
     "message": "Di mana server Modrinth Hosting terletak? Dapatkah saya memilih wilayah?"
   },
-  "hosting-marketing.faq.location.answer": {
-    "message": "Server kami tersedia di Amerika Utara, Eropa, dan Asia Tenggara dan Anda dapat memilihnya saat membeli. Wilayah-wilayah lain akan segera hadir di masa mendatang! Bila Anda ingin mengganti wilayah Anda, mohon hubungi dukungan."
-  },
   "hosting-marketing.faq.versions-loaders": {
     "message": "Versi dan pemuat Minecraft apa sajakah yang dapat digunakan?"
   },
@@ -1499,9 +1496,6 @@
   "layout.banner.build-fail.title": {
     "message": "Terjadi kesalahan saat menghasilkan keadaan dari API saat membangun."
   },
-  "layout.banner.preview.description": {
-    "message": "Bila Anda bermaksud untuk mengakses situs resmi Modrinth, kunjungi <link>https://modrinth.com</link>. Penerapan pratinjau ini digunakan oleh staf Modrinth untuk tujuan pengujian dan dibangun menggunakan <branch-link>{owner}/{branch}</branch-link> @ {commit}."
-  },
   "layout.banner.preview.title": {
     "message": "Ini adalah penerapan pratinjau dari situs web Modrinth."
   },