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

# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/ctype/ContentType.java
#	core/src/io/anuke/mindustry/ctype/UnlockableContent.java
#	core/src/io/anuke/mindustry/io/LegacyMapIO.java
#	core/src/io/anuke/mindustry/type/WeatherEvent.java
#	gradle.properties

2019-12-24 12:40:23 -05:00

..

bloomshaders

Bloom fix

2019-06-28 23:31:34 -04:00

bundles

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

2019-12-24 12:40:23 -05:00

cursors

Cursor antialiasing

2019-08-04 09:41:25 -04:00

fonts

І

2019-12-16 12:50:18 -05:00

icons

Updated Mac icon

2019-08-16 12:05:00 -04:00

maps

Travis testing

2019-09-12 17:19:01 -04:00

music

Fixed "disconnected" bug / Updated menu music

2019-09-01 10:19:13 -04:00

scripts

Updated script stub

2019-12-15 13:56:01 -05:00

shaders

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

2019-12-01 17:42:56 -05:00

sounds

Thruster fix / Removed info on Steam to prevent confusion

2019-09-28 15:40:31 -04:00

sprites

Override inverted sorter arrow colours (#1252)

2019-12-24 00:32:04 -05:00

contributors

Added Chinese translator (#1250)

2019-12-22 12:01:41 -05:00