Upstream API changes
Merge branch 'master' of github.com:Runsafe/WarpDrive

Conflicts:
	src/no/runsafe/warpdrive/summoningstone/EventHandler.java