8 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
md_5	0affb6adab	Fix merge conflicts.	2015-01-25 10:37:00 +11:00
md_5	020079df9a	Merge	2015-01-17 10:12:14 +11:00
md_5	001a3a2e20	Merge in changes.	2015-01-16 14:58:23 +11:00
md_5	c94114c455	Allow sun JVM classes for Spigot	2015-01-12 20:14:12 +11:00
md_5	7d24bbe67d	Upstream merge.	2015-01-12 20:08:41 +11:00
md_5	4988864512	SPIGOT-401: Add async catcher for mob effects.	2015-01-12 11:38:47 +11:00
md_5	9c2215ee02	Fix patches	2015-01-09 11:14:57 +11:00
md_5	f2bf62789d	Upstream merge.	2015-01-05 14:32:01 +11:00