Resolve merge conflicts

.env.beta

@@ -0,0 +1,3 @@
+VITE_BYPASS_LOGIN=0
+VITE_BYPASS_TUTORIAL=0
+VITE_SERVER_URL=https://api.beta.pokerogue.net

.env.production

@@ -0,0 +1,3 @@
+VITE_BYPASS_LOGIN=0
+VITE_BYPASS_TUTORIAL=0
+VITE_SERVER_URL=https://api.pokerogue.net

.github/workflows/deploy-beta.yml

@@ -0,0 +1,33 @@
+name: Deploy Beta
+
+on:
+  push: {}
+  pull_request: {}
+
+jobs:
+  deploy:
+    if: github.repository == 'pagefaultgames/pokerogue'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+      - name: Install dependencies
+        run: npm ci
+      - name: Build
+        run: npm run build:beta
+        env:
+          NODE_ENV: production
+      - name: Set up SSH
+        if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
+        run: |
+          mkdir ~/.ssh
+          echo "${{ secrets.BETA_SSH_PUBLIC_KEY }}" > ~/.ssh/id_ed25519.pub
+          echo "${{ secrets.BETA_SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/*
+          ssh-keyscan -H ${{ secrets.BETA_SSH_HOST }} >> ~/.ssh/known_hosts
+      - name: Deploy build on server
+        if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
+        run: | 
+          rsync --del --no-times --checksum -vrm dist/* ${{ secrets.BETA_SSH_USER }}@${{ secrets.BETA_SSH_HOST }}:${{ secrets.BETA_DESTINATION_DIR }}

package.json

@@ -7,6 +7,7 @@
 		"start": "vite",
 		"start:dev": "vite --mode development",
 		"build": "vite build",
+		"build:beta": "vite build --mode beta",
 		"preview": "vite preview",
 		"test": "vitest run",
 		"test:cov": "vitest run --coverage",