diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index 2c7f4756df..46bda89092 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -96,7 +96,7 @@ public class NetClient implements ApplicationListener{
             state.set(State.menu);
             logic.reset();
             platform.updateRPC();
-            player.name = Core.settings.getString("name");
+            player.name(Core.settings.getString("name"));
 
             if(quiet) return;
 
diff --git a/core/src/mindustry/game/Saves.java b/core/src/mindustry/game/Saves.java
index 42c2f09ab4..9cdaf8a61b 100644
--- a/core/src/mindustry/game/Saves.java
+++ b/core/src/mindustry/game/Saves.java
@@ -129,7 +129,6 @@ public class Saves{
         }
         slot.save();
         lastSectorSave = slot;
-        Log.info("Saving " + slot.getName());
         Core.settings.putSave("last-sector-save", slot.getName());
     }
 
diff --git a/core/src/mindustry/maps/planet/TestPlanetGenerator.java b/core/src/mindustry/maps/planet/TestPlanetGenerator.java
index 4d43833fe5..78aa00db0e 100644
--- a/core/src/mindustry/maps/planet/TestPlanetGenerator.java
+++ b/core/src/mindustry/maps/planet/TestPlanetGenerator.java
@@ -8,7 +8,7 @@ import arc.util.*;
 import arc.util.noise.*;
 import mindustry.*;
 import mindustry.content.*;
-import mindustry.game.*;
+import mindustry.maps.zonegen.*;
 import mindustry.type.*;
 import mindustry.world.*;
 
@@ -120,7 +120,10 @@ public class TestPlanetGenerator implements PlanetGenerator{
         tiles.each((x, y) -> tiles.get(x, y).setBlock(!read.get(x, y) ? Blocks.air : tiles.get(x, y).floor().wall));
         distort(0.009f, 12f);
 
-        tiles.get(tiles.width /2, tiles.height /2).setBlock(Blocks.coreShard, Team.sharded);
+        OvergrowthGenerator gen = new OvergrowthGenerator(tiles.width, tiles.height);
+        gen.decorate(tiles);
+
+        //tiles.get(tiles.width /2, tiles.height /2).setBlock(Blocks.coreShard, Team.sharded);
     }
 
     void distort(float scl, float mag){
diff --git a/core/src/mindustry/maps/zonegen/OvergrowthGenerator.java b/core/src/mindustry/maps/zonegen/OvergrowthGenerator.java
index 916449ea5f..c9fc888f84 100644
--- a/core/src/mindustry/maps/zonegen/OvergrowthGenerator.java
+++ b/core/src/mindustry/maps/zonegen/OvergrowthGenerator.java
@@ -23,10 +23,12 @@ public class OvergrowthGenerator extends BasicGenerator{
         ores(tiles);
         //terrain(tiles, Blocks.sporePine, 70f, 1.4f, 1f);
 
-        int rand = 40;
-        int border = 25;
-        int spawnX = Mathf.clamp(30 + Mathf.range(rand), border, width - border), spawnY = Mathf.clamp(30 + Mathf.range(rand), border, height - border);
-        int endX = Mathf.clamp(width - 30 + Mathf.range(rand), border, width - border), endY = Mathf.clamp(height - 30 + Mathf.range(rand), border, height - border);
+        //int rand = 40;
+        //int border = 25;
+        //int spawnX = Mathf.clamp(30 + Mathf.range(rand), border, width - border), spawnY = Mathf.clamp(30 + Mathf.range(rand), border, height - border);
+        //int endX = Mathf.clamp(width - 30 + Mathf.range(rand), border, width - border), endY = Mathf.clamp(height - 30 + Mathf.range(rand), border, height - border);
+
+        int radius = (int)(width / 2 / Mathf.sqrt3);
 
         brush(tiles, pathfind(tiles, spawnX, spawnY, endX, endY, tile -> (tile.solid() ? 5f : 0f) + (float)sim.octaveNoise2D(1, 1, 1f / 50f, tile.x, tile.y) * 50, manhattan), 6);
         brush(tiles, pathfind(tiles, spawnX, spawnY, endX, endY, tile -> (tile.solid() ? 4f : 0f) + (float)sim.octaveNoise2D(1, 1, 1f / 90f, tile.x+999, tile.y) * 70, manhattan), 5);
@@ -40,6 +42,7 @@ public class OvergrowthGenerator extends BasicGenerator{
         //scatter(tiles, Blocks.sporePine, Blocks.whiteTreeDead, 1f);
 
         tiles.getn(endX, endY).setOverlay(Blocks.spawn);
+        loadout = Loadouts.advancedShard;
         schematics.placeLoadout(loadout, spawnX, spawnY);
     }
 }
diff --git a/core/src/mindustry/world/blocks/production/SolidPump.java b/core/src/mindustry/world/blocks/production/SolidPump.java
index cd9836e2b0..f2a21ebbd9 100644
--- a/core/src/mindustry/world/blocks/production/SolidPump.java
+++ b/core/src/mindustry/world/blocks/production/SolidPump.java
@@ -110,7 +110,7 @@ public class SolidPump extends Pump{
             tile.entity.liquids().add(result, maxPump);
             entity.lastPump = maxPump;
             entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, 0.02f);
-            if(tile.entity.timer.get(timerContentCheck, 10)) useContent(tile, result);
+            if(tile.entity.timer(timerContentCheck, 10)) useContent(tile, result);
             if(Mathf.chance(entity.delta() * updateEffectChance))
                 updateEffect.at(entity.getX() + Mathf.range(size * 2f), entity.getY() + Mathf.range(size * 2f));
         }else{
diff --git a/gradle.properties b/gradle.properties
index f0d8d8201f..21c1a4ca33 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=51a9bcc4ae9248f3415b0ff5fa639b10a719228e
+archash=f1e9b0b63e8d99047324dea2d982a00ba6364497