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

 Conflicts:

	core/assets/bundles/bundle_zh_CN.properties

	core/assets/bundles/bundle_zh_TW.properties

2021-11-22 13:17:36 -05: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-11-22 13:17:36 -05: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

Slag heater block

2021-11-21 14:06:18 -05:00

maps

Slight difficulty increase of Desolate Rift

2021-09-22 19:21:58 -04:00

music

Converted soundtrack to ogg

2021-10-07 12:07:26 -04:00

scripts

Added 2 versatile trigger event types (#6130)

2021-10-10 08:08:04 -04:00

shaders

More branch merging

2021-10-14 20:58:03 -04:00

sounds

Map editor bugfixes / Re-added build noise

2021-09-09 17:04:55 -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

hortiloaders hotfix randomness (#6283)

2021-11-01 17:34:40 -04:00

logicids.dat

Slag heater block

2021-11-21 14:06:18 -05:00