Merge branch 'master' into Nukkit-PM1E

# Conflicts: # pom.xml # src/main/java/cn/lanink/gamecore/utils/packet/ProtocolVersion.java # src/main/resources/plugin.yml
MemoriesOfTime · Oct 30, 2023 · 79d6be9 · 79d6be9
2 parents d2a14a7 + dd6dc46
commit 79d6be9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lanink</groupId>
     <artifactId>MemoriesOfTime-GameCore</artifactId>
-    <version>1.6.12-PM1E-SNAPSHOT</version>
+    <version>1.6.12-PM1E<!-- -SNAPSHOT--></version>
 
     <name>MemoriesOfTime-GameCore</name>
     <description>MemoriesOfTime-GameCore -- A dependency</description>

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: MemoriesOfTime-GameCore
 main: cn.lanink.gamecore.GameCore
-version: "1.6.12-PM1E-SNAPSHOT"
+version: "1.6.12-PM1E"
 api: ["Nukkit-PM1E"]
 load: STARTUP
 authors: ["LT_Name", "iGxnon"]