merge alas

module/config/argument/args.json

@@ -1622,7 +1622,6 @@
           "cassin_or_downes"
         ]
       },
-<<<<<<< HEAD
       "ALLowLowVanguardLevel": {
         "type": "checkbox",
         "value": true
@@ -1640,8 +1639,6 @@
         "type": "checkbox",
         "value": true
       },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
       "CommissionLimit": {
         "type": "checkbox",
         "value": true
@@ -2847,7 +2844,6 @@
       }
     }
   },
-<<<<<<< HEAD
   "Event3": {
     "Scheduler": {
       "Enable": {
@@ -3296,8 +3292,6 @@
       }
     }
   },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
   "Raid": {
     "Scheduler": {
       "Enable": {
@@ -7894,7 +7888,6 @@
       }
     },
     "Exercise": {
-<<<<<<< HEAD
       "DelayUntilHoursBeforeNextUpdate": {
         "type": "select",
         "value": 12,
@@ -7907,8 +7900,6 @@
           12
         ]
       },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
       "OpponentChooseMode": {
         "type": "select",
         "value": "max_exp",
@@ -8853,7 +8844,6 @@
           4
         ]
       },
-<<<<<<< HEAD
       "FleetMode": {
         "type": "select",
         "value": "combat_auto",
@@ -8864,8 +8854,6 @@
           "hide_in_bottom_left"
         ]
       },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
       "Submarine": {
         "type": "checkbox",
         "value": false
@@ -9039,7 +9027,6 @@
           4
         ]
       },
-<<<<<<< HEAD
       "FleetMode": {
         "type": "select",
         "value": "combat_auto",
@@ -9050,8 +9037,6 @@
           "hide_in_bottom_left"
         ]
       },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
       "Submarine": {
         "type": "checkbox",
         "value": false
@@ -9119,7 +9104,6 @@
           4
         ]
       },
-<<<<<<< HEAD
       "FleetMode": {
         "type": "select",
         "value": "combat_auto",
@@ -9130,8 +9114,6 @@
           "hide_in_bottom_left"
         ]
       },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
       "Submarine": {
         "type": "checkbox",
         "value": false
@@ -9250,7 +9232,6 @@
           4
         ]
       },
-<<<<<<< HEAD
       "FleetMode": {
         "type": "select",
         "value": "combat_auto",
@@ -9261,8 +9242,6 @@
           "hide_in_bottom_left"
         ]
       },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
       "Submarine": {
         "type": "checkbox",
         "value": false
@@ -9325,7 +9304,6 @@
         "value": "Fleet-4 > CallSubmarine > Fleet-2 > Fleet-3 > Fleet-1"
       }
     },
-<<<<<<< HEAD
     "OpsiFleet": {
       "Fleet": {
         "type": "select",
@@ -9354,8 +9332,6 @@
         "display": "hide"
       }
     },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     "Storage": {
       "Storage": {
         "type": "storage",
@@ -9502,7 +9478,6 @@
           4
         ]
       },
-<<<<<<< HEAD
       "FleetMode": {
         "type": "select",
         "value": "combat_auto",
@@ -9513,8 +9488,6 @@
           "hide_in_bottom_left"
         ]
       },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
       "Submarine": {
         "type": "checkbox",
         "value": false
@@ -9587,7 +9560,6 @@
           4
         ]
       },
-<<<<<<< HEAD
       "FleetMode": {
         "type": "select",
         "value": "combat_auto",
@@ -9598,8 +9570,6 @@
           "hide_in_bottom_left"
         ]
       },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
       "Submarine": {
         "type": "checkbox",
         "value": false,
@@ -9752,7 +9722,6 @@
         "value": true
       }
     },
