Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-02 11:10:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into v9

Browse Source 
# Conflicts:
#	core/src/mindustry/logic/LExecutor.java
#	core/src/mindustry/world/blocks/logic/LogicDisplay.java
#	core/src/mindustry/world/meta/StatValues.java
#	gradle.properties
This commit is contained in:
Anuken
2026-08-29 09:53:28 -04:00
parent 2b9937c3be 4db3cd713c
commit 22f0b9a5c7
80 changed files with 792 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/scripts/global.js
+1
View File
@@ -173,6 +173,7 @@ const BuildSelectEvent = Packages.mindustry.game.EventType.BuildSelectEvent
const BuildRotateEvent = Packages.mindustry.game.EventType.BuildRotateEvent
const BlockBuildEndEvent = Packages.mindustry.game.EventType.BlockBuildEndEvent
const BlockBuildBeginEvent = Packages.mindustry.game.EventType.BlockBuildBeginEvent
const RulesLoadEvent = Packages.mindustry.game.EventType.RulesLoadEvent
const ResearchEvent = Packages.mindustry.game.EventType.ResearchEvent
const UnlockEvent = Packages.mindustry.game.EventType.UnlockEvent
const StateChangeEvent = Packages.mindustry.game.EventType.StateChangeEvent