Commit Graph

Select branches

Hide Pull Requests

15-1

dev

event_update

island

island_project

logger_unlock_use

master

war_archives_update

Mono Color

• 383b8893c2 Merge branch 'master' into dev LmeSzinc 2022-11-02 00:22:03 +08:00
• 67b9d294f9 Merge pull request #1807 from LmeSzinc/bug_fix LmeSzinc 2022-11-02 00:19:15 +08:00
• a2081bed34 Revert "Opt: Reduce json writes when recording emotion" LmeSzinc 2022-11-01 23:59:13 +08:00
• 676a767a8b Merge pull request #1806 from SaiCateDoan/maa_fix LmeSzinc 2022-11-01 23:46:35 +08:00
• 1711b841fd Fix: Config save to wrong file when switch config SarContDeli 2022-11-01 20:24:32 +08:00
• 2586c6d1c8 Merge pull request #1801 from SaiCateDoan/res LmeSzinc 2022-11-01 18:10:00 +08:00
• 894beb54c0 Fix: Handle click failed in research start SarContDeli 2022-11-01 09:51:32 +08:00
• f31c6bf7e8 Merge pull request #1797 from Horizon101011/dockScanner LmeSzinc 2022-10-31 21:47:05 +08:00
• 7599275b51 Opt: Handle Stronghold at day before reset SarContDeli 2022-10-31 20:25:08 +08:00
• 6f61f1e828 Upd: [EN] asset update for ship scan (#1776) nEEtdo0d 2022-10-30 11:58:58 -04:00
• 2cb1fe25ea Opt: Add re-judge for number 1 and 3 Horizon101011 2022-10-30 19:33:25 +08:00
• ae6db3f946 Merge pull request #1798 from LmeSzinc/bug_fix LmeSzinc 2022-10-30 15:03:05 +08:00
• 61e62edb08 Opt: Reduce json writes when recording emotion LmeSzinc 2022-10-30 04:15:56 +08:00
• 158a617e7d Opt: Remove redundant config read before raid battle LmeSzinc 2022-10-30 04:04:10 +08:00
• 5c70364353 Refactor: Abstract CampaignStatus class and fix task balancer in Raid LmeSzinc 2022-10-30 03:56:58 +08:00
• a70b676c4e Revert "Upd: [EN] asset update for ship scan" Horizon101011 2022-10-30 11:50:57 +08:00
• a4aec83d29 Upd: [EN] asset update for ship scan Horizon101011 2022-10-30 11:49:19 +08:00
• b4a5c4c1cc Opt: More accurate fleet scan Horizon101011 2022-10-30 11:48:08 +08:00
• 3182175ec2 Fix: command "nc" not found on Android 9 emulators LmeSzinc 2022-10-30 02:11:52 +08:00
• 337df07e69 Upd: [EN] support coolant (pre-maintenance), mail filter help text; resource already in assets/stat_basics nEEtdo0d 2022-10-28 11:23:08 -04:00
• 167d2d4b92 Add: [EN] TEMPLATE_SWIRLING_CHERRY_BLOSSOMS (#1780) Upd: [EN] EQUIP_[1-3]; position changed with addition of augment slot nEEtdo0d 2022-10-28 10:45:30 -04:00
• fe847abcf0 Merge pull request #1791 from LmeSzinc/bug_fix LmeSzinc 2022-10-28 20:12:49 +08:00
• b81b6d809c Upd: [EN] ALBION_RAID_HARD LmeSzinc 2022-10-28 20:00:54 +08:00
• 17025aef4a Merge pull request #1787 from LmeSzinc/bug_fix LmeSzinc 2022-10-28 03:21:45 +08:00
• 2edde3b50e Upd: [EN] RAID_CHECK LmeSzinc 2022-10-28 03:19:16 +08:00
• e847f76256 Merge branch 'master' into dev LmeSzinc 2022-10-28 03:09:41 +08:00
• e7ca8ece0f Merge pull request #1786 from LmeSzinc/bug_fix LmeSzinc 2022-10-28 03:03:03 +08:00
• 4c68985acf Upd: [JP] ALBION raid assets LmeSzinc 2022-10-28 03:00:31 +08:00
• ff99d80b5a Upd: [EN] ALBION raid assets LmeSzinc 2022-10-28 02:54:09 +08:00
• b4103f2652 Merge pull request #1784 from YJGeng-Iriy/raid_20221027 LmeSzinc 2022-10-28 02:36:44 +08:00
• 8352a85088 update en&jp raid_20221027 config YJGeng-Iriy 2022-10-28 02:33:46 +08:00
• fbbdb327ac bug fix raid_20221027 YJGeng-Iriy 2022-10-28 01:57:19 +08:00
• 911c5cb4d1 raid_20221027_2 YJGeng-Iriy 2022-10-28 01:26:19 +08:00
• 2551107e10 raid_20221027 YJGeng-Iriy 2022-10-28 00:44:47 +08:00
• aae94a519c Fix: [TW] D projects may be recognised as B (#1723) LmeSzinc 2022-10-27 22:25:57 +08:00
• 27fabf7b9f Add: [EN] asset support for ship scan (#1776) nEEtdo0d 2022-10-27 01:13:39 -04:00
• 2298cc34d0 Fix: Failed to enter mail if all mails received LmeSzinc 2022-10-25 23:46:27 +08:00
• 8238cd3265 Merge pull request #1777 from bookbug666/mail_reward_jp LmeSzinc 2022-10-25 22:18:43 +08:00
• 33328c3734 update assets.py bookbug666 2022-10-25 21:30:30 +08:00
• 7630b492e9 Merge branch 'master' into dev LmeSzinc 2022-10-25 20:31:20 +08:00
• f02a4bca37 Merge pull request #1609 from Horizon101011/dockScanner LmeSzinc 2022-10-25 19:51:53 +08:00
• 34e21beb1f Merge branch 'dev' into dockScanner Horizon101011 2022-10-25 18:42:25 +08:00
• 0c5c0f6dbc Opt: Disable some properties for unsupported servers Horizon101011 2022-10-25 18:39:54 +08:00
• 9248d239bd add jp support Bookbug 2022-10-25 17:56:44 +08:00
• 787d5ab571 Merge pull request #1775 from xzjjasper/master LmeSzinc 2022-10-25 14:40:19 +08:00
• c495f4dd64 Upd: [TW] EQUIPMENT_OPEN and EQUIPMENT_CLOSE xzjjasper 2022-10-25 12:42:12 +08:00
• 308f3545eb Opt: Disable flagship retire for unsupported servers Horizon101011 2022-10-24 23:43:43 +08:00
• f32d275fec Upd: Limit mail collect in CN and EN LmeSzinc 2022-10-24 02:18:56 +08:00
• a25d43726b Fix: Enlarge detection area in _mail_selected() LmeSzinc 2022-10-24 02:15:05 +08:00
• 81bbfcb12c Merge pull request #1768 from LmeSzinc/bug_fix LmeSzinc 2022-10-24 01:23:22 +08:00
• f49e4c291f Fix: Handle unexpected META ui switching LmeSzinc 2022-10-23 23:48:59 +08:00
• df7a13a39b Upd: [TW] RESEARCH_UNAVAILABLE (#1761) LmeSzinc 2022-10-23 22:58:44 +08:00
• af0b11db40 Upd: [TW] SUBMARINE_MOVE_CANCEL and SUBMARINE_MOVE_CONFIRM (#1734) LmeSzinc 2022-10-23 22:47:19 +08:00
• 61d738e350 Merge pull request #1767 from SaiCateDoan/maa LmeSzinc 2022-10-23 22:16:32 +08:00
• 05e9947a29 Add: roguelike mizuki support for Maa SarContDeli 2022-10-23 22:08:20 +08:00
• c8ca2456e2 Opt: Add spare Maa interface SarContDeli 2022-10-23 21:56:45 +08:00
• 53eb19b5cb Upd: [CN] Mail assets and i18n LmeSzinc 2022-10-23 18:15:02 +08:00
• 8de2314743 Merge pull request #1719 from nEEtdo0d/mail_reward LmeSzinc 2022-10-23 17:03:45 +08:00
• bb61f2f9b6 Merge branch 'dev' into mail_reward LmeSzinc 2022-10-23 17:03:32 +08:00
• 2960bf068f Merge branch 'master' into dev LmeSzinc 2022-10-23 16:56:53 +08:00
• 814cd0c2c7 Merge pull request #1766 from LmeSzinc/bug_fix LmeSzinc 2022-10-23 14:09:02 +08:00
• 50b2a64c9e Revert "Fix: [TW] Rollback to old daily module (#1293)" (#1760) LmeSzinc 2022-10-23 02:17:31 +08:00
• 3bd6ade8bb Fix: AzurStats updates LmeSzinc 2022-10-22 00:39:15 +08:00
• 796affa7f7 Merge pull request #1762 from SaiCateDoan/maa LmeSzinc 2022-10-22 23:22:32 +08:00
• b5c09e9df9 Fix: Handle stop_event in Maa SarContDeli 2022-10-22 11:26:41 +08:00
• d698eae55e Merge pull request #1758 from appleapple802/master LmeSzinc 2022-10-21 21:51:28 +08:00
• 4dd590c98d Add: [TW] Empyreal Tragicomedy appleapple802 2022-10-21 21:45:46 +08:00
• c690dfd250 Merge pull request #1757 from LmeSzinc/bug_fix LmeSzinc 2022-10-21 17:51:50 +08:00
• 779c3fb78e Merge remote-tracking branch 'origin/bug_fix' into bug_fix LmeSzinc 2022-10-21 17:41:02 +08:00
• ab6df7e900 Doc: Remove image reference from README LmeSzinc 2022-10-21 17:19:49 +08:00
• d40cfd5470 Fix: New gitee mirror address LmeSzinc 2022-10-21 17:27:09 +08:00
• 79b6293d16 Upd: config redirection old to new freebies counterpart nEEtdo0d 2022-10-21 00:07:08 -04:00
• 084a5d155d Merge pull request #1752 from LmeSzinc/bug_fix LmeSzinc 2022-10-21 10:47:45 +08:00
• e692883106 Merge pull request #1749 from SaiCateDoan/remove LmeSzinc 2022-10-20 18:22:02 +08:00
• 3e37328161 Fix: FileNotFoundError when removing git config SarContDeli 2022-10-20 12:46:21 +08:00
• 840eb4dc7f Mov: re-factor relevant modules and assets into freebies nEEtdo0d 2022-10-18 01:23:30 -04:00
• d0c5cff687 Merge pull request #1747 from LmeSzinc/bug_fix LmeSzinc 2022-10-19 01:27:39 +08:00
• f13bd1e42a Merge pull request #1746 from VirtualTowel/master LmeSzinc 2022-10-19 00:55:14 +08:00
• b93ee5eaa1 Fix: Can not withdraw on BattlePreparation page VirtualTowel 2022-10-19 00:46:04 +08:00
• d74974c22d Fix: META finished just after calling assist LmeSzinc 2022-10-18 01:18:07 +08:00
• 28de1c51e2 Merge pull request #1742 from LmeSzinc/bug_fix LmeSzinc 2022-10-18 01:16:49 +08:00
• 8aaa42f37a Merge pull request #1740 from SaiCateDoan/decode LmeSzinc 2022-10-18 00:23:40 +08:00
• dbb614e6ae Fix: Ignoring limitation don't work Horizon101011 2022-10-18 00:23:16 +08:00
• c0f125bada Opt: Improve flagships_retire Horizon101011 2022-10-18 00:08:42 +08:00
• 7029375ca3 Fix: UnicodeDecodeError when getting serial SarContDeli 2022-10-17 22:09:58 +08:00
• c9530e7a5a Merge pull request #1739 from VirtualTowel/master LmeSzinc 2022-10-17 21:59:34 +08:00
• 87dbdd6f40 Merge pull request #1738 from bookbug666/idol_entrance_jp LmeSzinc 2022-10-17 21:58:59 +08:00
• 328b18660b Fix: check VanguardChange switch in GemsFarming VirtualTowel 2022-10-17 21:05:17 +08:00
• 96adc8c4c7 Upd: move meta_reward execution as subtask under OpsiAshBeacon and AshBeaconAssist nEEtdo0d 2022-10-16 21:44:37 -04:00
• d14f0018fa Add: freebies module / task encompasses running BattlePass, DataKey, Mail, and SupplyPack together Upd: BattlePass, DataKey, and SupplyPack modified to run as sub-tasks under Freebies nEEtdo0d 2022-10-16 02:11:21 -04:00
• 0bcaa73eaf Smaller templates to prevent weird stuck Bookbug 2022-10-17 01:04:21 +08:00
• aaf1a0b6e3 Update Templates Bookbug 2022-10-17 00:46:52 +08:00
• 9f85b54f52 Merge pull request #1731 from LmeSzinc/bug_fix LmeSzinc 2022-10-16 15:14:35 +08:00
• 50e831fa3a Mov: reward mail support to separate module Del: MAIL_CLICK_SAFE_AREA, MAIL_COLLECT sufficient as substitute nEEtdo0d 2022-10-16 01:01:15 -04:00
• 007fd8c5a4 Upd: button_extract LmeSzinc 2022-10-16 00:00:49 +08:00
• a37055832c Merge branch 'master' into bug_fix LmeSzinc 2022-10-15 23:59:21 +08:00
• 7c2238ba1f Upd: [EN] USE_DATA_KEY LmeSzinc 2022-10-15 23:54:52 +08:00
• 95738436b7 Fix: Handle GET_ITEMS when switching from guild lobby to logistics LmeSzinc 2022-10-15 23:48:44 +08:00
• 3c1d013a69 Merge pull request #1729 from karegyudon/war_archive_CRESCENDO_OF_POLARIS LmeSzinc 2022-10-15 19:21:37 +08:00
• 72b0a4adc5 fix: sp5 map fix sevenstar 2022-10-15 12:57:40 +08:00