c1_lua

History

xiekaidong 42ad5ec9fa Merge branch 'dev_20230809' into dev_20230815

# Conflicts:
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skill.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skill.lua

2023-08-08 15:58:56 +08:00

Merge branch 'dev_20230809' into dev_20230815

2023-08-08 15:58:56 +08:00

Merge branch 'dev_20230809' into dev_20230815

2023-08-08 15:58:56 +08:00

Merge branch 'dev_20230809' into dev_20230815

2023-08-08 15:58:56 +08:00

Merge branch 'dev_20230809' into dev_20230815

2023-08-08 15:58:56 +08:00

Merge branch 'dev_20230809' into dev_20230815

2023-08-08 15:58:56 +08:00

Merge branch 'dev_20230809' into dev_20230815