Anuken b1f32d241b Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 ... # Conflicts: # core/assets/bundles/bundle_uk_UA.properties # core/src/mindustry/core/NetClient.java # core/src/mindustry/ui/fragments/PlayerListFragment.java # core/src/mindustry/world/blocks/power/ImpactReactor.java # gradle.properties		2020-04-11 10:37:52 -04:00
..
cs-CZ	Czech translation - 104.x translation (#1713)	2020-03-26 18:40:49 -04:00
en-US	Shader cleanup	2020-03-10 19:48:38 -04:00
es-ES
fr-FR
it-IT
ja-JP
ko-KR
pl-PL
pt-PT
ru-RU	RU updates to Android description (#1663)	2020-03-04 13:53:19 -05:00
uk	Fix uk translation	2020-03-16 11:54:37 +02:00
zh-TW