10 commits

Author	SHA1	Message	Date
Aikar	61bbe8c3b3	Update upstream	2017-06-30 18:13:06 -05:00
Aikar	46e300045a	Update upstream	2017-06-25 20:26:00 -04:00
Zach Brown	ab4ae72fd5	Update to MC 1.12-pre2	2017-05-14 13:05:01 -05:00
Zach Brown	2671b8b308	Update upstream B/CB/S	2017-04-28 19:25:52 -05:00
Zach Brown	6645aa1301	Fix patch conflict with upstream	2017-04-22 17:49:47 -05:00
Zach Brown	4340ef97ca	Switch to a bStats based Metrics system	2017-03-25 00:22:02 -05:00
Zach Brown	12310fa5f3	Update upstream B/CB/S	2017-02-17 20:03:38 -06:00
Aikar	3734a3acdb	Fix build ... I totally didn't notice that the patch had a conflict >_>	2017-01-02 02:05:02 -05:00
Zach Brown	b44bb52488	Update upstream B/CB/S	2016-11-22 18:06:14 -06:00
Aikar	32a3169a1f	Handle Item Meta Inconsistencies ... First, Enchantment order would blow away seeing 2 items as the same, however the Client forces enchantment list in a certain order, as well as does the /enchant command. Anvils can insert it into forced order, causing 2 same items to be considered different. This change makes unhandled NBT Tags and Enchantments use a sorted tree map, so they will always be in a consistent order. Additionally, the old enchantment API was never updated when ItemMeta was added, resulting in 2 different ways to modify an items enchantments. For consistency, the old API methods now forward to use the ItemMeta API equivalents, and should deprecate the old API's.	2016-03-18 14:56:16 -04:00