Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
LegacyGamerHD
2020-11-22 15:22:43 +01:00
parent f1b3273cba 1028ea8ff8
commit a5d9181450
2 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@@ -9,7 +9,6 @@ pipeline {
stage('Build') {
steps {
sh 'bash ./scripts/build.sh'
sh 'bash ./scripts/inst.sh --setup --fast'
}
}

52
sources/pom.xml
View File

@@ -1,3 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -40,10 +41,10 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>minecraft-server</artifactId>
<version>${minecraft.version}-SNAPSHOT</version>
<scope>compile</scope>
<groupId>com.destroystokyo.paper</groupId>
<artifactId>paper</artifactId>
<version>${minecraft.version}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
@@ -134,12 +135,12 @@
<dependency>
<groupId>io.akarin</groupId>
<artifactId>legacylauncher</artifactId>
<version>2.1</version>
<version>1.26</version>
</dependency>
<dependency>
<groupId>org.spongepowered</groupId>
<artifactId>mixin</artifactId>
<version>0.7.11-SNAPSHOT</version>
<version>0.8.2</version>
</dependency>
<dependency>
<groupId>com.googlecode.concurrent-locks</groupId>
@@ -154,42 +155,21 @@
</dependencies>
<repositories>
<!-- Akarin -->
<repository>
<id>nallar-repo</id>
<url>https://repo.nallar.me/</url>
<id>akarin-repo</id>
<url>https://raw.githubusercontent.com/Akarin-project/akarin-repo/master/repository</url>
</repository>
<repository>
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>spongepowered-repo</id>
<url>https://repo.spongepowered.org/maven/</url>
</repository>
<repository>
<id>tu-darmstadt</id>
<url>https://zoidberg.ukp.informatik.tu-darmstadt.de/artifactory/public-releases/</url>
</repository>
<repository>
<id>papermc</id>
<url>https://papermc.io/repo/repository/maven-public/</url>
</repository>
<repository>
<id>akarin-repo</id>
<url>https://raw.githubusercontent.com/Akarin-project/akarin-repo/master/repository</url>
</repository>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>songsoda-repo</id>
<url>https://repo.songoda.com/artifactory/public/</url>
</repository>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/groups/public/</url>
</repository>
<repository>
<id>destroystokyo-repo</id>
<url>https://destroystokyo.com/repo/repository/maven-public/</url>
<id>nallar-repo</id>
<url>http://repo.nallar.me/</url>
</repository>
</repositories>
@@ -199,7 +179,7 @@
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</pluginRepository>
</pluginRepositories>
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
<finalName>akarin-${minecraft.version}</finalName>