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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-10-23 10:39:05 -04:00
parent bf1268bb6e 4de1b8fe11
commit 2b5ee5c463
11 changed files with 896 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/ctype/UnlockableContent.java
View File

@@ -74,9 +74,11 @@ public abstract class UnlockableContent extends MappableContent{
cicons[icon.ordinal()] =
Core.atlas.find(getContentType().name() + "-" + name + "-" + icon.name(),
Core.atlas.find(getContentType().name() + "-" + name + "-full",
Core.atlas.find(name + "-" + icon.name(),
Core.atlas.find(name + "-full",
Core.atlas.find(name,
Core.atlas.find(getContentType().name() + "-" + name,
Core.atlas.find(name + "1")))));
Core.atlas.find(name + "1")))))));
}
return cicons[icon.ordinal()];
}