mirror of
https://github.com/0O0o0oOoO00/Alas.git
synced 2026-05-14 11:09:25 +08:00
Merge remote-tracking branch 'LmeSzinc/master' into refactor
# Conflicts: # module/config/argument/args.json
This commit is contained in:
@@ -123,6 +123,12 @@ Event:
|
||||
EventGeneral:
|
||||
- EventGeneral
|
||||
- TaskBalancer
|
||||
Coalition:
|
||||
- Scheduler
|
||||
- Campaign
|
||||
- Coalition
|
||||
- StopCondition
|
||||
- Emotion
|
||||
Event:
|
||||
- Scheduler
|
||||
- Campaign
|
||||
@@ -188,12 +194,7 @@ Event:
|
||||
- Hospital
|
||||
- StopCondition
|
||||
- Emotion
|
||||
Coalition:
|
||||
- Scheduler
|
||||
- Campaign
|
||||
- Coalition
|
||||
- StopCondition
|
||||
- Emotion
|
||||
|
||||
MaritimeEscort:
|
||||
- Scheduler
|
||||
- MaritimeEscort
|
||||
|
||||
Reference in New Issue
Block a user