Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2020-10-10 13:16:03 -04:00
commit 2079a91ac6

View File

@ -26,10 +26,7 @@ public class UnitTypes implements ContentList{
public static @EntityDef({Unitc.class, Mechc.class}) UnitType vela;
//legs
public static @EntityDef({Unitc.class, Legsc.class}) UnitType corvus;
//legs
public static @EntityDef({Unitc.class, Legsc.class}) UnitType atrax;
public static @EntityDef({Unitc.class, Legsc.class}) UnitType corvus, atrax;
//legs + building
public static @EntityDef({Unitc.class, Legsc.class, Builderc.class}) UnitType spiroct, arkyid, toxopid;