fix: merge conflicts #30
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/daaku/nodejs-tmpl/releases) - [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5) --- updated-dependencies: - dependency-name: tmpl dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [nth-check](https://github.com/fb55/nth-check) from 2.0.0 to 2.0.1. - [Release notes](https://github.com/fb55/nth-check/releases) - [Commits](fb55/nth-check@v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: nth-check dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…s active class fixes #19
Remove support for parsing waist gear due to deprecation with the introduction of 6.0, remove tests. closes #20
* 'develop' of github.com:XIVStats/lodestone: chore(deps): bump nth-check from 2.0.0 to 2.0.1 chore(deps): bump tmpl from 1.0.4 to 1.0.5
Resolve issue where free company was being incorrectly parsed. Fixes #21
… associated to a character Implements #25
Add support for localizations Restructure significant chunks of code Add support for fetching non-english site versions
Migrate towards package/diretory structure structured by logical entity
github handles these
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Reid <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Unit and integration tests no run on separate commands #18
* 'main' of github.com:XIVStats/lodestone: chore(release): 0.1.8 (#17) fix(ci): enable automerge for dependabot prs fix(ci): disable jest report step for dependavot � Conflicts: � docs/api/classes/client_LodestoneClient.default.md
Codecov Report
@@ Coverage Diff @@
## main #30 +/- ##
==========================================
- Coverage 74.88% 71.53% -3.36%
==========================================
Files 11 15 +4
Lines 223 274 +51
Branches 37 53 +16
==========================================
+ Hits 167 196 +29
- Misses 56 78 +22
Continue to review full report at Codecov.
|
|
🎉 This PR is included in version 0.2.0 🎉 The release is available on:
Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By submitting this pull request, I confirm that my contribution is made under the terms of the MIT license