search

minetest-mods / nether

Nether mod for Minetest
https://forum.minetest.net/viewtopic.php?f=11&t=5790
19 stars 26 forks source link

Finish French Translation #66

Closed JoeEnderman closed 1 year ago

JoeEnderman commented 1 year ago

I may have messed with your slab and stair capitalization. If you want me to change it, I can. Just tell me how you want it.

Treer commented 1 year ago

I can't merge this Pull Request because it has conflicts and it's also trying to re-apply the changes from your last pull request (I'm not sure why git isn't automatically ignoring those, since that PR was merged).

If you're comfortable with git you can resolve the conflicts. If not, I can cherry-pick those last 3 commits into a separate Pull request and merge that.

JoeEnderman commented 1 year ago

I tried for several days to learn how to use git and I never could get it to work, so I just manually move files, and it works. So, if you want to seperate the changes out?

Treer commented 1 year ago

Merged via #68