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

 Conflicts:

	core/assets/icons/icons.properties

	core/src/mindustry/content/Blocks.java

	core/src/mindustry/world/meta/StatValues.java

2021-09-04 23:12:28 -04:00

..

baseparts

Generic node/bridge placement system

2020-12-18 12:41:13 -05:00

bloomshaders

Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00

bundles

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

2021-09-04 23:12:28 -04:00

cubemaps/stars

Prop cleanup / Optimization of large skybox PNG

2021-07-05 21:18:40 -04:00

cursors

Cursor antialiasing

2019-08-04 09:41:25 -04:00

fonts

Add fixed font.woff

2020-11-22 12:59:42 +02:00

icons

Added rivers on Serpulo / Added deep tainted water

2021-09-04 15:23:47 -04:00

maps

Removed atrax from archipelago waves

2021-08-22 13:44:55 -04:00

music

Converted music to mp3 / New tracks / Minor cleanup

2020-11-09 17:02:36 -05:00

scripts

Refactored fireball into FireBulletType

2021-08-08 13:37:55 -04:00

shaders

Fixed crash caused by invalid NinePatch sprites

2021-07-06 15:23:37 -04:00

sounds

Remove the slight delay in wind3.ogg (#5909)

2021-09-04 10:26:42 -04:00

sprites

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

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

contributors

Add unitSpawnEvent (#5876)

2021-08-28 10:53:19 -04:00

logicids.dat

Liquid container

2021-08-19 21:48:18 -04:00