Update to 1.14.4 (#2333)

This commit is contained in:
Spottedleaf 2019-07-19 21:01:24 -07:00 committed by Zach
parent a41d51f098
commit 9fe63a1673
328 changed files with 1938 additions and 1954 deletions

View file

@ -1,14 +1,14 @@
From 5517592aa39fa15d51e8e186af82b46219c0223e Mon Sep 17 00:00:00 2001
From 9524ffe0f99ca69cf2478a834000bd6959a981d5 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 b5532ae6..a85aaa1a 100644
index 23d0a44a2..aef4ec33d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,34 +2,29 @@
@@ -2,34 +2,28 @@
<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>
@ -22,8 +22,7 @@ index b5532ae6..a85aaa1a 100644
- <artifactId>spigot-api</artifactId>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
<version>1.14.3-R0.1-SNAPSHOT</version>
+
<version>1.14.4-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>
@ -54,7 +53,7 @@ index b5532ae6..a85aaa1a 100644
<repositories>
<!--
If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
@@ -41,6 +36,10 @@
@@ -41,6 +35,10 @@
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
@ -65,7 +64,7 @@ index b5532ae6..a85aaa1a 100644
</repositories>
<pluginRepositories>
@@ -57,6 +56,20 @@
@@ -57,6 +55,20 @@
<version>2.6</version>
<scope>compile</scope>
</dependency>
@ -86,7 +85,7 @@ index b5532ae6..a85aaa1a 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -113,15 +126,12 @@
@@ -113,15 +125,12 @@
</dependencies>
<build>
@ -103,7 +102,7 @@ index b5532ae6..a85aaa1a 100644
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
@@ -156,6 +166,7 @@
@@ -156,6 +165,7 @@
</execution>
</executions>
<configuration>