Merge branch '1.7-port' of https://github.com/MrTJP/ProjectRed into 1.7-port

Conflicts:
	src/mrtjp/projectred/illumination/lightobj.scala