core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

@Zbob750 missed a few name changes

This commit is contained in:
kashike 2016-09-04 06:26:05 +00:00
parent f9f96ea3a5
commit 8f91416dcb
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -3,7 +3,7 @@ Paper [![CI Status](http://ci.destroystokyo.com/buildStatus/icon?job=PaperSpigot
High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.
[IRC Support and Project Discussion](http://irc.spi.gt/iris/?channels=PaperSpigot)
[IRC Support and Project Discussion](http://irc.spi.gt/iris/?channels=paper)
Documentation

8
Spigot-API-Patches/0001-POM-changes.patch
View File

@ -1,11 +1,11 @@
From ff68c81e69c9901714484060fafaba4c06891df6 Mon Sep 17 00:00:00 2001
From 1952464796554ba4222887f450760dae3bbbaf8d Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 17:16:08 -0600
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 217ce0b..ad866cc 100644
index 217ce0b..bbfdf47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,35 +4,37 @@
@ -30,7 +30,7 @@ index 217ce0b..ad866cc 100644
- <name>Spigot-API</name>
- <url>http://www.spigotmc.org/</url>
+ <name>Paper-API</name>
+ <url>https://github.com/PaperSpigot/Paper</url>
+ <url>https://github.com/PaperMC/Paper</url>
<description>An enhanced plugin API for Minecraft servers.</description>
<properties>
@ -109,5 +109,5 @@ index 217ce0b..ad866cc 100644
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.1</version>
--
2.9.2.windows.1
2.5.0

12
Spigot-Server-Patches/0002-Paper-config-files.patch
View File

@ -1,4 +1,4 @@
From 794c519d459912de2f16cfb8fc95ad0df40c2f82 Mon Sep 17 00:00:00 2001
From 3f9b16f14813d438308eb3fac33ad4416b74e945 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 21:02:09 -0600
Subject: [PATCH] Paper config files
@ -6,7 +6,7 @@ Subject: [PATCH] Paper config files
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
new file mode 100644
index 0000000..0468372
index 0000000..2de9b21
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +1,164 @@
@ -39,10 +39,10 @@ index 0000000..0468372
+ + "As you can see, there's tons to configure. Some options may impact gameplay, so use\n"
+ + "with caution, and make sure you know what each option does before configuring.\n"
+ + "\n"
+ + "If you need help with the configuration or have any questions related to PaperSpigot,\n"
+ + "join us at the IRC.\n"
+ + "If you need help with the configuration or have any questions related to Paper,\n"
+ + "join us in our IRC channel.\n"
+ + "\n"
+ + "IRC: #paperspigot @ irc.spi.gt ( http://irc.spi.gt/iris/?channels=PaperSpigot )\n"
+ + "IRC: #paper @ irc.spi.gt ( http://irc.spi.gt/iris/?channels=paper )\n"
+ + "Wiki: https://paper.readthedocs.org/ \n"
+ + "Paper Forums: https://aquifermc.org/ \n";
+ /*========================================================================*/
@ -335,5 +335,5 @@ index 337aa29..979adad 100644
};
--
2.9.2.windows.1
2.5.0

2
pom.xml
View File

@ -16,7 +16,7 @@
<name>Paper-Parent</name>
<description>Parent project for all Paper modules.</description>
<url>https://github.com/PaperSpigot/Paper</url>
<url>https://github.com/PaperMC/Paper</url>
<modules>
<module>Paper-Server</module>

2
work/Paperclip

@ -1 +1 @@
Subproject commit e22721a1aa7f7aca95175cb1430a583f202b757e
Subproject commit 370a5d44b6bc121c25e0208e127304f8dbdfed55