Open BinToss opened 4 years ago
I'm currently cherry-picking Cleanup's commits to a copy of master and then I'll create a Pull Request. Seven commits down and I've been chipping away 5bfb3692 for a few hours now.
1,140 conflicts left to manually resolve before I can continue cherry-picking commits. Stopping for the night.
After this CP is done, there's 37 more commits to deal with.
Due to this branch's widespread changes, this should be the last of the HaloMods repository's branches to be merged into master. It will require a TON of manual merging.