New recipe for ship
Merge branch 'master' of github.com:antlong/multiverseminer

Conflicts:
	assets/data/components.xls