4 commits

Author	SHA1	Message	Date
Thinkofdeath	da7c9b23b0	Upstream merge	2015-02-19 16:44:53 -06:00
md_5	3ea2235dbd	More conflict resolution.	2015-02-14 20:15:47 -06:00
md_5	6008bb8fab	Fix merge conflicts.	2015-02-14 20:15:35 -06:00
Thinkofdeath	461353e2cb	SPIGOT-522: Remove the global api cache option ... This was useful when plugins first started upgrading to uuid because each plugin would implement their own way for grabbing uuid's from mojang. Because none of them shared the result they would quickly hit the limits on the api causing the conversion to either fail or pause for long periods of time. The global api cache was a (very hacky) way to force all plugins to share a cache but caused a few issues with plugins that expected a full implementation of the HTTPURLConnection. Due to the fact that most servers/plugins have updated now it seems to be a good time to remove this as its usefulness mostly has expired.	2015-02-06 09:03:19 -06:00

Renamed from CraftBukkit-Patches/0153-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch (Browse further)