Merge remote-tracking branch 'origin/master'

2020-09-16 11:44:46 -04:00
parent 9cfd78ee1f 90978b54da
commit ddcfd0728d
3 changed files with 1304 additions and 7 deletions
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -41,7 +41,7 @@ public class UnitTypes implements ContentList{
    //air + building + mining
    public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType alpha, beta, gamma;

-    //water
+    //water + commander
    public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risso, minke, bryde;

    //special block unit type