-<<<<<<< HEAD
     "GGHandler": {
       "Enabled": {
         "type": "checkbox",
@@ -10033,8 +10002,6 @@
         "validate": "datetime"
       }
     },
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     "Storage": {
       "Storage": {
         "type": "storage",

module/config/argument/argument.yaml

@@ -277,14 +277,11 @@ GemsFarming:
   CommonDD:
     value: any
     option: [ any, aulick_or_foote , cassin_or_downes ]
-<<<<<<< HEAD
   ALLowLowVanguardLevel: true
   FleetNumberInHardMode:
     value: 0
     option: [ 0, 1, 2 ]
   StopIFAutoNotEnsured: true
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
   CommissionLimit: true
 
 # ==================== Event ====================
@@ -623,12 +620,9 @@ Hard:
     value: 1
     option: [ 1, 2 ]
 Exercise:
-<<<<<<< HEAD
   DelayUntilHoursBeforeNextUpdate:
     value: 12
     option: [ 1, 2, 3, 4, 5, 12]
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
   OpponentChooseMode:
     value: max_exp
     option: [ max_exp, easiest, leftmost, easiest_else_exp ]
@@ -674,12 +668,9 @@ OpsiFleet:
   Fleet:
     value: 1
     option: [ 1, 2, 3, 4 ]
-<<<<<<< HEAD
   FleetMode:
     value: combat_auto
     option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ]
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
   Submarine: false
 OpsiExplore:
   SpecialRadar: false
@@ -743,7 +734,6 @@ AzurLaneUncensored:
     display: disabled
 GameManager:
   AutoRestart: true
-<<<<<<< HEAD
 
 GGHandler:
   Enabled: false
@@ -848,5 +838,3 @@ GuildCoin:
     value: ^000000
     display: hide
   Record: 2020-01-01 00:00:00
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0

module/config/argument/gui.yaml

@@ -14,11 +14,8 @@ Button:
   Stop:
   ScrollON:
   ScrollOFF:
-<<<<<<< HEAD
   DashboardON:
   DashboardOFF:
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
   ClearLog:
   Setting:
   CheckUpdate:
@@ -51,7 +48,6 @@ MenuDevelop:
 
 Overview:
   Scheduler:
-<<<<<<< HEAD
   Dashboard:
   SecondsAgo:
   MinutesAgo:
@@ -72,8 +68,6 @@ Overview:
   Medal:
   Core:
   GuildCoin:
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
   Log:
   Running:
   Pending:

module/config/argument/menu.json

@@ -25,10 +25,7 @@
       "EventGeneral",
       "Event",
       "Event2",
-<<<<<<< HEAD
       "Event3",
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
       "Raid",
       "Coalition",
       "MaritimeEscort",

module/config/argument/override.yaml

@@ -61,15 +61,12 @@ Event2:
     Event:
       type: state
     AmbushEvade: true
-<<<<<<< HEAD
 Event3:
   Campaign:
     Mode: normal
     Event:
       display: disabled
     AmbushEvade: true
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 EventA:
   Scheduler:
     SuccessInterval: 30
@@ -424,12 +421,9 @@ OpsiStronghold:
     SuccessInterval: 60
     FailureInterval: 60
     ServerUpdate: 00:00
-<<<<<<< HEAD
   OpsiFleet:
     Fleet: 1
     Submarine: true
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 OpsiMeowfficerFarming:
   Scheduler:
     SuccessInterval: 30
@@ -442,7 +436,6 @@ OpsiHazard1Leveling:
     ServerUpdate: 00:00, 12:00
   OpsiFleet:
     Submarine: false
-<<<<<<< HEAD
 
 # ==================== GGHandler ====================
 GGHandler:
@@ -475,5 +468,3 @@ Dashboard:
     Color: ^FFDD00
   GuildCoin:
     Color: ^AAAAAA
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0

module/config/argument/task.yaml

@@ -2,10 +2,6 @@
 # Define argument group of tasks.
 # --------------------
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 # ==================== Alas ====================
 
 Alas:
@@ -25,10 +21,7 @@ Alas:
       - OldRetire
     Restart:
       - Scheduler
-<<<<<<< HEAD
       - RestartEmulator
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 
 # ==================== Farm ====================
 
@@ -97,7 +90,6 @@ Event:
       - Emotion
       - HpControl
       - EnemyPriority
-<<<<<<< HEAD
     Event3:
       - Scheduler
       - Campaign
@@ -107,8 +99,6 @@ Event:
       - Emotion
       - HpControl
       - EnemyPriority
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     Raid:
       - Scheduler
       - Raid
@@ -319,10 +309,7 @@ Opsi:
       - Scheduler
       - OpsiStronghold
       - OpsiFleetFilter
-<<<<<<< HEAD
       - OpsiFleet
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     OpsiMonthBoss:
       - Scheduler
       - OpsiMonthBoss
@@ -354,8 +341,5 @@ Tool:
       - AzurLaneUncensored
     GameManager:
       - GameManager
-<<<<<<< HEAD
       - GGHandler
       - PowerLimit
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0