slava0135 d4402ee3bb Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami ...

 Conflicts:

	core/assets/icons/icons.properties

	core/assets/sprites/block_colors.png

	core/assets/sprites/fallback/sprites.atlas

	core/assets/sprites/fallback/sprites3.png

	core/assets/sprites/fallback/sprites4.png

	core/assets/sprites/fallback/sprites5.png

	core/assets/sprites/fallback/sprites7.png

	core/assets/sprites/fallback/sprites8.png

	core/assets/sprites/sprites.atlas

	core/assets/sprites/sprites.png

	core/assets/sprites/sprites2.png

	core/assets/sprites/sprites4.png

	core/assets/sprites/sprites5.png

	core/src/mindustry/content/Blocks.java

2020-09-30 09:48:18 +03:00

..

campaign

Long-range 4x4 turret (wip) / Java 14 language upgrade

2020-09-29 23:55:55 -04:00

defense

Cleanup

2020-08-27 20:09:40 -04:00

distribution

Fix

2020-09-28 21:58:37 +03:00

drills

textures micro fixes and improvements

2020-07-22 03:40:58 +03:00

environment

Bugfixes

2020-09-19 11:40:11 -04:00

extra

Bugfixes / Logic category (no icon) / Switch block

2020-08-10 17:09:54 -04:00

liquid

Sprite cleanup

2020-09-26 22:31:49 -04:00

logic

Fixed #2690

2020-09-23 21:46:40 -04:00

power

Bugfixes

2020-09-09 23:39:00 -04:00

production

Fix

2020-09-28 21:47:42 +03:00

props

Dacite decoration block / Environmental renaming

2020-09-10 15:17:10 -04:00

storage

Storage team colors

2020-09-19 12:38:24 -04:00

turrets

Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami

2020-09-30 09:48:18 +03:00

units

Team Indicator For Command Center

2020-09-24 17:47:50 +03:00

walls

Cleaner wall sprites

2020-09-27 00:43:00 -04:00