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

 Conflicts:

	core/src/mindustry/content/Blocks.java

core/src/mindustry/graphics/Trail.java

@@ -77,6 +77,8 @@ public class Trail{
             if(points.size >= 3){
                 points.removeRange(0, 2);
             }
+
+            counter = 0f;
         }
     }