Merge remote-tracking branch 'origin/masterpiece' into th_mmr
This commit is contained in:
commit
247fab8afb
657 changed files with 429579 additions and 31174 deletions
|
|
@ -1,6 +1,6 @@
|
|||
normal_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
|
||||
normal_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
|
||||
press_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
|
||||
press_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
|
||||
disable_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
|
||||
disable_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
|
||||
normal_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
|
||||
normal_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
|
||||
press_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
|
||||
press_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
|
||||
disable_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
|
||||
disable_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
|
||||
BIN
image/event/matcha_every_day/matcha_every_day.png
Normal file
BIN
image/event/matcha_every_day/matcha_every_day.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 338 KiB |
Loading…
Add table
Add a link
Reference in a new issue