Started on cagelamps
Merge branch 'master' of github.com:Quetzi/BluePower

Conflicts:
	src/main/java/net/quetzi/bluepower/api/part/PartRegistry.java