Merge remote-tracking branch 'origin/main' into cal/content-tab-rewrite-hosting

Author: IMB11

.github/workflows/theseus-build.yml

@@ -19,7 +19,7 @@ on:
       sign-windows-binaries:
         description: Sign Windows binaries
         type: boolean
-        default: true
+        default: false
         required: false
 
 jobs:
@@ -40,33 +40,48 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - name: 📥 Check out code
+      - name: Check out code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: 🧰 Setup Rust toolchain
+      - name: Setup Rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           rustflags: ''
           target: ${{ startsWith(matrix.platform, 'macos') && 'x86_64-apple-darwin' || '' }}
 
-      - name: 🧰 Install pnpm
+      - name: Install pnpm
         uses: pnpm/action-setup@v4
 
-      - name: 🧰 Setup Node.js
+      - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: pnpm
 
-      - name: 🧰 Install Linux build dependencies
+      - name: Generate tauri-dev.conf.json
+        shell: bash
+        run: |
+          GIT_HASH=$(git rev-parse --short HEAD)
+          cat > apps/app/tauri-dev.conf.json <<EOF
+          {
+            "productName": "Modrinth App (dev-${GIT_HASH})",
+            "mainBinaryName": "Modrinth App (dev-${GIT_HASH})",
+            "identifier": "ModrinthApp-dev-${GIT_HASH}",
+            "bundle": {
+              "fileAssociations": []
+            }
+          }
+          EOF
+
+      - name: Install Linux build dependencies
         if: startsWith(matrix.platform, 'ubuntu')
         run: |
           sudo apt-get update
           sudo apt-get install -yq libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev
 
-      - name: 🧰 Setup Dasel
+      - name: Setup Dasel
         uses: jaxxstorm/action-install-gh-release@v2.1.0
         with:
           repo: TomWright/dasel
@@ -75,7 +90,7 @@ jobs:
           rename-to: ${{ startsWith(matrix.platform, 'windows') && 'dasel.exe' || 'dasel' }}
           chmod: 0755
 
-      - name: ⚙️ Set application version and environment
+      - name: Set application version and environment
         shell: bash
         run: |
           APP_VERSION="$(git describe --tags --always | sed -E 's/-([0-9]+)-(g[0-9a-fA-F]+)$/-canary+\1.\2/')"
@@ -86,13 +101,13 @@ jobs:
 
           cp packages/app-lib/.env.prod packages/app-lib/.env
 
-      - name: 💨 Setup Turbo cache
+      - name: Setup Turbo cache
         uses: rharkor/caching-for-turbo@v1.8
 
-      - name: 🧰 Install dependencies
+      - name: Install dependencies
         run: pnpm install
 
-      - name: ✍️ Set up Windows code signing
+      - name: Set up Windows code signing
         if: startsWith(matrix.platform, 'windows')
         shell: bash
         run: |
@@ -102,8 +117,8 @@ jobs:
             dasel delete -f apps/app/tauri-release.conf.json 'bundle.windows.signCommand'
           fi
 
-      - name: 🔨 Build macOS app
-        run: pnpm --filter=@modrinth/app run tauri build --target universal-apple-darwin --config tauri-release.conf.json
+      - name: Build macOS app
+        run: ${{ github.ref == 'refs/heads/main' && 'pnpm --filter=@modrinth/app run tauri build --target universal-apple-darwin --config tauri-release.conf.json' || 'pnpm --filter=@modrinth/app run tauri build --target universal-apple-darwin --config tauri-dev.conf.json' }}
         if: startsWith(matrix.platform, 'macos')
         env:
           ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
@@ -116,19 +131,19 @@ jobs:
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
 
