Merge branch 'master' of https://github.com/Anuken/Mindustry

core/src/mindustry/content/Blocks.java

@@ -1246,7 +1246,7 @@ public class Blocks implements ContentList{
             powerProduction = 130f;
             itemDuration = 140f;
             ambientSound = Sounds.pulse;
-            ambientSoundVolume = 0.2f;
+            ambientSoundVolume = 0.07f;
 
             consumes.power(25f);
             consumes.item(Items.blastCompound);

core/src/mindustry/entities/comp/FireComp.java

@@ -34,9 +34,7 @@ abstract class FireComp implements Timedc, Posc, Firec, Syncc{
             Fx.fireSmoke.at(x + Mathf.range(4f), y + Mathf.range(4f));
         }
 
-        if(Mathf.chance(0.001 * Time.delta)){
+        loops.play(Sounds.fire, this, 0.07f);
-            Sounds.fire.at(this);
-        }
 
         time = Mathf.clamp(time + Time.delta, 0, lifetime());
 

fastlane/metadata/android/en-US/changelogs/29691.txt

@@ -0,0 +1,9 @@
+- Improved icons
+- Improved unit rotation visuals when moving and building/mining
+- Decreased command limit of early game flying units to reduce PvP rushing
+- Made core units unlock on spawn
+- Switched to a new, unified audio framework for all platforms
+- Added new sound effects and loops
+- Added new music
+- Added community server groups with optional titles and a hide button
+- Added editor search bar (Contributed by @summetdev)

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=a71eaec7f1a331600d5d2aab0b6efeaf9fcd4b33
+archash=2c022c5c2723b39e63da7cadd6c53ce6ec78f9d3

servers_v6.json

@@ -1,27 +1,17 @@
 [
   {
-    "address": "mindustry.pl:6000"
+    "name": "mindustry.pl",
-  },
+    "address": ["mindustry.pl:6000", "mindustry.pl:6666"]
-  {
-    "address": "mindustry.pl:6666"
   },
   {
     "address": "routerchain.ddns.net"
   },
-  {
-    "address": "mindustry.atannergaming.com:13000"
-  },
   {
     "address": "pandorum.su:8000"
   },
   {
-    "address": "mindustry.ecansol.com:6597"
+    "name": "ECAN",
-  },
+    "address": ["mindustry.ecansol.com:6597", "mindustry.ecansol.com:6499", "mindustry.ecansol.com:6599"]
-  {
-    "address": "mindustry.ecansol.com:6499"
-  },
-  {
-    "address": "mindustry.ecansol.com:6599"
   },
   {
     "address": "Chaotic-Neutral.ddns.net:5555"