Rationalize diagonal generators, fix diamonds
Fix lightning generator
Merge branch 'master' of https://github.com/Dewb/CosmicPraise