Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	core/assets-raw/sprites/units/phantom-cell.png
This commit is contained in:
Anuken
2020-04-25 22:49:38 -04:00
parent 9b74b69950 46762ab0e1
commit 08f8323465
26 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/liquid/Conduit.java
View File

@@ -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));
}
}