5 commits

Author	SHA1	Message	Date
Morev_Nikita	2c78f29918	merge conf fix	2025-09-18 19:04:13 +02:00
LaptopmanMann	1f7bb1d74e	worked on china new year and fixed oktoberfest hopefully	2025-09-18 18:53:23 +02:00
Amanda Boegysanto	292ad56273	chinese	2025-09-18 16:54:44 +02:00
Amanda Boegysanto	a1cdb7daa4	update_chinese	2025-09-18 16:17:02 +02:00
Amanda Boegysanto	11669b9797	chinese_ny	2025-09-18 15:34:21 +02:00