LA_DI_DA dc51c4c56d Merge branch 'refs/heads/0O0o0oOoO00/master' into dev ...

# Conflicts:
#	config/template.json
#	module/campaign/run.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/dashboard.yaml
#	module/config/argument/gui.yaml
#	module/config/argument/menu.json
#	module/config/argument/override.yaml
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/config/config_manual.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/research_farming/farming.py

2024-08-17 22:33:23 +08:00

..

assets.py

Revert "Add: scroll dock to load all ship's data for changing attribute"

2023-10-19 13:42:22 +08:00

change_attribute.py

Add: timeout setting of changing ship's type and attribute

2023-10-19 16:20:30 +08:00

change_ship.py

Fix: Cvl to bc/bb with common bb problem about Nevada

2024-07-20 15:31:37 +08:00

gg_adb.py

Fix: serial issue in gg

2023-03-01 17:43:58 +08:00

gg_data.py

Adj: Only enable ShipChanger in GemsFarming

2024-07-21 04:18:53 +08:00

gg_handler.py

Merge branch 'refs/heads/0O0o0oOoO00/master' into dev

2024-08-17 22:33:23 +08:00

gg_screenshot.py

Del: Remove support of screenshot. Forced restart before a task if GG is needed.

2023-03-28 17:07:48 +08:00

gg_u2.py

Fix: Multiple GG restarts. Polish codes

2024-07-21 14:09:21 +08:00