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

 Conflicts:

	core/src/mindustry/world/blocks/environment/Floor.java

	core/src/mindustry/world/blocks/payloads/Payload.java

	gradle.properties

2021-07-15 09:13:35 -04:00

..

Attribute.java

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

2021-07-09 19:48:35 -04:00

BlockBars.java

Cleanup

2020-10-02 19:51:30 -04:00

BlockFlag.java

Partial 7.0 merge - API preview

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

BlockGroup.java

Turrets can properly replace eachother, cores can replace conveyors and minor cleanup. (#4841)

2021-03-03 09:15:50 -05:00

BlockStatus.java

Implemented #1129 / Bugfixes

2020-03-24 12:02:26 -04:00

BuildVisibility.java

Cleanup

2020-10-30 10:36:07 -04:00

Env.java

Partial 7.0 merge - API preview

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

Stat.java

Partial 7.0 merge - API preview

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

StatCat.java

Shooting -> Function category / Dialog cleanup

2020-10-23 10:39:01 -04:00

Stats.java

WallCrafter progress

2021-07-07 16:28:33 -04:00

StatUnit.java

Crash fix / tilesSecond speed unit

2021-07-01 11:17:42 -04:00

StatValue.java

Cleanup

2020-10-02 19:51:30 -04:00

StatValues.java

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

2021-07-15 09:13:35 -04:00