Patrick 'Quezler' Mounier 5c28985ee6 Merge branch '6.0' into crater ...

# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/Blocks.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/BlockStorage.java

2020-04-16 12:39:52 +02: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