Update from upstream SpigotMC
Fix timings SpigotMC/Spigot@7d79f6bf5e6a214e61603a0f65987080cb3784c7
Fix the particle api using the wrong Material class SpigotMC/Spigot@f5a1e7a96f11107343c0f68398ffcb2cc51da139
Cleanup our patches