testserver

Author SHA1 Message Date

Author	SHA1	Message	Date
Aikar	0f479b740d	Merge branch 'master' into pre/1.13 * master: MC-135506: Experience should save as Integers Fix EXP orb merging causing values to go negative - Closes #1169 Add "Safe Regen" Duplicate UUID resolver and make default	2018-08-03 01:29:20 -04:00
Aikar	c7dcc8ce89	Merge pull request #1244 `3e19de0c` Rebuild Patches (BillyGalbreath) `8e5db995` AnvilDamageEvent (BillyGalbreath) * pull/1244/head: Rebuild Patches AnvilDamageEvent	2018-07-30 00:12:03 -04:00

Aikar

0f479b740d

Merge branch 'master' into pre/1.13

* master:
  MC-135506: Experience should save as Integers
  Fix EXP orb merging causing values to go negative - Closes #1169
  Add "Safe Regen" Duplicate UUID resolver and make default

2018-08-03 01:29:20 -04:00

Aikar

c7dcc8ce89

Merge pull request #1244

3e19de0c Rebuild Patches (BillyGalbreath)
8e5db995 AnvilDamageEvent (BillyGalbreath)

* pull/1244/head:
  Rebuild Patches
  AnvilDamageEvent

2018-07-30 00:12:03 -04:00

2 Commits