3 Commits

Author	SHA1	Message	Date
water111	b5d21be9c5	W/misc fixes (#1838) ... * temp * temp * before cleaning up * cleanup merge * fix warnings * merge fix * clang format	2022-09-05 20:29:12 -04:00
Tyler Wilding	2d595c1ac0	lint: add include sorting config to clang-format (#1517)	2022-06-22 23:37:46 -04:00
water111	be976d2e69	[merc] Add merc extraction (#1356) ... * docs for ee merc code * wip * more extraction stuff * partial mat1 working * mat1 * cleanup * partial mat2 and mat3 support * merc extraction seems to work	2022-05-11 22:53:53 -04:00