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.

Sign up for GitHub

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

Jump to bottom

Именная катана для Rip_Zoro #511

Closed
wants to merge 9 commits into from
Closed

Именная катана для Rip_Zoro #511

wants to merge 9 commits into from
+115 −3

Conversation

RipZoro1
Copy link
Contributor

@RipZoro1 RipZoro1 commented Sep 22, 2024 •
edited
Loading

Описание PR

Почему / Баланс

Захотел катану именную

Техническая информация

Медиа

Требования

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

Критические изменения

Чейнджлог

@RipZoro1 RipZoro1 requested review from Bolper and Darkiich and removed request for Bolper September 22, 2024 09:39
@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Sep 22, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 22, 2024 •
edited
Loading

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

Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi

State Old New Status
equipped-BELT Added
sheath-sabre-equipped-BELT Added
sheath-sabre Added
sheath Added

Edit: diff updated after 869a07c

@RipZoro1
Copy link
Contributor Author

Проебался с описанием PRa

Darkiich
Darkiich approved these changes Sep 23, 2024
View reviewed changes
Copy link
Contributor

@Darkiich Darkiich left a comment

Choose a reason for hiding this comment

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

Так, ну вроде как всё ок

@Darkiich
Copy link
Contributor

Только конфликты решить и все

@RipZoro1 RipZoro1 enabled auto-merge September 23, 2024 05:16
@RipZoro1 RipZoro1 disabled auto-merge September 23, 2024 05:16
@Inconnu1337 Inconnu1337 added Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ and removed Status: Needs Review labels Sep 23, 2024
@Schrodinger71 Schrodinger71 deleted the katanazoro branch October 27, 2024 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Darkiich Darkiich Darkiich approved these changes

@Bolper Bolper Awaiting requested review from Bolper

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@RipZoro1 @Darkiich @Inconnu1337