ship parts stuff

need to finish later
Merge remote-tracking branch 'origin/master'

Conflicts:
	items/Gadget.java