Merge remote-tracking branch 'origin/ver/1.20.6' into ver/1.20.6

404Setup · Sep 11, 2024 · 50f3366 · 50f3366
2 parents 51231d4 + 5ad5727
commit 50f3366
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build.yml → .github/workflows/build_1206.yml b/.github/workflows/build.yml → .github/workflows/build_1206.yml
@@ -2,9 +2,9 @@ name: Vine Server - ver/1.20.6
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "ver/1.20.6" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "ver/1.20.6" ]
 
 permissions: write-all
 

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@
 </p>
 
 ---
-> **It is still unstable at present, please choose carefully.**
+> **Upstream has started preparing 1.21.1, I will follow up when it compiles and runs normally.**
 >
 > ----
 >
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ @@
     </p>
     ---
-    > **It is still unstable at present, please choose carefully.**
+    > **Upstream has started preparing 1.21.1, I will follow up when it compiles and runs normally.**
     >
     > ----
     >
@@ Expand Down @@