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

Upstream merge.

Browse Source
This commit is contained in:
md_5
2015-01-05 14:32:01 +11:00
parent 436c6f2449
commit f2bf62789d
3 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Bukkit-Patches/0029-BungeeCord-Chat-API.patch
View File

@@ -9,8 +9,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<version>1.14</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>net.md-5</groupId>
@@ -19,9 +19,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
<!-- testing -->
<dependency>
<groupId>junit</groupId>
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/Server.java