-      - name: 🔨 Build Linux app
-        run: pnpm --filter=@modrinth/app run tauri build --config tauri-release.conf.json
+      - name: Build Linux app
+        run: ${{ github.ref == 'refs/heads/main' && 'pnpm --filter=@modrinth/app run tauri build --config tauri-release.conf.json' || 'pnpm --filter=@modrinth/app run tauri build --config tauri-dev.conf.json' }}
         if: startsWith(matrix.platform, 'ubuntu')
         env:
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
 
-      - name: 🔨 Build Windows app
+      - name: Build Windows app
         run: |
           [System.Convert]::FromBase64String("$env:DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_BASE64") | Set-Content -Path signer-client-cert.p12 -AsByteStream
           $env:DIGICERT_ONE_SIGNER_CREDENTIALS = "$env:DIGICERT_ONE_SIGNER_API_KEY|$PWD\signer-client-cert.p12|$env:DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_PASSWORD"
           $env:JAVA_HOME = "$env:JAVA_HOME_17_X64"
-          pnpm --filter=@modrinth/app run tauri build --config tauri-release.conf.json --verbose --bundles 'nsis,updater'
+          ${{ github.ref == 'refs/heads/main' && 'pnpm --filter=@modrinth/app run tauri build --config tauri-release.conf.json --verbose --bundles "nsis,updater"' || 'pnpm --filter=@modrinth/app run tauri build --config tauri-dev.conf.json --verbose --bundles "nsis,updater"' }}
           Remove-Item -Path signer-client-cert.p12 -ErrorAction SilentlyContinue
         if: startsWith(matrix.platform, 'windows')
         env:
@@ -138,15 +153,21 @@ jobs:
           DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_BASE64: ${{ secrets.DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_BASE64 }}
           DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_PASSWORD: ${{ secrets.DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_PASSWORD }}
 
-      - name: 📤 Upload app bundles
+      - name: Upload app bundles
         uses: actions/upload-artifact@v4
         with:
           name: App bundle (${{ matrix.artifact-target-name }})
           path: |
             target/release/bundle/appimage/Modrinth App_*.AppImage*
             target/release/bundle/deb/Modrinth App_*.deb*
             target/release/bundle/rpm/Modrinth App-*.rpm*
+            target/release/bundle/appimage/Modrinth App (dev-*)_*.AppImage*
+            target/release/bundle/deb/Modrinth App (dev-*)_*.deb*
+            target/release/bundle/rpm/Modrinth App (dev-*)-*.rpm*
             target/universal-apple-darwin/release/bundle/macos/Modrinth App.app.tar.gz*
+            target/universal-apple-darwin/release/bundle/macos/Modrinth App (dev-*)*.app.tar.gz
+            target/universal-apple-darwin/release/bundle/dmg/Modrinth App (dev-*)*.dmg
             target/universal-apple-darwin/release/bundle/dmg/Modrinth App_*.dmg*
             target/release/bundle/nsis/Modrinth App_*-setup.exe*
+            target/release/bundle/nsis/Modrinth App (dev-*)_*-setup.exe*
             target/release/bundle/nsis/Modrinth App_*-setup.nsis.zip*

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

@@ -7,7 +7,7 @@ import {
 	Chips,
 	Combobox,
 	defineMessages,
-	getTagMessageOrDefault,
+	formatLoader,
 	injectNotificationManager,
 	useVIntl,
 } from '@modrinth/ui'
