mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-27 14:25:38 +08:00
Fix: merge LmeSzinc/dev into branch, resolve conflicts
This commit is contained in:
@@ -226,6 +226,10 @@
|
||||
"name": "Task.OpsiHazard1Leveling.name",
|
||||
"help": "Task.OpsiHazard1Leveling.help"
|
||||
},
|
||||
"OpsiCrossMonth": {
|
||||
"name": "Task.OpsiCrossMonth.name",
|
||||
"help": "Task.OpsiCrossMonth.help"
|
||||
},
|
||||
"Daemon": {
|
||||
"name": "Task.Daemon.name",
|
||||
"help": "Task.Daemon.help"
|
||||
@@ -2237,6 +2241,16 @@
|
||||
"help": "GameManager.AutoRestart.help"
|
||||
}
|
||||
},
|
||||
"Storage": {
|
||||
"_info": {
|
||||
"name": "Storage._info.name",
|
||||
"help": "Storage._info.help"
|
||||
},
|
||||
"Storage": {
|
||||
"name": "Storage.Storage.name",
|
||||
"help": "Storage.Storage.help"
|
||||
}
|
||||
},
|
||||
"Gui": {
|
||||
"Aside": {
|
||||
"Install": "Gui.Aside.Install",
|
||||
@@ -2324,7 +2338,8 @@
|
||||
"SSHNotInstall": "Gui.Remote.SSHNotInstall"
|
||||
},
|
||||
"Text": {
|
||||
"InvalidFeedBack": "Gui.Text.InvalidFeedBack"
|
||||
"InvalidFeedBack": "Gui.Text.InvalidFeedBack",
|
||||
"Clear": "Gui.Text.Clear"
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user