Closed araiford closed 8 years ago
This branch had conflicts since it was made before the Cascade branch was merged. Spritesheet and canon main were the two culprits. Fixed the conflict in canon main easily enough, but the spritesheet / icons were a little nasty. It's all good now, but I'm wondering if there's something I don't know that would make handling the spritesheet easier when rebasing.
:100: