Merge remote-tracking branch 'origin/master'

core/src/mindustry/world/blocks/campaign/Accelerator.java

@@ -48,7 +48,7 @@ public class Accelerator extends Block{
     public boolean outputsItems(){
         return false;
     }
-    
+
     public class AcceleratorBuild extends Building{
         public float heat, statusLerp;
 
@@ -58,7 +58,7 @@ public class Accelerator extends Block{
             heat = Mathf.lerpDelta(heat, consValid() ? 1f : 0f, 0.05f);
             statusLerp = Mathf.lerpDelta(statusLerp, power.status, 0.05f);
         }
-        
+
         @Override
         public void draw(){
             super.draw();
@@ -72,7 +72,7 @@ public class Accelerator extends Block{
                     Draw.rect(arrowRegion, x + Angles.trnsx(rot, length), y + Angles.trnsy(rot, length), rot + 180f);
                 }
             }
-            
+
             if(heat < 0.0001f) return;
 
             float rad = size * tilesize / 2f * 0.74f;

core/src/mindustry/world/blocks/units/ResupplyPoint.java

@@ -47,11 +47,11 @@ public class ResupplyPoint extends Block{
         }
 
         @Override
-         public void updateTile(){
-             if(consValid() && timer(timerResupply, resupplyRate / timeScale) && resupply(this, range, ammoAmount, ammoColor)){
-                 consume();
-             }
-         }
+        public void updateTile(){
+            if(consValid() && timer(timerResupply, resupplyRate / timeScale) && resupply(this, range, ammoAmount, ammoColor)){
+                consume();
+            }
+        }
     }
 
     /** Tries to resupply nearby units.