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

Fract war ebent update v0.7 #2034

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from

Conversation

Kirus59
Copy link
Collaborator

@Kirus59 Kirus59 commented Oct 8, 2024

Описание PR

Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я ознакомился с наставлениями по работе с репозиторием и следовал им при создании PR'а.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

no cl.

@github-actions github-actions bot added the Changes: Localization Изменение затронуло файлы ".ftl" label Oct 8, 2024
@github-actions github-actions bot added Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Changes: C# Изменение затронуло файлы ".cs" labels Dec 24, 2024
@github-actions github-actions bot added the Merge Conflict Some content has conflicts. label Dec 27, 2024
Copy link

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

@github-actions github-actions bot removed the Merge Conflict Some content has conflicts. label Jan 3, 2025
@github-actions github-actions bot added the Changes: Sprites Изменение затронуло файлы ".rsu / .png" label Jan 3, 2025
Copy link

github-actions bot commented Jan 3, 2025

RSI Diff Bot; head commit 00c7eda merging into c6bba03
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/SS220/Structures/Barricades/fract_war_barricade.rsi

State Old New Status
base Added
damaged Added
icon Added
inhand-left Added
inhand-right Added
stand_up Added

Resources/Textures/SS220/Structures/Barricades/fract_war_barricade_ussp.rsi

State Old New Status
base Added
damaged Added
icon Added
inhand-left Added
inhand-right Added
stand_up Added

@github-actions github-actions bot added the Merge Conflict Some content has conflicts. label Jan 4, 2025
Copy link

github-actions bot commented Jan 4, 2025

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Изменение затронуло файлы ".cs" Changes: Localization Изменение затронуло файлы ".ftl" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Merge Conflict Some content has conflicts.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant