From 4104b622a29806fc2f3e5bc30c04ffb6f7e99841 Mon Sep 17 00:00:00 2001 From: miraai Date: Sun, 16 Oct 2016 23:30:58 +0200 Subject: [PATCH 1/5] Added releases link --- docs/index.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/index.md b/docs/index.md index aa8c9251..c25a802a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,6 +8,8 @@ In case you need any help, hop on the [NadekoBot Server][NadekoBot Server], wher NadekoBot is an open source project, and it can be found on our [GitHub][GitHub] page. +Check the latest [Release][Release] + Here you can read current [Issues][Issues]. If you want to contribute, be sure to PR on the **[1.0][1.0]** branch. @@ -34,6 +36,7 @@ If you want to contribute, be sure to PR on the **[1.0][1.0]** branch. [GitHub]: https://github.com/Kwoth/NadekoBot [Issues]: https://github.com/Kwoth/NadekoBot/issues [1.0]: https://github.com/Kwoth/NadekoBot/tree/1.0 +[Release]: https://github.com/Kwoth/NadekoBot/releases [Italian]: http://i.imgur.com/SsaTwOF.png?1 [Russian]: http://i.imgur.com/wf9bc5G.png?1 From 47c8cf817663867456d9ddc866be7daf8f8fba68 Mon Sep 17 00:00:00 2001 From: miraai Date: Sun, 16 Oct 2016 23:40:55 +0200 Subject: [PATCH 2/5] Typos --- docs/Permissions System.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Permissions System.md b/docs/Permissions System.md index 3494c09f..11c32daf 100644 --- a/docs/Permissions System.md +++ b/docs/Permissions System.md @@ -7,9 +7,9 @@ permission commands correctly and even cover a few common questions! Every comma Why do we use the Permissions Commands? ------------------------------ -Permissions are very handy at setting who can use what commands in a server. By default, the NSFW module is blocked, but nothing else is. If something is a bot owner only command, it can only be ran by the bot owner, the person who is running the bot, or has their id in [`credentials.json`](http://nadekobot.readthedocs.io/en/1.0/JSON%20Explanations/ "Setting up your credentials"). +Permissions are very handy at setting who can use what commands in a server. By default, the NSFW module is blocked, but nothing else is. If something is a bot owner only command, it can only be ran by the bot owner, the person who is running the bot, or has their ID in [`credentials.json`](http://nadekobot.readthedocs.io/en/1.0/JSON%20Explanations/ "Setting up your credentials"). -The administration module still requires that you have the correct permissions on discord to be able to use these commands, so for users to be able to use commands like `.kick` and `.prune`, they need kick and mange messages permissions respectively. +The Administration module still requires that you have the correct permissions on Discord to be able to use these commands, so for users to be able to use commands like `.kick` and `.prune`, they need kick and mange messages permissions respectively. With the permissions system it possible to restrict who can skip the current song, pick NadekoFlowers or use the NSFW module. @@ -19,9 +19,9 @@ To change permissions you **must** meet the following requirement: **Have the role specified by `;permrole` (By default, this is Nadeko)** -If you have an existing role called "Nadeko" but can't assign it to yourself, create a new role called "Nadeko" and assign that to yourself. +If you have an existing role called `Nadeko` but can't assign it to yourself, create a new role called `Nadeko` and assign that to yourself. -If you would like to set a different role, such as "Admins", to be the role required to edit permissions, do `;permrole Admins` (you must have the current permission role to be able to do this). +If you would like to set a different role, such as `Admins`, to be the role required to edit permissions, do `;permrole Admins` (you must have the current permission role to be able to do this). Basics & Hierarchy ----- From d237b6c01aba407dc869e1ba6323b6e9671c6547 Mon Sep 17 00:00:00 2001 From: miraai Date: Sun, 16 Oct 2016 23:44:48 +0200 Subject: [PATCH 3/5] Removed images, since its different now --- docs/JSON Explanations.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/JSON Explanations.md b/docs/JSON Explanations.md index 304e9e0e..03e3fc84 100644 --- a/docs/JSON Explanations.md +++ b/docs/JSON Explanations.md @@ -37,9 +37,8 @@ Setting up your API keys + You can get this api Key [here](https://console.developers.google.com/apis) + **SoundCloudClientID** - Required to queue soundloud songs from sc links. + You will need to create a new app [here](http://soundcloud.com/you/apps). **Please note you must be logged into SoundCloud** - + You should come to a page that looks like this ![Imgur](http://i.imgur.com/RAZ2HDM.png) + Simply click Register a new application and enter a name. - + After naming your app you will be brought to this page: ![Imgur](http://i.imgur.com/GH1gjKK.png) Copy the Client ID and click "save app" then paste the Client Id it into your `credentials.json` + + Copy the Client ID and click "save app" then paste the Client Id it into your `credentials.json` + **MashapeKey** - Required for Urban Disctionary, Hashtag search, and Hearthstone cards. + You need to create an account on their [api marketplace](https://market.mashape.com/), after that go to `market.mashape.com/YOURNAMEHERE/applications/default-application` and press **Get the keys** in the top right corner. + Copy the key and paste it into `credentials.json` From e3cbdff4b058de56f91c6afaf5b9bb7a0a4226a4 Mon Sep 17 00:00:00 2001 From: miraai Date: Sun, 16 Oct 2016 23:48:03 +0200 Subject: [PATCH 4/5] typo --- docs/Custom Reactions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Custom Reactions.md b/docs/Custom Reactions.md index 1f2d4600..e5e9cc34 100644 --- a/docs/Custom Reactions.md +++ b/docs/Custom Reactions.md @@ -2,7 +2,7 @@ ###Important * For modifying **global** custom reactions, the ones which will work across all the servers your bot is connected to, you **must** be a Bot Owner. You must also use the commands for adding, deleting and listing these reactions in a direct message with the bot. -* For modifying **local** custom reactions, the ones which will only work on the server that they are added on, require you to have the **Administrator** permission. +* For modifying **local** custom reactions, the ones which will only work on the server that they are added on, it is required to have the **Administrator** permission. You must also use the commands for adding, deleting and listing these reactions in the server you want the custom reactions to work on. ###Commands and Their Use From e0ea3c0bc0d04d112a6156df9493041067380b89 Mon Sep 17 00:00:00 2001 From: miraai Date: Mon, 17 Oct 2016 00:03:42 +0200 Subject: [PATCH 5/5] Grammar mistakes and typos --- src/NadekoBot/Resources/CommandStrings.resx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 426ab5f7..0962eb9a 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -589,7 +589,7 @@ ban b - Bans a user by id or name with an optional message. + Bans a user by ID or name with an optional message. `.b "@some Guy" Your behaviour is toxic.` @@ -598,7 +598,7 @@ softban sb - Bans and then unbans a user by id or name with an optional message. + Bans and then unbans a user by ID or name with an optional message. `.sb "@some Guy" Your behaviour is toxic.` @@ -697,7 +697,7 @@ setchanlname schn - Changed the name of the current channel. + Changes the name of the current channel. `.schn NewName` @@ -724,7 +724,7 @@ die - Works only for the owner. Shuts the bot down. + Works only for the bot owner. Shuts the bot down. `@NadekoBot die` @@ -733,7 +733,7 @@ setname newnm - Give the bot a new name. + Gives the bot a new name. `.newnm BotName` @@ -2646,4 +2646,4 @@ `.resetperms` - \ No newline at end of file +