Upstream update

2017-07-26 21:12:40 -04:00 · 2017-07-26 21:12:40 -04:00 · dcd4f3710f
commit dcd4f3710f
parent 43543c78c4
17 changed files with 124 additions and 73 deletions
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit 4670a84bd9db26b4fd013f723f2089ae570ec9ae
+Subproject commit b1b9ab0df94c3b4b5c2613b7bf6347be10e864fc
--- a/work/Spigot
+++ b/work/Spigot
@ -1 +1 @@
-Subproject commit 99c2a370408a7e4359eb40763b9c4efe8ef68932
+Subproject commit 596221bf2ffd4e694d008406f7940a8a041a71fb