@@ -472,10 +472,7 @@ const messages = defineMessages({
 				<h2 class="m-0 mt-4 text-lg font-extrabold text-contrast block">
 					{{
 						formatMessage(messages.loaderVersion, {
-							loader: (() => {
-								const message = getTagMessageOrDefault(loader, 'loader')
-								return typeof message === 'string' ? message : formatMessage(message)
-							})(),
+							loader: formatLoader(formatMessage, loader),
 						})
 					}}
 				</h2>
@@ -509,10 +506,7 @@ const messages = defineMessages({
 												? messages.alreadyInstalledVanilla
 												: messages.alreadyInstalledModded,
 											{
-												platform: (() => {
-													const message = getTagMessageOrDefault(loader, 'loader')
-													return typeof message === 'string' ? message : formatMessage(message)
-												})(),
+												platform: formatLoader(formatMessage, loader),
 												version: instance.loader_version,
 												game_version: gameVersion,
 											},

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

@@ -470,9 +470,6 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "أدخل العرض..."
   },
-  "instance.settings.title": {
-    "message": "الإعدادات"
-  },
   "instance.worlds.a_minecraft_server": {
     "message": "خادم ماين كرافت"
   },

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

@@ -33,10 +33,13 @@
     "message": "Správa zdrojů"
   },
   "app.update-toast.body": {
-    "message": "Aplikace Modrinth v{version} je připravena k instalaci! Naninstalujte aktualizaci nyní nebo automaticky po zavření aplikace Modrinth."
+    "message": "Aplikace Modrinth v{version} je připravena k instalaci! Nainstalujte aktualizaci nyní nebo automaticky po zavření aplikace Modrinth."
   },
   "app.update-toast.body.download-complete": {
-    "message": "Stahování aplikace Modrinth v{version} bylo dokončeno. Naninstalujte aktualizaci nyní nebo automaticky po zavření aplikace Modrinth."
+    "message": "Stahování aplikace Modrinth v{version} bylo dokončeno. Nainstalujte aktualizaci nyní nebo automaticky po zavření aplikace Modrinth."
+  },
+  "app.update-toast.body.linux": {
+    "message": "Modrinth App v{version} je k dispozici. Aktualizujte pomocí svého správce balíčků, abyste získali nejnovější funkce a opravy!"
   },
   "app.update-toast.body.metered": {
     "message": "Aplikace Modrinth v{version} je nyní k dispozici! Protože jste v měřené síti, nebyla stažena automaticky."
@@ -47,6 +50,9 @@
   "app.update-toast.download": {
     "message": "Stahování ({size})"
   },
+  "app.update-toast.download-page": {
+    "message": "Stáhnout"
+  },
   "app.update-toast.downloading": {
     "message": "Stahování..."
   },
@@ -470,9 +476,6 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "Zadejte šířku..."
   },
-  "instance.settings.title": {
-    "message": "Nastavení"
-  },
   "instance.worlds.a_minecraft_server": {
     "message": "Minecraft Server"
   },

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

@@ -261,7 +261,7 @@
     "message": "Kørte efter spillet lukkes."
   },
   "instance.settings.tabs.hooks.post-exit.enter": {
-    "message": "Indskriv post-exit kommando..."
+    "message": "Indtast post-exit kommando..."
   },
   "instance.settings.tabs.hooks.pre-launch": {
     "message": "Pre-launch"
@@ -270,7 +270,7 @@
     "message": "Kørt før en instance bliver kørt."
   },
   "instance.settings.tabs.hooks.pre-launch.enter": {
-    "message": "Indskriv pre-launch kommando..."
+    "message": "Indtast pre-launch kommando..."
   },
   "instance.settings.tabs.hooks.title": {
     "message": "Spille lunch hooks"
@@ -282,7 +282,7 @@
     "message": "Wrapper kommando for at køre Minecraft."
   },
   "instance.settings.tabs.hooks.wrapper.enter": {
-    "message": "Indskriv wrapper kommando..."
+    "message": "Indtast wrapper kommando..."
   },
   "instance.settings.tabs.installation": {
     "message": "Installation"
@@ -459,7 +459,7 @@
     "message": "Højden af spillevinduet når kørt."
   },
   "instance.settings.tabs.window.height.enter": {
-    "message": "Indskriv højde..."
+    "message": "Indtast højde..."
   },
   "instance.settings.tabs.window.width": {
     "message": "Bredde"
@@ -468,10 +468,7 @@
     "message": "Bredden på spille vinduet når kørt."
   },
   "instance.settings.tabs.window.width.enter": {
-    "message": "Indskriv bredde..."
-  },
-  "instance.settings.title": {
-    "message": "Indstillinger"
+    "message": "Indtast bredde..."
   },
   "instance.worlds.a_minecraft_server": {
     "message": "En Minecraft server"

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

@@ -38,6 +38,9 @@
   "app.update-toast.body.download-complete": {
     "message": "Modrinth App v{version} wurde heruntergeladen. Lade die App neu, oder schliesse sie, um zu aktualisieren."
   },
+  "app.update-toast.body.linux": {
+    "message": "Modrinth App v{version} ist verfügbar. Benutze deinen Paketmanager zum aktualisieren um die neusten Features und Bugfixes zu erhalten!"
+  },
   "app.update-toast.body.metered": {
     "message": "Modrinth App v{version} ist jetzt verfügbar! Da du in einem begrenzten Netzwerk bist, haben wir es nicht automatisch heruntergeladen."
   },
@@ -47,6 +50,9 @@
   "app.update-toast.download": {
     "message": "Herunterladen ({size})"
   },
+  "app.update-toast.download-page": {
+    "message": "Herunterladen"
+  },
   "app.update-toast.downloading": {
     "message": "Lade herunter..."
   },
@@ -470,9 +476,6 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "Breite eingeben..."
   },
-  "instance.settings.title": {
-    "message": "Einstellungen"
-  },
   "instance.worlds.a_minecraft_server": {
     "message": "Ä Minecraft-Server"
   },

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

@@ -38,6 +38,9 @@
   "app.update-toast.body.download-complete": {
     "message": "Modrinth App v{version} wurde heruntergeladen. Neu laden, um jetzt zu aktualisieren, oder automatisch, wenn du die Modrinth App schließt."
   },
+  "app.update-toast.body.linux": {
+    "message": "Modrinth App v{version} ist verfügbar. Verwende deinen Paketmanager, um die neuesten Funktionen und Fehlerbehebungen zu installieren!"
+  },
   "app.update-toast.body.metered": {
     "message": "Modrinth App v{version} ist jetzt verfügbar! Da du ein getaktetes Netzwerk nutzt, haben wir den Download nicht automatisch gestartet."
   },
@@ -47,6 +50,9 @@
   "app.update-toast.download": {
     "message": "Herunterladen ({size})"
   },
+  "app.update-toast.download-page": {
+    "message": "Herunterladen"
+  },
   "app.update-toast.downloading": {
     "message": "Wird Heruntergeladen..."
   },
@@ -470,9 +476,6 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "Breite eingeben..."
   },
