Merge branch 'master' into PM1E

# Conflicts: # pom.xml # src/main/java/cn/lanink/murdermystery/MurderMystery.java
lt-name · Feb 9, 2024 · a64d005 · a64d005
2 parents 1e8976c + b0ccaca
commit a64d005
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -105,9 +105,13 @@
     </build>
 
     <distributionManagement>
+        <snapshotRepository>
+            <id>repo-lanink-cn</id>
+            <url>https://repo.lanink.cn/repository/maven-snapshots/</url>
+        </snapshotRepository>
         <repository>
-            <id>maven-repo</id>
-            <url>file:/www/wwwroot/repo.lanink.cn</url>
+            <id>repo-lanink-cn</id>
+            <url>https://repo.lanink.cn/repository/maven-releases/</url>
         </repository>
     </distributionManagement>
 
@@ -134,7 +138,7 @@
         </repository>
         <repository>
             <id>repo-lanink-cn</id>
-            <url>https://repo.lanink.cn/</url>
+            <url>https://repo.lanink.cn/repository/maven-public/</url>
         </repository>
     </repositories>
 
@@ -150,14 +154,14 @@
         <dependency>
             <groupId>cn.lanink</groupId>
             <artifactId>MemoriesOfTime-GameCore</artifactId>
-            <version>1.6.11-PM1E</version>
+            <version>1.6.13-PM1E</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.smallaswater</groupId>
             <artifactId>RsNPC</artifactId>
-            <version>2.3.1</version>
+            <version>2.4.3</version>
             <scope>provided</scope>
         </dependency>
 
@@ -190,6 +194,7 @@
             <version>1.18.26</version>
             <scope>provided</scope>
         </dependency>
+
     </dependencies>
 
 </project>