Update upstream B/CB

2024-12-18 12:30:06 +01:00 · 2016-04-17 13:36:39 -05:00 · 2016-04-17 13:36:39 -05:00 · fb0ab299be
Commit fb0ab299be
--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit 85107d1f3d607cd2a38926f3abaae7d6f376eead
+Subproject commit 2a1d9d6033c8d4734dc38b8f7d42e3a7101c354a
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit f6313791d0f8575e4a3a35c11145f794b8acedd4
+Subproject commit b70058afa240034895eb061b123643a708a53480
		`@ -1 +1 @@`
			`Subproject commit 85107d1f3d607cd2a38926f3abaae7d6f376eead`				`Subproject commit 2a1d9d6033c8d4734dc38b8f7d42e3a7101c354a`
		`@ -1 +1 @@`
			`Subproject commit f6313791d0f8575e4a3a35c11145f794b8acedd4`				`Subproject commit b70058afa240034895eb061b123643a708a53480`