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

 Conflicts:

	core/src/mindustry/content/Blocks.java

	core/src/mindustry/net/CrashSender.java

	core/src/mindustry/ui/Links.java

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

	core/src/mindustry/world/blocks/power/LightBlock.java

	gradle.properties

2021-07-23 17:58:02 -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-07-23 17:58:02 -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

Payload loader/unloader progress

2021-07-22 21:07:36 -04:00

maps

Suppress certain mod errors on client load

2021-06-25 14:37:32 -04:00

music

Converted music to mp3 / New tracks / Minor cleanup

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

scripts

Re-generated ClassMap

2021-07-01 11:44:29 -04:00

shaders

Fixed crash caused by invalid NinePatch sprites

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

sounds

Fixed continuous weapon sounds / Improved naval support audio

2021-07-14 18:46:51 -04:00

sprites

Unspoiled

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

contributors

Server qol (#5534)

2021-07-04 21:18:41 -04:00

logicids.dat

Payload loader/unloader progress

2021-07-22 21:07:36 -04:00