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

 Conflicts:

	core/src/mindustry/content/Planets.java

	tools/src/mindustry/tools/Generators.java

core/src/mindustry/content/Planets.java

@@ -23,7 +23,7 @@ public class Planets implements ContentList{
 
     @Override
     public void load(){
-        sun = new Planet("sun", null, 4){{
+        sun = new Planet("sun", null, 4f){{
             bloom = true;
             accessible = false;
 
@@ -40,7 +40,7 @@ public class Planets implements ContentList{
             );
         }};
 
-        erekir = new Planet("erekir", sun, 1, 2){{
+        erekir = new Planet("erekir", sun, 1f, 2){{
             generator = new ErekirPlanetGenerator();
             meshLoader = () -> new HexMesh(this, 5);
             atmosphereColor = Color.valueOf("f07218");
@@ -71,7 +71,7 @@ public class Planets implements ContentList{
             gen.max += 2;
         });
 
-        tantros = new Planet("tantros", sun, 1, 2){{
+        tantros = new Planet("tantros", sun, 1f, 2){{
             generator = new TantrosPlanetGenerator();
             meshLoader = () -> new HexMesh(this, 4);
             atmosphereColor = Color.valueOf("3db899");
@@ -81,7 +81,7 @@ public class Planets implements ContentList{
             alwaysUnlocked = true;
         }};
 
-        serpulo = new Planet("serpulo", sun, 1, 3){{
+        serpulo = new Planet("serpulo", sun, 1f, 3){{
             generator = new SerpuloPlanetGenerator();
             meshLoader = () -> new HexMesh(this, 6);
             cloudMeshLoader = () -> new MultiMesh(

core/src/mindustry/content/TechTree.java

@@ -88,7 +88,9 @@ public class TechTree implements ContentList{
                     node(conduit, () -> {
                         node(liquidJunction, () -> {
                             node(liquidRouter, () -> {
-                                node(liquidTank);
+                                node(liquidContainer, () -> {
+                                    node(liquidTank);
+                                });
 
                                 node(bridgeConduit);
 

core/src/mindustry/content/UnitTypes.java

@@ -587,6 +587,7 @@ public class UnitTypes implements ContentList{
             ammoType = new ItemAmmoType(Items.coal);
 
             weapons.add(new Weapon(){{
+                shootOnDeath = true;
                 reload = 24f;
                 shootCone = 180f;
                 ejectEffect = Fx.none;
@@ -597,7 +598,7 @@ public class UnitTypes implements ContentList{
                     hitEffect = Fx.pulverize;
                     lifetime = 10f;
                     speed = 1f;
-                    splashDamageRadius = 60f;
+                    splashDamageRadius = 55f;
                     instantDisappear = true;
                     splashDamage = 90f;
                     killShooter = true;