Anuken e6bd259c0e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ...

 Conflicts:

	core/assets/icons/icons.properties

	core/assets/logicids.dat

	core/src/mindustry/ui/dialogs/PlanetDialog.java

	core/src/mindustry/world/blocks/distribution/ItemBridge.java

	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java

	core/src/mindustry/world/blocks/storage/StorageBlock.java

	gradle.properties

2021-08-10 15:15:07 -04:00

..

caustics.png

Unspoiled

2021-06-02 11:15:30 -04:00

clouds.png

New core landing animation

2021-07-26 19:29:14 -04:00

distortAlpha.png

Unspoiled

2021-06-02 11:15:30 -04:00

error.png

Fixed incorrect asset loading

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

fog.png

Fog

2020-10-19 18:28:37 -04:00

logo.png

More menu

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

noise.png

Better detail

2020-04-09 20:55:59 -04:00

noiseAlpha.png

Bugfixes

2020-07-09 16:48:36 -04:00

rays.png

Unspoiled

2021-06-02 11:15:30 -04:00

schematic-background.png

Bugfixes

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

space.png

Random derelicts in sectors

2020-10-08 19:11:20 -04:00