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:
@@ -183,6 +183,7 @@ const TileOverlayChangeEvent = Packages.mindustry.game.EventType.TileOverlayChan
|
||||
const TileFloorChangeEvent = Packages.mindustry.game.EventType.TileFloorChangeEvent
|
||||
const TileChangeEvent = Packages.mindustry.game.EventType.TileChangeEvent
|
||||
const TilePreChangeEvent = Packages.mindustry.game.EventType.TilePreChangeEvent
|
||||
const BulletCreateEvent = Packages.mindustry.game.EventType.BulletCreateEvent
|
||||
const BuildDamageEvent = Packages.mindustry.game.EventType.BuildDamageEvent
|
||||
const GameOverEvent = Packages.mindustry.game.EventType.GameOverEvent
|
||||
const BuildingCommandEvent = Packages.mindustry.game.EventType.BuildingCommandEvent
|
||||
|
||||
Reference in New Issue
Block a user