Does this work?
Merge commit '493745d563cd98b21669718997f506a0dfc80f45' into api/Blocks

* commit '493745d563cd98b21669718997f506a0dfc80f45':
  Does this work?

Conflicts:
	src/main/scala/boatcraft/api/Registry.scala