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

 Conflicts:

	core/assets/sprites/block_colors.png

	core/assets/sprites/fallback/sprites.atlas

	core/assets/sprites/fallback/sprites.png

	core/assets/sprites/fallback/sprites2.png

	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

2020-09-29 18:31:42 +03:00

..

bases

Improved battery brightness display / Palette tweak / Diffgen buff

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

arc-heat.png

Merged replacement sprites. Scaling is now disabled by default.

2019-06-04 22:54:01 -04:00

arc.png

Improved battery brightness display / Palette tweak / Diffgen buff

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

cyclone.png

Turret sprite tweaks

2020-09-23 19:16:33 -04:00

duo.png

Improved battery brightness display / Palette tweak / Diffgen buff

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

fuse.png

Balance

2020-09-23 15:21:06 -04:00

hail-heat.png

Merged replacement sprites. Scaling is now disabled by default.

2019-06-04 22:54:01 -04:00

hail.png

Improved battery brightness display / Palette tweak / Diffgen buff

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

lancer-heat.png

Merged replacement sprites. Scaling is now disabled by default.

2019-06-04 22:54:01 -04:00

lancer.png

Sprite cleanup

2020-09-26 22:29:15 -04:00

meltdown-heat.png

Merged replacement sprites. Scaling is now disabled by default.

2019-06-04 22:54:01 -04:00

meltdown.png

Improved battery brightness display / Palette tweak / Diffgen buff

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

ripple-heat.png

Merged replacement sprites. Scaling is now disabled by default.

2019-06-04 22:54:01 -04:00

ripple.png

Improved battery brightness display / Palette tweak / Diffgen buff

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

salvo-heat.png

Merged replacement sprites. Scaling is now disabled by default.

2019-06-04 22:54:01 -04:00

salvo-panel-left.png

Merged replacement sprites. Scaling is now disabled by default.

2019-06-04 22:54:01 -04:00

salvo-panel-right.png

Merged replacement sprites. Scaling is now disabled by default.

2019-06-04 22:54:01 -04:00

salvo.png

Improved battery brightness display / Palette tweak / Diffgen buff

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

scatter.png

Improved battery brightness display / Palette tweak / Diffgen buff

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

scorch-heat.png

Merged replacement sprites. Scaling is now disabled by default.

2019-06-04 22:54:01 -04:00

scorch.png

Improved battery brightness display / Palette tweak / Diffgen buff

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

spectre.png

Improved battery brightness display / Palette tweak / Diffgen buff

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

swarmer.png

T4/5 naval / Controversial weapon outlines

2020-09-18 18:54:09 -04:00

tsunami-liquid.png

New liquid turret - Tsunami

2020-09-25 11:49:04 +03:00

tsunami.png

New liquid turret - Tsunami

2020-09-25 11:49:04 +03:00

wave-liquid.png

Improved battery brightness display / Palette tweak / Diffgen buff

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

wave-top.png

Top For Liquid Turrets

2020-09-26 19:11:55 +03:00

wave.png

Turret sprite tweaks

2020-09-23 19:16:33 -04:00