Merge branch '0.0.4+mirrors' into testing

AuroraTeam · Jun 2, 2024 · 3ffaf30 · 3ffaf30
2 parents 7b77572 + b95e8bd
commit 3ffaf30
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: LaunchServer - Release Build
 
 on:
   push:
-    branches: [master]
+    branches: [0.0.4+mirrors]
 
 jobs:
   build:

diff --git a/packages/launcher b/packages/launcher
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,7 @@
 {
     "name": "@aurora-launcher/server",
-    "version": "0.0.5-dev",
+    "version": "0.0.4+mirrors",
+    "branch": "dev",
     "description": "LauncherServer for AuroraLauncher",
     "keywords": [
         "minecraft",
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: LaunchServer - Release Build @@
     on:
       push:
-        branches: [master]
+        branches: [0.0.4+mirrors]
     jobs:
       build:
@@ Expand Down @@
+0 −39		build.mjs
+0 −4		config.d.ts
+1 −2		config.ts
+32 −0		electron.vite.config.ts
+31 −43		package.json
+12 −12		public.pem
+4 −0		src/common/channels.ts
+40 −5		src/main/core/DiscordRPC.ts
+12 −11		src/main/core/Launcher.ts
+5 −5		src/main/core/LauncherWindow.ts
+12 −2		src/main/game/GameService.ts
+9 −9		src/main/game/Starter.ts
+1 −1		src/main/game/Updater.ts
+0 −78		src/main/game/Watcher.ts
+3 −0		src/main/game/Watcher/IProcess.ts
+61 −0		src/main/game/Watcher/Watcher.test.ts
+110 −0		src/main/game/Watcher/Watcher.ts
+6 −0		src/main/game/Watcher/WatcherProfile.ts
+1 −0		src/main/game/Watcher/index.ts
+0 −2		src/main/helpers/PlatformHelper.ts
+1 −1		src/main/scenes/Login.ts
+1 −1		src/main/scenes/ServerPanel.ts
+1 −1		src/main/scenes/ServersList.ts
+13 −0		src/preload/components/RPC.ts
+5 −0		src/preload/index.ts
+12 −6		src/renderer/runtime/scenes/Login/index.tsx
+0 −1		src/renderer/vite-env.d.ts
+1 −1		tsconfig.json
+1 −1		tsconfig.node.json
+2 −0		types.d.ts
+0 −32		vite.config.ts
+19 −0		vitest.config.ts