6 Commits

Author	SHA1	Message	Date
Thinkofdeath	e5290a457a	Update to Minecraft 1.8.3	2015-03-08 05:03:19 -05:00
md_5	78f0bacf0a	Patch rebuild.	2015-02-28 00:35:00 -06:00
md_5	86c8d0492a	Fix merge conflicts.	2015-01-25 02:02:43 -06:00
md_5	384699a51a	Upstream merge.	2015-01-06 22:09:08 -06:00
Zach Brown	c7f1eed0bf	Update from upstream SpigotMC ... 3beb7729816 a77ed5758a7 52c130fc6d9	2014-12-20 19:09:49 -06:00
Zach Brown	8bbab87c6b	Update from upstream SpigotMC ... 3e3ea0bd0d8 320ed92779f 612de468951	2014-12-14 15:54:10 -06:00