Anuken be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl ...

# 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/Vars.java
#	core/src/mindustry/entities/traits/SaveTrait.java
#	core/src/mindustry/maps/generators/MapGenerator.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/world/blocks/Floor.java
#	desktop/src/mindustry/desktop/DesktopLauncher.java
#	gradle.properties

2020-02-04 12:25:18 -05:00

..

backgrounds

Basic deploy background

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

block_colors.png

Added underflow gates

2020-01-20 18:54:25 -05: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

Added prototype planet sector land system

2020-01-20 12:05:26 -05:00

sprites3.png

Added underflow gates

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

sprites4.png

Merged in liquid void

2020-01-08 11:04:12 -05:00

sprites5.png

Added underflow gates

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

sprites.atlas

Added underflow gates

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

sprites.png

Added underflow gates

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