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

 Conflicts:
	core/src/mindustry/content/Blocks.java
This commit is contained in:
Anuken
2021-09-04 12:26:07 -04:00
28 changed files with 80 additions and 22 deletions

View File

@ -91,7 +91,7 @@ public abstract class BaseProcessor extends AbstractProcessor{
}
public static TypeName tname(String pack, String simple){
return ClassName.get(pack, simple );
return ClassName.get(pack, simple);
}
public static TypeName tname(String name){