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

 Conflicts:

	core/assets/bundles/bundle_fil.properties

core/src/mindustry/content/UnitTypes.java

@@ -2257,6 +2257,7 @@ public class UnitTypes{
                     backColor = Pal.heal;
                     frontColor = Color.white;
                     width = height = 12f;
+                    shrinkY = 0f;
                     speed = 5f;
                     trailLength = 20;
                     trailWidth = 6f;