3 commits

Author	SHA1	Message	Date
Aikar	ad40e694a3	Update upstream	2017-12-09 12:37:09 -05:00
Zach Brown	ac880e00b4	Fix logic for unconditional xp orb merging ... Fixes GH-936	2017-11-13 20:30:45 -05:00
BillyGalbreath	072d6ec8cb	Add configurable max exp value when merging orbs	2017-11-10 23:04:06 -05:00