Merge branch 'master' into PNX

# Conflicts: # pom.xml # src/main/resources/plugin.yml
MemoriesOfTime · Feb 9, 2024 · 93c3883 · 93c3883
2 parents b2d7e72 + 7742d6d
commit 93c3883
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lanink</groupId>
     <artifactId>MemoriesOfTime-GameCore</artifactId>
-    <version>1.6.13-PNX-SNAPSHOT</version>
+    <version>1.6.13-PNX<!-- -SNAPSHOT--></version>
 
     <name>MemoriesOfTime-GameCore</name>
     <description>MemoriesOfTime-GameCore -- A dependency</description>
@@ -262,13 +262,13 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>23.0.0</version>
+            <version>24.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
+            <version>1.18.26</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -292,7 +292,7 @@
         <dependency>
             <groupId>com.smallaswater.tips</groupId>
             <artifactId>Tips</artifactId>
-            <version>2.1.7</version>
+            <version>2.1.9</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/cn/lanink/gamecore/utils/packet/ProtocolVersion.java b/src/main/java/cn/lanink/gamecore/utils/packet/ProtocolVersion.java
@@ -73,4 +73,5 @@ public interface ProtocolVersion extends ProtocolInfo {
     int v1_20_30 = 618;
     int v1_20_40 = 622;
     int v1_20_50 = 630;
+    int v1_20_60 = 649;
 }
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-PNX"
+version: "1.6.13-PNX"
 api: ["1.0.0"]
 load: STARTUP
 authors: ["LT_Name", "iGxnon"]