Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Brainicism/KMQ_Discord into featu…
Browse files Browse the repository at this point in the history
…re/set-defaults
  • Loading branch information
Brainicism committed Dec 21, 2021
2 parents 624a0d5 + 26ac62d commit f0c18f9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/GAMEPLAY.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,6 @@ Use `,help [command_name]` for more details for any of the following commands:
- `,include`: Specify which artists to forcefully include, regardless of other game options

- `,reset`: Reset all options to the default settings
- `,setdefault`: Sets the current game options as the default settings
- `,default`: Sets the current game options as the default settings
- `,add`: Add groups to `,groups`, `,exclude`, or `,include`
- `,remove`: Remove groups to `,groups`, `,exclude`, or `,include`
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"dotenv": "^10.0.0",
"ejs": "^3.1.6",
"eris": "https://github.com/Brainicism/eris.git#d46b865",
"eris-fleet": "https://github.com/danclay/eris-fleet#bb21c86",
"eris-fleet": "^1.0.0",
"eris-pagination": "https://github.com/brainicism/eris-pagination#a30b37b",
"erlpack": "https://github.com/abalabahaha/erlpack.git",
"fastify": "^3.17.0",
Expand Down
7 changes: 4 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -866,9 +866,10 @@ enquirer@^2.3.5:
dependencies:
ansi-colors "^4.1.1"

"eris-fleet@https://github.com/danclay/eris-fleet#bb21c86":
version "0.3.9-dev"
resolved "https://github.com/danclay/eris-fleet#bb21c86e0875ccb56483f27a02aee0a20b3e71f0"
eris-fleet@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/eris-fleet/-/eris-fleet-1.0.0.tgz#05eef0655185b316a0d1ef3f11dfe8622806ef34"
integrity sha512-MkQ4+t+1f0yGVcCPzVOMppv193jUbnoeSS1DbH+13rN/OwND9PnfJbg+zfQBXpBQQjSdUOeKsRd+fa8LXEWWSQ==

"eris-pagination@https://github.com/brainicism/eris-pagination#a30b37b":
version "0.5.2"
Expand Down

0 comments on commit f0c18f9

Please sign in to comment.