search

teamneoneko / Cats-Blender-Plugin-Unofficial-

A tool designed to shorten steps needed to import and optimize models into VRChat. Compatible models are: MMD, XNALara, Mixamo, DAZ/Poser, Blender Rigify, Sims 2, Motion Builder, 3DS Max and potentially more, originally by absolute-quantum. Not Official.
GNU General Public License v3.0
394 stars 14 forks source link

Fix translations #82

Closed 989onan closed 7 months ago

989onan commented 7 months ago

Now using jsons. CSV is annoying for translations.

Yusarina commented 7 months ago

Conflicting files resources/translations.csv tools/translations.py

Don't know why the hell these are conflicting but Github won't allow me to check this via the web editor so I'm gonna have to resolve them via the CLI. So I try and sort this in the morning as it's almost 11pm here.

989onan commented 7 months ago

well the first one is the entire translations file is yeeted So the second one can't load because of that because the massive deletion is too large Github being stoopid

Yusarina commented 7 months ago

That's not what the conflict is, the conflict is between your files and the 3.6 branch however there is not conflict according to the CLI... basically github is being very stupid. I force merge it in a bit once I done my testing later.