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

..

blocks

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

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

editor

Fallback atlas / Bugfixes / Cleanup

2020-06-11 15:25:46 -04:00

effects

T4 air carrier unit (*unfinished*)

2020-09-20 19:34:12 -04:00

items

Improved battery brightness display / Palette tweak / Diffgen buff

2020-02-11 17:27:33 -05:00

rubble

Fallback atlas / Bugfixes / Cleanup

2020-06-11 15:25:46 -04:00

shapes

Improved battery brightness display / Palette tweak / Diffgen buff

2020-02-11 17:27:33 -05:00

ui

Bugfixes

2020-09-16 16:04:11 -04:00

units

Fixed #2735

2020-09-26 09:46:16 -04:00

pack.json

Fallback atlas / Bugfixes / Cleanup

2020-06-11 15:25:46 -04:00