mirror of
https://github.com/0O0o0oOoO00/Alas.git
synced 2026-05-14 13:19:25 +08:00
Merge remote-tracking branch 'LmeSzinc/master' into dev
# Conflicts: # module/coalition/coalition.py # module/config/argument/args.json
This commit is contained in:
@@ -1342,7 +1342,7 @@
|
||||
"AmbushEvade": true
|
||||
},
|
||||
"Coalition": {
|
||||
"Mode": "area1-normal",
|
||||
"Mode": "hard",
|
||||
"Fleet": "single"
|
||||
},
|
||||
"StopCondition": {
|
||||
@@ -1932,7 +1932,7 @@
|
||||
"AmbushEvade": true
|
||||
},
|
||||
"Coalition": {
|
||||
"Mode": "area1-normal",
|
||||
"Mode": "sp",
|
||||
"Fleet": "single"
|
||||
},
|
||||
"StopCondition": {
|
||||
|
||||
Reference in New Issue
Block a user