-  "instance.settings.title": {
-    "message": "Einstellungen"
-  },
   "instance.worlds.a_minecraft_server": {
     "message": "Ein Minecraft-Server"
   },

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

@@ -38,6 +38,9 @@
   "app.update-toast.body.download-complete": {
     "message": "La descarga de la Modrinth App v{version} ha finalizado. Actualiza ahora o automáticamente al cerrar la aplicación Modrinth."
   },
+  "app.update-toast.body.linux": {
+    "message": "La aplicación Modrinth v{version} ya está disponible. ¡Utiliza tu gestor de paquetes para actualizarla y disfrutar de las últimas funciones y correcciones!"
+  },
   "app.update-toast.body.metered": {
     "message": "¡Modrinth App v{version} ya está disponible! Como estás en una red con límite de datos, no se descargó automáticamente."
   },
@@ -47,6 +50,9 @@
   "app.update-toast.download": {
     "message": "Descargar ({size})"
   },
+  "app.update-toast.download-page": {
+    "message": "Descargar"
+  },
   "app.update-toast.downloading": {
     "message": "Descargando..."
   },
@@ -470,9 +476,6 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "Ingresa el ancho..."
   },
-  "instance.settings.title": {
-    "message": "Configuración"
-  },
   "instance.worlds.a_minecraft_server": {
     "message": "Un servidor de Minecraft"
   },