0O0o0oOoO00
8c6cb6de90
Revert "Add: hide_in_upper_left option for combat manual"
...
This commit was manually merged into this repository earlier, and later guoh064 merged this commit into LmeSzinc’s repository.
This reverts commit 13aba919a2
2026-03-13 10:44:35 +08:00
0O0o0oOoO00
ea306079e4
Revert "Upd: asset COMBAT_AUTO"
...
This commit was manually merged into this repository earlier, and later guoh064 merged this commit into LmeSzinc’s repository.
This reverts commit 947f66c915
2026-03-13 10:38:09 +08:00
xhqss
1af31e1d91
Merge branch 'master_LME' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/config/i18n/zh-TW.json
2026-03-12 22:15:51 +08:00
guoh064
3f9e7edf4e
Add: hide_in_upper_left option for combat manual
2026-03-12 18:46:50 +08:00
guoh064
5611dce94b
Upd: asset COMBAT_AUTO
2026-03-12 18:46:50 +08:00
heipen
dbc5fe42e8
Upd: Battle UI SpringInn ( #5541 )
2026-03-04 12:32:12 +08:00
0O0o0oOoO00
d797b30488
Revert "fix: Temporary New year Academy check"
...
This reverts commit e784b293f9
2026-02-26 16:52:05 +08:00
guoh064
947f66c915
Upd: asset COMBAT_AUTO
2026-02-19 23:55:40 +08:00
guoh064
13aba919a2
Add: hide_in_upper_left option for combat manual
2026-02-19 23:29:58 +08:00
guoh064
9b98060c4d
Add: Raid Scuttle function
2026-02-19 23:10:38 +08:00
0O0o0oOoO00
f5172b27f1
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/config/argument/args.json
2026-02-14 13:50:42 +08:00
0O0o0oOoO00
e784b293f9
fix: Temporary New year Academy check
2026-02-12 18:57:07 +08:00
sui-feng-cb
7e6b87bee8
Add: [CN] Spring Auction Adventure (raid_20260212)
2026-02-12 16:44:24 +08:00
LmeSzinc
7d9e77e4fd
Upd: Battle UI Ancient
2026-02-09 23:31:47 +08:00
ArecaSapling
5a32d9444c
Merge pull request #5500 from sui-feng-cb/event_update
...
Fix: raid_20240328 ex
2026-02-09 23:23:20 +08:00
0O0o0oOoO00
c76017a4dc
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/config/argument/args.json
2026-02-06 21:57:03 +08:00
sui-feng-cb
7e1a2322a6
Fix: use _raid_has_oil_icon for new UI design
2026-02-05 21:44:55 +08:00
guoh064
eb33bdd747
Fix: slow retrial for MISSION_OVERVIEW_ACCEPT(_SINGLE) ( #5487 )
2026-02-04 18:26:41 +08:00
ArecaSapling
52444569a4
Add: war_archives_20230223_cn ( #5479 )
2026-01-30 10:56:16 +08:00
0O0o0oOoO00
8d17eeb803
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/coalition/coalition.py
# module/config/argument/args.json
2026-01-23 10:21:18 +08:00
LmeSzinc
b65a951ce4
Add: FASHION Coalition assets
2026-01-23 02:40:22 +08:00
LmeSzinc
c37a52bf9c
Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM
2026-01-23 02:09:08 +08:00
0O0o0oOoO00
c1e325820a
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/config/argument/args.json
2026-01-16 22:55:47 +08:00
Compeador
ad651eca4c
feat: pq add aegir ( #5423 )
2026-01-16 17:08:24 +08:00
0O0o0oOoO00
15f4898f3c
Merge remote-tracking branch 'LmeSzinc/master' into refactor
...
# Conflicts:
# module/config/argument/args.json
2026-01-08 12:34:24 +08:00
LmeSzinc
99de5e0d34
Upd: Battle UI MaidCafe
2026-01-01 23:36:25 +08:00
sui-feng-cb
14c70afe65
Add: war_archives_20221222_cn
2025-12-29 19:04:08 +08:00
0O0o0oOoO00
5d2c46973c
Merge remote-tracking branch 'LmeSzinc/master' into refactor
...
# Conflicts:
# module/config/argument/args.json
2025-12-21 18:46:41 +08:00
LmeSzinc
3fb7c54908
Add: Chapter B
2025-12-20 19:10:39 +08:00
LmeSzinc
63a2d7388f
Upd: crop fleet clear assets to avoid collision with info_bar
2025-12-19 03:54:21 +08:00
LmeSzinc
c9478cb542
Add: chapter A
2025-12-19 02:50:13 +08:00
LmeSzinc
c36586f8c5
Upd: TEMPLATE_COMBAT_LOADING
2025-12-19 02:48:11 +08:00
guoh064
f3509c0de4
Upd: [CN, EN, JP] TEMPLATE_COMBAT_LOADING ( #5393 )
2025-12-19 00:19:52 +08:00
MikuSoft
1297908d89
Add:[CN] assets combat ui ShadowPuppetry ( #5377 )
2025-12-09 12:24:33 +08:00
0O0o0oOoO00
bc8666976f
Merge remote-tracking branch 'LmeSzinc/master' into refactor
...
# Conflicts:
# module/config/argument/args.json
2025-11-26 17:09:45 +08:00
guoh064
be012c843d
Upd: [CN] assets for coalition_20251120
2025-11-23 22:54:11 +08:00
guoh064
ba594e769a
Tmp: event pt ocr for coalition_20251120
2025-11-23 02:11:05 +08:00
guoh064
a07c99fe85
Add: [JP] coalition_20251120
2025-11-23 01:42:38 +08:00
0O0o0oOoO00
a99746fba1
Merge remote-tracking branch 'LmeSzinc/master' into refactor
...
# Conflicts:
# module/config/argument/args.json
2025-11-08 16:44:56 +08:00
sui-feng-cb
b14ab02c97
Upd: [CN] USE_DATA_KEY_NOTIFIED asset
2025-11-06 17:11:57 +08:00
sui-feng-cb
d90390202b
Add: war_archives_20220915_cn
2025-11-06 17:11:47 +08:00
nEEtdo0d
a64f1e9157
Add: PrivateQuarters Taihou option
2025-10-31 16:28:27 -04:00
guoh064
753e676152
Add: event shop
2025-10-29 16:17:37 +08:00
0O0o0oOoO00
c6de0daf66
Merge remote-tracking branch 'LmeSzinc/master' into refactor
...
# Conflicts:
# module/config/argument/args.json
2025-10-24 17:13:48 +08:00
LmeSzinc
b56ab2d555
Fix: Add W15 spesific FLEET_2_IN_USE that does not intersect with info_bar
2025-10-24 01:11:52 +08:00
LmeSzinc
ebe5ca794b
Fix: [TW] FLEET_2_IN_USE should not intersect with info_bar
2025-10-24 00:48:42 +08:00
0O0o0oOoO00
44efc22bf4
fix: patch GUILD_DISPATCH_FLEET_UNFILLED.png
2025-10-18 16:50:14 +08:00
dragonheart107
f9c25961bb
Fix: EN commission + mission reward ( #5230 )
...
* Revert "Tmp: [EN] Temp fix for bugged UI"
This reverts commit c06773e586
2025-10-18 02:25:24 +08:00
LmeSzinc
f31da700a0
Del: Remove old mail module
2025-10-17 04:37:45 +08:00
LmeSzinc
c06773e586
Tmp: [EN] Temp fix for bugged UI
2025-10-17 04:13:16 +08:00
