From 8f91416dcbf2d3bdadc99d5f9681654c50bbdc27 Mon Sep 17 00:00:00 2001 From: kashike Date: Sun, 4 Sep 2016 06:26:05 +0000 Subject: [PATCH] @Zbob750 missed a few name changes --- README.md | 2 +- Spigot-API-Patches/0001-POM-changes.patch | 8 ++++---- Spigot-Server-Patches/0002-Paper-config-files.patch | 12 ++++++------ pom.xml | 2 +- work/Paperclip | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index aa471f055..1d5bfe5b7 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index dcd2d9296..fd40d9229 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -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 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 - Spigot-API - http://www.spigotmc.org/ + Paper-API -+ https://github.com/PaperSpigot/Paper ++ https://github.com/PaperMC/Paper An enhanced plugin API for Minecraft servers. @@ -109,5 +109,5 @@ index 217ce0b..ad866cc 100644 maven-shade-plugin 2.4.1 -- -2.9.2.windows.1 +2.5.0 diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index 5f8aed577..213d4eee0 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -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 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 diff --git a/pom.xml b/pom.xml index dfeeb38b6..0f0f8a8d6 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ Paper-Parent Parent project for all Paper modules. - https://github.com/PaperSpigot/Paper + https://github.com/PaperMC/Paper Paper-Server diff --git a/work/Paperclip b/work/Paperclip index e22721a1a..370a5d44b 160000 --- a/work/Paperclip +++ b/work/Paperclip @@ -1 +1 @@ -Subproject commit e22721a1aa7f7aca95175cb1430a583f202b757e +Subproject commit 370a5d44b6bc121c25e0208e127304f8dbdfed55