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

 Conflicts:

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

2022-04-20 14:16:20 -04:00

..

ExplosionEffect.java

Partial 7.0 merge - API preview

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

MultiEffect.java

Better MultiEffect

2022-04-13 21:35:26 -04:00

ParticleEffect.java

casing flipping (#6696)

2022-04-05 11:23:23 -04:00

RadialEffect.java

Surge crucible effects

2021-11-17 13:37:51 -05:00

SeqEffect.java

Unit build req changes

2022-02-14 14:45:45 -05:00

WaveEffect.java

Partial 7.0 merge - API preview

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

WrapEffect.java

Minor bugfixes

2022-04-19 09:14:56 -04:00