Renamed ""oil"" / Increased phase fabric boost

core/assets/bundles/bundle.properties

@@ -497,7 +497,7 @@ block.metalfloor.name = Metal Floor
 block.deepwater.name = deepwater
 block.water.name = water
 block.lava.name = lava
-block.oil.name = oil
+block.tar.name = Tar
 block.blackstone.name = blackstone
 block.stone.name = stone
 block.dirt.name = dirt

core/src/io/anuke/mindustry/content/blocks/Blocks.java

@@ -16,7 +16,7 @@ import io.anuke.ucore.graphics.Lines;
 import io.anuke.ucore.util.Mathf;
 
 public class Blocks extends BlockList implements ContentList{
-    public static Block air, blockpart, spawn, space, metalfloor, deepwater, water, lava, oil, stone, blackstone, dirt, sand, ice, snow, grass, shrub, rock, icerock, blackrock;
+    public static Block air, blockpart, spawn, space, metalfloor, deepwater, water, lava, tar, stone, blackstone, dirt, sand, ice, snow, grass, shrub, rock, icerock, blackrock;
 
 
     @Override
@@ -100,11 +100,11 @@ public class Blocks extends BlockList implements ContentList{
             minimapColor = Color.valueOf("ed5334");
         }};
 
-        oil = new Floor("oil"){{
+        tar = new Floor("tar"){{
             liquidColor = Color.valueOf("292929");
             status = StatusEffects.tarred;
             statusIntensity = 1f;
-            speedMultiplier = 0.2f;
+            speedMultiplier = 0.19f;
             variants = 0;
             liquidDrop = Liquids.oil;
             isLiquid = true;

core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java

@@ -175,7 +175,7 @@ public class FileChooser extends FloatingDialog{
         Arrays.sort(handles, (a, b) -> {
             if(a.isDirectory() && !b.isDirectory()) return -1;
             if(!a.isDirectory() && b.isDirectory()) return 1;
-            return a.name().toUpperCase().compareTo(b.name().toUpperCase());
+            return String.CASE_INSENSITIVE_ORDER.compare(a.name(), b.name());
         });
         return handles;
     }

core/src/io/anuke/mindustry/world/LegacyColorMapper.java

@@ -38,7 +38,7 @@ public class LegacyColorMapper implements ContentList{
         map("f7feff", Blocks.snow, 1);
         map("6e501e", Blocks.dirt, 0);
         map("ed5334", Blocks.lava, 0);
-        map("292929", Blocks.oil, 0);
+        map("292929", Blocks.tar, 0);
         map("c3a490", OreBlocks.get(Blocks.stone, Items.copper), 0);
         map("161616", OreBlocks.get(Blocks.stone, Items.coal), 0);
         map("6277bc", OreBlocks.get(Blocks.stone, Items.titanium), 0);

core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java

@@ -33,9 +33,9 @@ import static io.anuke.mindustry.Vars.*;
 
 public class ForceProjector extends Block {
     protected int timerUse = timers ++;
-    protected float phaseUseTime = 250f;
+    protected float phaseUseTime = 350f;
 
-    protected float phaseRadiusBoost = 60f;
+    protected float phaseRadiusBoost = 80f;
     protected float radius = 100f;
     protected float breakage = 550f;
     protected float cooldownNormal = 1.75f;

core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java

@@ -35,8 +35,8 @@ public class MendProjector extends Block{
     protected float range = 50f;
     protected float healPercent = 6f;
     protected float phaseBoost = 12f;
-    protected float phaseRangeBoost = 40f;
+    protected float phaseRangeBoost = 50f;
-    protected float useTime = 300f;
+    protected float useTime = 400f;
 
     public MendProjector(String name){
         super(name);

core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java

@@ -34,8 +34,8 @@ public class OverdriveProjector extends Block{
     protected float reload = 260f;
     protected float range = 80f;
     protected float speedBoost = 1.5f;
-    protected float speedBoostPhase = 0.5f;
+    protected float speedBoostPhase = 0.75f;
-    protected float useTime = 300f;
+    protected float useTime = 400f;
 
     public OverdriveProjector(String name){
         super(name);