Merge branch 'master' into schematic

2020-09-23 16:29:41 +02:00
parent 1e10817708 8ed83964a2
commit d0c6f3274b
563 changed files with 30174 additions and 22699 deletions
@@ -1,23 +1,28 @@
 #Maps entity names to IDs. Autogenerated.

-atrax=0
-block=1
-flare=2
-mace=3
-mega=4
-mindustry.entities.comp.BuildingComp=5
-mindustry.entities.comp.BulletComp=6
-mindustry.entities.comp.DecalComp=7
-mindustry.entities.comp.EffectStateComp=8
-mindustry.entities.comp.FireComp=9
-mindustry.entities.comp.LaunchCoreComp=10
-mindustry.entities.comp.PlayerComp=11
-mindustry.entities.comp.PuddleComp=12
-mindustry.type.Weather.WeatherStateComp=13
-mindustry.world.blocks.campaign.LaunchPad.LaunchPayloadComp=14
-mono=15
-nova=16
-poly=17
-pulsar=18
-risso=19
-spiroct=20
+alpha=0
+atrax=1
+block=2
+corvus=24
+flare=3
+mace=4
+mega=5
+mindustry.entities.comp.BuildingComp=6
+mindustry.entities.comp.BulletComp=7
+mindustry.entities.comp.DecalComp=8
+mindustry.entities.comp.EffectStateComp=9
+mindustry.entities.comp.FireComp=10
+mindustry.entities.comp.LaunchCoreComp=11
+mindustry.entities.comp.PlayerComp=12
+mindustry.entities.comp.PuddleComp=13
+mindustry.type.Weather.WeatherStateComp=14
+mindustry.world.blocks.campaign.LaunchPad.LaunchPayloadComp=15
+mindustry.world.blocks.defense.ForceProjector.ForceDrawComp=22
+mono=16
+nova=17
+poly=18
+pulsar=19
+quad=23
+risso=20
+spiroct=21
+vela=25