Patrick 'Quezler' Mounier 05ccdfd51b Merge branch 'master' into crater ...

# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/world/modules/ItemModule.java

2020-02-05 10:26:34 +01:00

..

defense

More sprite updates

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

distribution

Draw crater unto plastanium conveyor icon

2020-01-28 10:57:51 +01:00

drills

Fixed connection not resetting on game load / Experimental click changes

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

environment

Random in-game music, untested

2019-08-10 18:56:20 -04: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

Visual tweaks

2020-01-14 17:07:39 -05:00

storage

Darken yellow square on nucleus core (#1497)

2020-02-03 08:51:19 -05: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