SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream Merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-10-24 21:23:24 +11:00
parent dbe0e9acde
commit 9658a61088
19 changed files with 90 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Bukkit-Patches/0001-POM-Changes.patch
View File

@@ -1,11 +1,11 @@
From 592fb8e4709be193461d8dc93920bf3fc072f1af Mon Sep 17 00:00:00 2001
From 0147bd846abb4e7d73f400232fcda179a552a78e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index dfdcbdf..2d1df20 100644
index d1d18db..3dae8d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,43 +1,23 @@
@@ -23,7 +23,7 @@ index dfdcbdf..2d1df20 100644
+
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.6.4-R0.1-SNAPSHOT</version>
<version>1.6.4-R1.1-SNAPSHOT</version>
- <name>Bukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot-API</name>
@@ -65,5 +65,5 @@ index dfdcbdf..2d1df20 100644
<plugins>
<plugin>
--
1.8.1.2
1.8.3.2

10
Bukkit-Patches/0011-Update-Depends.patch
View File

@@ -1,4 +1,4 @@
From 69feff718e80cd27a3bcc2f44f11e3f95c271631 Mon Sep 17 00:00:00 2001
From 512a9d53929c21762f9a94683a8fb944288f6197 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 4 Jul 2013 20:05:19 +1000
Subject: [PATCH] Update Depends
@@ -6,10 +6,10 @@ Subject: [PATCH] Update Depends
- All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.
diff --git a/pom.xml b/pom.xml
index 2b1abbb..14833af 100644
index 3dae8d4..a5b048e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,21 +78,21 @@
@@ -77,21 +77,21 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
@@ -34,7 +34,7 @@ index 2b1abbb..14833af 100644
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -106,7 +106,7 @@
@@ -105,7 +105,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -44,5 +44,5 @@ index 2b1abbb..14833af 100644
<!-- testing -->
--
1.8.1.2
1.8.3.2