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

..

abilities

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

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

bullet

#5050

2021-07-20 14:12:48 -04:00

comp

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

2021-07-23 17:58:02 -04:00

effect

Do not save MirrorFilter temporary vectors

2021-06-15 11:32:49 -04:00

units

Partial impl of #2923

2021-07-20 13:17:18 -04:00

Damage.java

block destroyEffect (#5427)

2021-06-16 15:55:08 -04:00

Effect.java

Cleanup

2021-07-19 15:20:53 -04:00

EntityCollisions.java

Mod browser icon support

2021-02-06 12:05:59 -05:00

EntityGroup.java

More misc cleanup

2021-03-17 17:39:50 -04:00

Fires.java

typo in Fires:

2020-11-28 17:49:39 +03:00

GroupDefs.java

Bugfixes

2020-11-24 10:23:28 -05:00

Leg.java

no IK

2020-06-08 10:46:19 -04:00

Lightning.java

lightningType follow angle (#5282)

2021-05-22 08:41:04 -04:00

Predict.java

Turret accurateDelay parameter

2021-07-20 17:55:00 -04:00

Puddles.java

Fixed more flaky tests

2021-06-26 20:55:52 -04:00

Sized.java

Partial 7.0 merge - API preview

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

TargetPriority.java

...

2020-05-21 21:15:39 -04:00

Units.java

Fix turret shooting priority when there are multiple teams (#5299)

2021-07-20 09:00:19 -04:00