Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/UnitInfo/core/BarInfo.java
#	src/UnitInfo/core/HudUi.java
This commit is contained in:
Sharlotte
2021-07-27 17:54:20 +09:00

View File

@@ -17,7 +17,7 @@ import arc.struct.*;
import arc.util.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.entities.Units;
import mindustry.entities.*;
import mindustry.entities.units.*;
import mindustry.game.*;
import mindustry.gen.*;