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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/src/mindustry/type/UnitType.java
This commit is contained in:
Anuken
2021-11-22 10:12:48 -05:00
parent 6edf0a27a4 25f98fdeb0
commit 65f36faf71
42 changed files with 8369 additions and 1504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/io/JsonIO.java
View File

@@ -228,7 +228,12 @@ public class JsonIO{
Item item = Vars.content.getByName(ContentType.item, str);
Liquid liquid = Vars.content.getByName(ContentType.liquid, str);
Block block = Vars.content.getByName(ContentType.block, str);
return item != null ? item : liquid == null ? block : liquid;
UnitType unit = Vars.content.getByName(ContentType.unit, str);
return
item != null ? item :
block != null ? block :
liquid != null ? liquid :
unit;
}
});