Merge remote-tracking branch 'upstream/master' into unit-stats

2020-11-09 21:52:42 -08:00
parent e9c00d8a9f ebdced5c6c
commit 3a27e6e94e
244 changed files with 467 additions and 367 deletions
--- a/core/src/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java
@@ -42,7 +42,7 @@ public class Conveyor extends Block implements Autotiler{
        conveyorPlacement = true;

        ambientSound = Sounds.conveyor;
-        ambientSoundVolume = 0.002f;
+        ambientSoundVolume = 0.0015f;
        unloadable = false;
        noUpdateDisabled = false;
    }