mirror of
https://github.com/Anuken/Mindustry.git
synced 2026-10-02 03:00:29 +03:00
Merge branch 'master' of https://github.com/Anuken/Mindustry into v9
# Conflicts: # core/assets/bundles/bundle_es.properties # core/assets/bundles/bundle_it.properties # core/src/mindustry/game/MapObjectives.java # core/src/mindustry/logic/LExecutor.java # core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java # gradle.properties # tests/src/test/java/ApplicationTests.java
This commit is contained in:
@@ -6,6 +6,7 @@ atrax=1
|
||||
beta=30
|
||||
block=2
|
||||
corvus=24
|
||||
dummy=49
|
||||
elude=45
|
||||
flare=3
|
||||
gamma=31
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:aimX,type:float},{name:aimY,type:float},{name:building,type:Building},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
|
||||
Reference in New Issue
Block a user