Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts: core/src/mindustry/type/UnitType.java gradle.properties
This commit is contained in:
@@ -0,0 +1 @@
|
||||
{fields:[{name:flags,type:byte},{name:fontSize,type:float},{name:text,type:java.lang.String},{name:x,type:float},{name:y,type:float},{name:z,type:float}]}
|
||||
Reference in New Issue
Block a user