Merge remote-tracking branch 'origin/master'

# Conflicts: # core/assets-raw/sprites/units/phantom-cell.png
2025-02-13 12:16:53 +07:00 · 2020-04-25 22:49:38 -04:00 · 2020-04-25 22:49:38 -04:00 · 08f8323465
commit 08f8323465
parent 9b74b69950 46762ab0e1
26 changed files with 1 additions and 1 deletions
--- a/core/assets-raw/sprites/units/alpha-cell.png
+++ b/core/assets-raw/sprites/units/alpha-cell.png
--- a/core/assets-raw/sprites/units/chaos-array-cell.png
+++ b/core/assets-raw/sprites/units/chaos-array-cell.png
--- a/core/assets-raw/sprites/units/crawler-cell.png
+++ b/core/assets-raw/sprites/units/crawler-cell.png
--- a/core/assets-raw/sprites/units/dagger-cell.png
+++ b/core/assets-raw/sprites/units/dagger-cell.png
--- a/core/assets-raw/sprites/units/dart-cell.png
+++ b/core/assets-raw/sprites/units/dart-cell.png
--- a/core/assets-raw/sprites/units/delta-cell.png
+++ b/core/assets-raw/sprites/units/delta-cell.png
--- a/core/assets-raw/sprites/units/draug-cell.png
+++ b/core/assets-raw/sprites/units/draug-cell.png
--- a/core/assets-raw/sprites/units/draug.png
+++ b/core/assets-raw/sprites/units/draug.png
--- a/core/assets-raw/sprites/units/eradicator-cell.png
+++ b/core/assets-raw/sprites/units/eradicator-cell.png
--- a/core/assets-raw/sprites/units/eruptor-cell.png
+++ b/core/assets-raw/sprites/units/eruptor-cell.png
--- a/core/assets-raw/sprites/units/fortress-cell.png
+++ b/core/assets-raw/sprites/units/fortress-cell.png
--- a/core/assets-raw/sprites/units/ghoul-cell.png
+++ b/core/assets-raw/sprites/units/ghoul-cell.png
--- a/core/assets-raw/sprites/units/glaive-cell.png
+++ b/core/assets-raw/sprites/units/glaive-cell.png
--- a/core/assets-raw/sprites/units/javelin-cell.png
+++ b/core/assets-raw/sprites/units/javelin-cell.png
--- a/core/assets-raw/sprites/units/lich-cell.png
+++ b/core/assets-raw/sprites/units/lich-cell.png
--- a/core/assets-raw/sprites/units/omega-cell.png
+++ b/core/assets-raw/sprites/units/omega-cell.png
--- a/core/assets-raw/sprites/units/reaper-cell.png
+++ b/core/assets-raw/sprites/units/reaper-cell.png
--- a/core/assets-raw/sprites/units/reaper.png
+++ b/core/assets-raw/sprites/units/reaper.png
--- a/core/assets-raw/sprites/units/revenant-cell.png
+++ b/core/assets-raw/sprites/units/revenant-cell.png
--- a/core/assets-raw/sprites/units/spirit-cell.png
+++ b/core/assets-raw/sprites/units/spirit-cell.png
--- a/core/assets-raw/sprites/units/tau-cell.png
+++ b/core/assets-raw/sprites/units/tau-cell.png
--- a/core/assets-raw/sprites/units/titan-cell.png
+++ b/core/assets-raw/sprites/units/titan-cell.png
--- a/core/assets-raw/sprites/units/trident-cell.png
+++ b/core/assets-raw/sprites/units/trident-cell.png
--- a/core/assets-raw/sprites/units/vanguard-cell.png
+++ b/core/assets-raw/sprites/units/vanguard-cell.png
--- a/core/assets-raw/sprites/units/wraith-cell.png
+++ b/core/assets-raw/sprites/units/wraith-cell.png
--- a/core/src/mindustry/world/blocks/liquid/Conduit.java
+++ b/core/src/mindustry/world/blocks/liquid/Conduit.java
@ -37,7 +37,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
        liquidRegion = Core.atlas.find("conduit-liquid");
        for(int i = 0; i < topRegions.length; i++){
            topRegions[i] = Core.atlas.find(name + "-top-" + i);
-            botRegions[i] = Core.atlas.find("conduit-bottom-" + i);
+            botRegions[i] = Core.atlas.find(name + "-bottom-" + i, Core.atlas.find("conduit-bottom-" + i));
        }
    }