Commit graph

54 commits

Author SHA1 Message Date
Zach Brown
c93e1ee068 Update upstream B/CB/S 2018-01-10 23:31:19 -06:00
Aikar
0ef74cf264 Update upstream 2017-12-09 12:37:09 -05:00
Zach Brown
dfab59dfc7 Fix logic for unconditional xp orb merging
Fixes GH-936
2017-11-13 20:30:45 -05:00
BillyGalbreath
f4a7453b2a Add configurable max exp value when merging orbs 2017-11-10 23:04:06 -05:00