Merge branch 'master' of https://github.com/Anuken/Mindustry into array-textures

# Conflicts:
#	gradle.properties

core/src/mindustry/ui/fragments/PerformanceFragment.java

@@ -77,7 +77,9 @@ public class PerformanceFragment{
         @Override
         public void draw(){
             Vec2 mouse = screenToLocalCoordinates(Core.input.mouse()).add(x, y);
-            float total = frame.valueMs();
+            float sum = 0;
+            for(var counter : displayedCounters) sum += counter.valueMs();
+            float total = Math.max(sum, frame.valueMs());
             float accumulator = 0f;
             PerfCounter hoveredCounter = null;
 

gradle.properties

@@ -26,4 +26,4 @@ org.gradle.caching=true
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
 android.enableR8.fullMode=false
-archash=9ab6e1e02b
+archash=34ae63d126