Skip to content

Commit

Permalink
Merge branch 'master' into Nukkit-PM1E
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
#	src/main/java/cn/lanink/gamecore/utils/packet/ProtocolVersion.java
  • Loading branch information
lt-name committed Dec 30, 2023
2 parents 79d6be9 + 331afc0 commit 50fc130
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>cn.lanink</groupId>
<artifactId>MemoriesOfTime-GameCore</artifactId>
<version>1.6.12-PM1E<!-- -SNAPSHOT--></version>
<version>1.6.13-PM1E-SNAPSHOT</version>

<name>MemoriesOfTime-GameCore</name>
<description>MemoriesOfTime-GameCore -- A dependency</description>
Expand Down

0 comments on commit 50fc130

Please sign in to comment.