Skip to content

Commit

Permalink
🔀 Merge branch 'release/1.1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
Pustur committed Sep 26, 2022
2 parents 7024400 + 3a969df commit 89be83f
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 3 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.1.4] - 2022-09-27

### Added

- New character: Cyno
- New character: Candace

## [1.1.3] - 2022-09-08

### Added
Expand Down Expand Up @@ -48,6 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Initial release

[1.1.4]: https://github.com/Pustur/genshin-impact-team-randomizer/compare/1.1.3...1.1.4
[1.1.3]: https://github.com/Pustur/genshin-impact-team-randomizer/compare/1.1.2...1.1.3
[1.1.2]: https://github.com/Pustur/genshin-impact-team-randomizer/compare/1.1.1...1.1.2
[1.1.1]: https://github.com/Pustur/genshin-impact-team-randomizer/compare/1.1.0...1.1.1
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "genshin-impact-team-randomizer",
"version": "1.1.3",
"version": "1.1.4",
"description": "A web app to randomize your Genshin Impact team based on the characters that you own",
"files": [
"dist"
Expand Down
3 changes: 3 additions & 0 deletions public/img/characters/candace.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/characters/cyno.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions src/data/characters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@ export const characters: GenshinCharacter[] = [
selected: false,
collab: false,
},
{
id: 55,
fullName: 'Candace',
shortName: 'Candace',
stars: 4,
elements: ['hydro'],
selected: false,
collab: false,
},
{
id: 8,
fullName: 'Chongyun',
Expand All @@ -82,6 +91,15 @@ export const characters: GenshinCharacter[] = [
selected: false,
collab: false,
},
{
id: 56,
fullName: 'Cyno',
shortName: 'Cyno',
stars: 5,
elements: ['electro'],
selected: false,
collab: false,
},
{
id: 9,
fullName: 'Diluc',
Expand Down

0 comments on commit 89be83f

Please sign in to comment.