minenice55 e8975c6dc4 fix all merge conflicts ...

unfortunately we lost a good chunk of git history in the process so that may hurt the ability for this to get merged, may have to consult everyone else for this

2022-08-09 11:23:17 -04:00

..

FirstContact.cs

Tram&Pauline animation update

2022-07-26 14:14:28 -04:00

FirstContact.cs.meta

Tram&Pauline animation update

2022-07-26 14:14:28 -04:00

Translator.cs

Tram&Pauline

2022-07-25 01:04:16 -07:00

Translator.cs.meta

Tram&Pauline

2022-07-25 01:04:16 -07:00

WhiteLines.cs

fix all merge conflicts

2022-08-09 11:23:17 -04:00

WhiteLines.cs.meta

Tram&Pauline

2022-07-25 01:04:16 -07:00