Anuken a8f4df8030 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 ...

# Conflicts:
#	core/src/mindustry/ui/fragments/PlayerListFragment.java

2020-04-16 10:14:13 -04:00

..

android

Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0

2020-04-11 10:37:52 -04:00

steam

[WIP]Translate steam metadata in french (#771)

2020-04-14 13:59:55 -04:00