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
..
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	Merge pull request #1696 from unakiritan/patch-2	2020-03-27 23:24:23 -04:00