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

[pull] v1.0.x from Mezuzi:v1.0.x #1

Open
wants to merge 9 commits into
base: v1.0.x
Choose a base branch
from
Open

Conversation

pull[bot]
Copy link

@pull pull bot commented Oct 24, 2021

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

Mezuzi and others added 9 commits June 16, 2021 09:10
* Update cards.ini

* Update cards.ini

"argus" was pulling "Argus Crackdown" rather than the ID

* Update cards.ini

added "BTL" in addition to "B2L"
Bumps [websockets](https://github.com/aaugustin/websockets) from 8.1 to 9.1.
- [Release notes](https://github.com/aaugustin/websockets/releases)
- [Changelog](https://github.com/aaugustin/websockets/blob/9.1/docs/changelog.rst)
- [Commits](python-websockets/websockets@8.1...9.1)

---
updated-dependencies:
- dependency-name: websockets
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.10 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.25.10...1.26.5)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…41)

* Escapes markdown characters in clean_card_text to fix how Maxx's flavor text displays

Previously discord tried to interpret the asterixis in Maxx's flavor text as markdown. This fixes that. I'm not sure if there's any other cards that escaping markdown characters matters for.

The lines of text in clean_card_text to fix lists were also indented an extra time, causing them to run every time in the above for loop.
* Update cards.ini

added the best doggo

* Update cards.ini

added SVA = salvaged vanadis armory.

* Update cards.ini

added midseasons

* Update cards.ini

added sft = shipment from tennin
@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Oct 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants