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

# Conflicts:
#	core/src/mindustry/core/ContentLoader.java
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/entities/type/Player.java
#	core/src/mindustry/io/MapIO.java
#	core/src/mindustry/io/TypeIO.java
#	core/src/mindustry/ui/dialogs/HostDialog.java
#	core/src/mindustry/ui/dialogs/JoinDialog.java
#	core/src/mindustry/world/LegacyColorMapper.java

2020-03-19 20:07:45 -04:00

..

assets

Unlock tweaks

2020-03-19 12:45:21 -04:00

assets-raw

Cleaned up weather class

2020-03-11 10:08:27 -04:00

src/mindustry

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

2020-03-19 20:07:45 -04:00

build.gradle

[formatting] add newline to file(s) (#1508)

2020-02-05 18:36:56 -05:00

convert_sounds.sh

Fixed truncated sounds

2019-08-15 14:16:41 -04:00