Merge branch 'main' into feature/auction-menu-parity

# Conflicts: # app/game-frontend/e2e/playwright.config.mjs # app/game-frontend/package.json # app/gateway-api/src/adminRouter.ts # app/gateway-api/src/lobby/profileStatusService.ts # app/gateway-api/src/orchestrator/gatewayOrchestrator.ts # app/gateway-api/test/orchestratorOperations.test.ts # app/gateway-api/test/orchestratorPlan.test.ts # app/gateway-frontend/e2e/server-operations.spec.ts # app/gateway-frontend/src/views/AdminView.vue # app/gateway-frontend/src/views/ServerOperationsView.vue
2026-07-26 05:38:38 +00:00
parent c8abd767b0 47f03abeb4
commit a3fc1b5ebd
27 changed files with 1213 additions and 192 deletions
@@ -818,6 +818,7 @@ export const adminRouter = router({
                    apiRunning: false,
                    daemonRunning: false,
                    auctionRunning: false,
+                    battleSimRunning: false,
                    tournamentRunning: false,
                },
            }));