resolve asset merge conflict
mars
code cleanup pt1
ok git shut up
fixup asset packer
idk
make pretty
fix non-api compilation
whoa, i just rewrote spacetime again