4aa2e6f2a7
# Conflicts: # Assets/lua/app/config/buff.lua.bytes # Assets/lua/app/config/fx.lua.bytes # Assets/lua/app/config/skill.lua.bytes # Assets/lua/app/config/strings/cn/attr.lua.bytes # Assets/lua/app/config/strings/cn/task_type.lua.bytes # Assets/lua/app/config/strings/de/attr.lua.bytes # Assets/lua/app/config/strings/en/attr.lua.bytes # Assets/lua/app/config/strings/en/task_type.lua.bytes # Assets/lua/app/config/strings/es/attr.lua.bytes # Assets/lua/app/config/strings/es/task_type.lua.bytes # Assets/lua/app/config/strings/fr/attr.lua.bytes # Assets/lua/app/config/strings/id/attr.lua.bytes # Assets/lua/app/config/strings/id/task_type.lua.bytes # Assets/lua/app/config/strings/ja/attr.lua.bytes # Assets/lua/app/config/strings/ja/task_type.lua.bytes # Assets/lua/app/config/strings/ko/attr.lua.bytes # Assets/lua/app/config/strings/ko/task_type.lua.bytes # Assets/lua/app/config/strings/pt/attr.lua.bytes # Assets/lua/app/config/strings/pt/task_type.lua.bytes # Assets/lua/app/config/strings/ru/attr.lua.bytes # Assets/lua/app/config/strings/th/attr.lua.bytes # Assets/lua/app/config/strings/th/task_type.lua.bytes # Assets/lua/app/config/strings/vi/attr.lua.bytes # Assets/lua/app/config/strings/vi/task_type.lua.bytes # Assets/lua/app/config/strings/zh/attr.lua.bytes # Assets/lua/app/config/strings/zh/task_type.lua.bytes