5 commits

Author	SHA1	Message	Date
Zach Brown	f29440f891	Update upstream B/CB/S	2018-10-27 00:02:22 -04:00
Automated	77f6dbeb3b	[Auto] Updated Upstream (Bukkit) ... Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: aa81efb0 Remove some additional draft API markings	2018-08-29 03:09:34 -04:00
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