MC 1.14.1

This commit is contained in:
Zach Brown 2019-05-13 21:20:58 -05:00
parent 5e7cfaf718
commit d84080e6d1
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
278 changed files with 1269 additions and 1298 deletions

View file

@ -1,28 +1,28 @@
From eeda55e4929215bdae08f66dcbb3a4e9c02b3da3 Mon Sep 17 00:00:00 2001
From f90b7c9822f8711fafde9773238ec4703aaf9b35 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 0bc8d481..be4e1ca5 100644
index 0d4ef897..69866193 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,33 +3,29 @@
@@ -2,34 +2,29 @@
<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>
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
+ <parent>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-parent</artifactId>
+ <version>dev-SNAPSHOT</version>
+ </parent>
+
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
<version>1.14-R0.1-SNAPSHOT</version>
<version>1.14.1-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>
@ -54,7 +54,7 @@ index 0bc8d481..be4e1ca5 100644
<repositories>
<!--
If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
@@ -41,6 +37,10 @@
@@ -41,6 +36,10 @@
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
@ -65,7 +65,7 @@ index 0bc8d481..be4e1ca5 100644
</repositories>
<pluginRepositories>
@@ -57,6 +57,20 @@
@@ -57,6 +56,20 @@
<version>2.6</version>
<scope>compile</scope>
</dependency>
@ -86,7 +86,7 @@ index 0bc8d481..be4e1ca5 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -113,15 +127,12 @@
@@ -113,15 +126,12 @@
</dependencies>
<build>
@ -103,7 +103,7 @@ index 0bc8d481..be4e1ca5 100644
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
@@ -156,6 +167,7 @@
@@ -156,6 +166,7 @@
</execution>
</executions>
<configuration>