Merge remote-tracking branch 'origin/master'

# Conflicts: # core/assets-raw/sprites/units/phantom-cell.png
2020-04-25 22:49:38 -04:00
parent 9b74b69950 46762ab0e1
commit 08f8323465
26 changed files with 1 additions and 1 deletions
@@ -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));
        }
    }