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:
Anuken
2021-11-04 19:39:16 -04:00
31 changed files with 285 additions and 94 deletions

View File

@@ -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}]}