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

..

defense

More sprite updates

2019-06-17 10:08:24 -04:00

distribution

Override inverted sorter arrow colours (#1252)

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

drills

Fixed connection not resetting on game load / Experimental click changes

2019-08-05 10:26:24 -04:00

environment

Begin work on 6.0

2019-11-10 14:05:29 -05:00

extra

Add files via upload

2019-10-19 10:58:34 +02:00

liquid

Added contribution guide

2019-11-18 00:55:33 -05:00

mechs

Even more sprites cleaned up

2019-06-06 00:28:09 -04:00

power

Illuminator textures

2019-11-16 20:06:11 -05:00

production

Bugfixes

2019-06-17 15:45:10 -04:00

storage

Config drawing

2019-10-17 21:58:49 -04:00

turrets

New discord app ID / New testing sounds

2019-08-12 12:32:13 -04:00

units

Unit enemy spawnpoint camping

2019-09-20 23:09:11 -04:00

walls

🚧 Add insulator wall (#840)

2019-10-27 17:41:00 -04:00