Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 3dc4cdcd Update to Minecraft 1.14.3-pre4 88b25a8c SPIGOT-5098: Add a method to allow colored sign changes 6d913552 Update to Minecraft 1.14.3-pre4 CraftBukkit Changes: f1f33559 Update to Minecraft 1.14.3 8a3d3f49 SPIGOT-5098: Add a method to allow colored sign changes 533290e2 SPIGOT-5100: Console warning from pig zombie targeting 6dde4b9f SPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants 9af90077 SPIGOT-5097: Bukkit.clearRecipes() no longer working 38fa220f Fix setting game rules via the API fe3930ce Update to Minecraft 1.14.3-pre4 da071ec5 Remove outdated build delay. Spigot Changes: 4d2f30f1 Update to Minecraft 1.14.3 f16400e3 Update to Minecraft 1.14.3-pre4
This commit is contained in:
parent
bf1d217193
commit
73983e4c16
166 changed files with 1420 additions and 1457 deletions
|
@ -1,14 +1,14 @@
|
|||
From 4110bb0715fb2cd59da12c0b29d17b6d92065689 Mon Sep 17 00:00:00 2001
|
||||
From 614fd245b215d849e362c4d12e258a741ce94292 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 5ddf33938..2a2abac96 100644
|
||||
index 83eb5a39..41708a2b 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,7 +22,7 @@ index 5ddf33938..2a2abac96 100644
|
|||
- <artifactId>spigot-api</artifactId>
|
||||
+ <groupId>com.destroystokyo.paper</groupId>
|
||||
+ <artifactId>paper-api</artifactId>
|
||||
<version>1.14.2-R0.1-SNAPSHOT</version>
|
||||
<version>1.14.3-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Spigot-API</name>
|
||||
|
@ -34,7 +34,6 @@ index 5ddf33938..2a2abac96 100644
|
|||
<properties>
|
||||
- <skipTests>true</skipTests>
|
||||
+ <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
|
||||
+ <!-- Paper - #Logic -->
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
@ -54,7 +53,7 @@ index 5ddf33938..2a2abac96 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 5ddf33938..2a2abac96 100644
|
|||
</repositories>
|
||||
|
||||
<pluginRepositories>
|
||||
@@ -57,6 +56,20 @@
|
||||
@@ -57,6 +55,20 @@
|
||||
<version>2.6</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
@ -86,7 +85,7 @@ index 5ddf33938..2a2abac96 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 5ddf33938..2a2abac96 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>
|
||||
|
@ -112,5 +111,5 @@ index 5ddf33938..2a2abac96 100644
|
|||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
||||
</configuration>
|
||||
--
|
||||
2.21.0
|
||||
2.22.0
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue