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

Update patch 2020-01 #408

Merged
merged 3 commits into from
Mar 14, 2020
Merged

Conversation

kei-gbf
Copy link
Collaborator

@kei-gbf kei-gbf commented Mar 6, 2020

#407

  • add new weapons
    • Plasma Ripper
    • Takeminakata
    • True Tiger's Bane
  • add new characters
    • Ilsa (Light)
    • Yodarha (Wind)

This PR will NOT include chara uncap

  • uncap chara makira
  • uncap chara Zeta

- add new weapons
  - Plasma Ripper
  - Takeminakata
  - True Tiger's Bane
- add new characters
  - Ilsa (Light)
  - Yodarha (Wind)
# Conflicts:
#	charaData.json
#	scripts/arm_data_converter.py
#	txt_source/arm-translation.json
#	txt_source/chara-translation.json
#	txt_source/charaData.txt
#	txt_source/charaImageGameURLList.txt
#	txt_source/charaImageWikiURLList.txt
@Groovman
Copy link
Collaborator

Added the uncaps and the Zeta support skill.

Copy link
Collaborator

@Groovman Groovman left a comment

Choose a reason for hiding this comment

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

Looks good 👍

@Groovman Groovman merged commit 9f1db51 into MotocalDevelopers:master Mar 14, 2020
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