Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Port] Melee Block / Блок В Ближнем Бою #10

Merged
merged 8 commits into from
Aug 31, 2024
Merged

Conversation

Spatison
Copy link
Member

@Spatison Spatison commented Aug 22, 2024

Описание PR

Порт блокирование атак в ближнем бою.


Изменения

🆑 Spatison

  • add: Added melee block / Добавлен блок в ближнем бою

Copy link
Collaborator

@Remuchi Remuchi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

К этому же сверху - энергощит не блокирует

Resources/Locale/en-US/_white/alerts/alerts.yml Outdated Show resolved Hide resolved
Resources/Locale/en-US/_white/alerts/alerts.yml Outdated Show resolved Hide resolved
Resources/Locale/en-US/_white/alerts/alerts.yml Outdated Show resolved Hide resolved
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Remuchi Remuchi merged commit e5b1e86 into master Aug 31, 2024
11 checks passed
@Remuchi Remuchi deleted the melee-block branch August 31, 2024 18:58
riddleridou added a commit that referenced this pull request Aug 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants