Patrick 'Quezler' Mounier 58a79d8631 Update to v103 ...

# 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/content/Blocks.java
#	core/src/mindustry/content/TechTree.java
#	core/src/mindustry/world/blocks/distribution/ItemConveyor.java

2020-01-24 20:25:03 +01:00

..

conveyors

Revert "Blend prototype"

2020-01-08 12:17:28 +01:00

bridge-arrow.png

Bugfixes

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

bridge-conveyor-arrow.png

Bugfixes

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

bridge-conveyor-bridge.png

Merged replacement sprites. Scaling is now disabled by default.

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

bridge-conveyor-end.png

Sprite updates

2019-06-23 12:36:13 -04:00

bridge-conveyor.png

Bugfixes

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

center.png

Merged replacement sprites. Scaling is now disabled by default.

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

distributor.png

Bugfixes

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

inverted-sorter.png

Override inverted sorter arrow colours (#1252)

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

junction.png

Bugfixes

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

mass-driver-base.png

Merged replacement sprites. Scaling is now disabled by default.

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

mass-driver.png

Changed turret outlines / Wall block tweaks

2019-06-06 21:18:54 -04:00

overflow-gate.png

Updated sprites

2019-06-05 21:29:34 -04:00

phase-conveyor-arrow.png

Bugfixes

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

phase-conveyor-bridge.png

Merged replacement sprites. Scaling is now disabled by default.

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

phase-conveyor-end.png

Merged replacement sprites. Scaling is now disabled by default.

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

phase-conveyor.png

Bugfixes

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

router.png

Bugfixes

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

sorter.png

Merged replacement sprites. Scaling is now disabled by default.

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

underflow-gate.png

Added underflow gates

2020-01-20 18:54:25 -05:00