3 commits

Author	SHA1	Message	Date
Aikar	66db17bdd4	Update upstream	2018-08-01 22:49:47 -04:00
Aikar	6d1a918378	NOT FINISHED!!! Current Progress on 1.13-pre7 update ... This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.	2018-07-14 21:53:17 -04:00
BillyGalbreath	4a55e34625	Make shield blocking delay configurable (#1154) ... Resolves #1153	2018-06-16 14:54:35 -05:00