Patrick 'Quezler' Mounier 8a089ba3c9 Resolve conflicts ...

# 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

2019-11-12 08:44:26 +01:00

..

backgrounds

Basic deploy background

2019-07-12 01:03:01 -04:00

block_colors.png

Resolve conflicts

2019-11-12 08:44:26 +01:00

error.png

Fixed incorrect asset loading

2019-08-27 22:53:24 -04:00

logo.png

More menu

2019-07-02 10:01:34 -04:00

schematic-background.png

Bugfixes

2019-10-18 19:31:01 -04:00

sprites2.png

Cleaned up diode

2019-11-11 23:32:49 -05:00

sprites3.png

Resolve conflicts

2019-11-12 08:44:26 +01:00

sprites4.png

Cleaned up diode

2019-11-11 23:32:49 -05:00

sprites5.png

Resolve conflicts

2019-11-12 08:44:26 +01:00

sprites.atlas

Resolve conflicts

2019-11-12 08:44:26 +01:00

sprites.png

Resolve conflicts

2019-11-12 08:44:26 +01:00