Merge solar panel megajoule

Merges the changes to solar panels that allows them to supply megajoules by fractal UK. I figure this is goes well with KSPI Lite. Not sure why there is a conditional on line 63 as true and false give the same result. Also not sure what you want to do about the ORS stuff.