Commit Graph
49 Commits
Author SHA1 Message Date
Jordan FearnleyandGitHub ca1cf8fd94 I can now say I have PR'd into a PR
It appears Ubuntu 16.10 escaped my testing ¯\_(ツ)_/¯

The changes are pretty much just me being picky but hey ho
2016-11-11 12:13:58 +00:00
Jordan Fearnley 5c32062b2f Various changes ¯\_(ツ)_/¯
Summary of Changes:
- Betroll won't give you the greater than 90 bonus for rolling 90
anymore
- Send usage updated for clarity
- I missed some stuff when the  `config.json` stopped having "null"
everywhere, this fixes it, *I think.*
- more whitespacing in the linux guide for people like Kwoth who want to
just be able to copy paste commands

- I'm kinda just guessing this'll work so if it doesn't then, "woopsie"
2016-11-11 00:54:53 +00:00
Jordan Fearnley 8c39c33eba Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into 1.0-fearnlj01 2016-11-10 23:14:14 +00:00
Jordan FearnleyandGitHub bc1a5236d0 Minor change
Link to the FFMPEG installer updated
2016-10-27 17:42:40 +01:00
Jordan Fearnley 818394ed58 Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into 1.0-fearnlj01 2016-10-25 16:13:48 +01:00
Jordan Fearnley 4027d32102 Guide Housekeeping
If I got the CarbonKey part wrong sue me, I'm going off what I saw in
the commits and hoping it behaves as expected
2016-10-25 16:13:36 +01:00
Jordan Fearnley 719ae5da69 Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into 1.0-fearnlj01 2016-10-25 15:32:57 +01:00
Jordan Fearnley a92bdca62a Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into 1.0-fearnlj01 2016-10-25 11:43:31 +01:00
Jordan Fearnley 155bac2b3f Pretend you can't see this commit
I do not typo what do you mean
2016-10-24 22:33:13 +01:00
Jordan Fearnley eeb0c4b44a Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into 1.0-fearnlj01 2016-10-24 22:29:03 +01:00
Jordan Fearnley 7438e58dcd Goodbye sweet link to my Repo o7
README changed for the sake of it being easier to find and replace all
links with `/1.0/` in them for when 1.0 eventually replaces the master
branch
2016-10-24 22:27:14 +01:00
Jordan Fearnley 56471cb48b Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into 1.0-fearnlj01 2016-10-24 22:13:35 +01:00
Jordan FearnleyandGitHub 94bbc36973 🎉
A wild new license has appeared!
2016-10-24 18:13:23 +01:00
Jordan Fearnley 0f3f5a73a9 Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into 1.0-fearnlj01 2016-10-24 17:05:31 +01:00
Jordan Fearnley 04f772a70e Even slighter slighter simplification 2016-10-22 11:02:08 +01:00
Jordan Fearnley 4b7244dda2 Even slighter simplification 2016-10-22 10:59:23 +01:00
Jordan Fearnley 8b71252da7 Slight simplification of the Upgrading Guide, I can't bring myself to provide less detail ¯\_(ツ)_/¯ 2016-10-22 10:57:31 +01:00
Jordan Fearnley db6367da63 Small detail added 2016-10-22 09:32:52 +01:00
Jordan FearnleyandGitHub 9eded736f8 I swear I've commited this three times already
It would've been quicker to just end it all at this rate
2016-10-22 09:27:55 +01:00
Jordan FearnleyandGitHub e48faf8e04 Why would you do this to me vim
Why would you insert a newline at the end of the file 👀
2016-10-22 09:26:37 +01:00
Jordan FearnleyandGitHub 5918105de2 Not Updating CommandStrings.resx
fuck you vim, forcing a new line at the end of file the one time I actually try to fix a conflict making my PR potentially look messy *grumble*
2016-10-22 09:23:42 +01:00
Jordan Fearnley 7c78ee1b4e I don't know if I fixed the merge conflict or not 👀 2016-10-22 09:17:36 +01:00
Jordan Fearnley fc15f95fcb Minor Guide Updates
- Less saving of `credentials.json` required
- Only needing to use `credentials_example.json` if you fuck up
accounted for
- Restore and build in one swift move accounted for
2016-10-22 09:05:42 +01:00
Jordan FearnleyandGitHub cf1a3899d1 1.0 2016-10-22 05:56:13 +01:00
Jordan Fearnley 94ebd47d0e Fixed what I broke
Readthedocs will now build again since the `mkdocs.yml` isn't
referencing a non-existent file anymore. Not merging this means the 1.0
section of the guide will be "frozen" in place, as it currently is,
which'd allow for putting off the release of 1.0 a little longer.

Also updated the JSON Explanations to match what's now generated/used in
1.0
The `Db` section is commented out for the sake of having to change less
in the future.
2016-10-21 17:03:23 +01:00
Jordan Fearnley 554803b8a9 Guides -> 1.0
It took so long after the last mention since I was too stubborn to just
do this from a local git client for too long.

Linux and OS X guides both have things built one by one for now and I'll
only re-release the windows updater once I get the A-OK for not having
to build things one by one.
2016-10-21 14:10:37 +01:00
Jordan FearnleyandGitHub f6662491c1 NadekoFlowers -> Currency
Nicer help strings for self hosts \o/
(I done messed up and missed a prefix in the last PR as well, which is now fixed)
2016-10-19 17:18:40 +01:00
Jordan FearnleyandGitHub 76b5dc8f79 {0} all the things
Credit to `@rjt.rockx#2336` for doing (most) of this!

I also went over and deleted the commands that are no longer in 1.0 including:
- pokemon module
- trello module
- conversations module
- stuff like `.lin` and `.lain`
2016-10-19 15:00:59 +01:00
Jordan FearnleyandGitHub 251730387d Custom Reactions update
Updated to account for the re-introduction of `%target%`
2016-10-16 05:14:42 +01:00
Jordan FearnleyandGitHub 1ae359d1cf Revert Windows guide commit
There's probably better ways to do this, but this works ¯\_(ツ)_/¯
2016-10-12 23:08:03 +01:00
Jordan FearnleyandGitHub 13e185a22e FAQ reset perms question addition
a sllightly less detailed version than in the perms guide
2016-10-12 23:01:45 +01:00
Jordan FearnleyandGitHub 65f593308c Permission System Update
`.resetperms` added
2016-10-12 22:54:46 +01:00
Jordan FearnleyandGitHub deda1b1abf Windows Guide updated for 1.0
`ZipContainingAllTheInstallerFiles` is of course, a placeholder untill I can get an actual filename for this
2016-10-12 09:12:28 +01:00
Jordan FearnleyandGitHub 5e80a0f6ef Minor index.md update
- added the word "the" for the sake of Grammar
- updated the contribution location
2016-10-11 05:18:41 +01:00
Jordan FearnleyandGitHub 8f96d4cfe0 Custom reactions guide doc "fixing"
Entire document is in markdown now and looks good when built with readthedocs. Did a little "housekeeping" for clarification as well.
2016-10-10 18:27:37 +01:00
Jordan FearnleyandGitHub 9561c06ad5 Custom Reactions rewritten in Markdown
It's all in markdown now, rather than HTML!
Added clarification on how the placeholders are used.
`%target%`'s old implementation is there as a comment, ready for it's return
2016-10-10 17:36:23 +01:00
Jordan FearnleyandGitHub 8db0b08bf3 Update Custom Reactions.md 2016-10-10 17:27:22 +01:00
Jordan FearnleyandGitHub 099367836a Readme minor update
Small changes to keep the readme inline with 1.0
2016-10-10 09:55:45 +01:00
Jordan FearnleyandGitHub a25aedc08f Contribution Guide updated for 1.0 release
The hardest document I've had to edit yet!
2016-10-10 09:19:58 +01:00
Jordan FearnleyandGitHub 37e9371230 Update FAQ for 1.0 release
Removed `Question 3: Music isn't working on Mac!!` and `Question 13: I want "BOT" tag with my bot a, is there a simple way?`
Updated links to point to the right place and a few other minor edits
2016-10-10 09:14:13 +01:00
Jordan FearnleyandGitHub efb367c645 Update Permissions System.md 2016-10-10 06:48:46 +01:00
Jordan FearnleyandGitHub 766c0fd3d3 Update Custom Reactions.md 2016-10-10 05:23:32 +01:00
Jordan FearnleyandGitHub c5bfa4d3f5 Merge pull request #1 from Kwoth/1.0
1.0
2016-10-10 05:22:49 +01:00
Jordan FearnleyandGitHub 179407f794 Delete Custom Reactions.md 2016-10-10 05:21:11 +01:00
Jordan FearnleyandGitHub e251e4ec5a Update the Custom Reactions Guide for 1.0
Sorry Nekai, I kinda made it less creative ;_;
Please rip me to shreds if I made any mistakes
2016-10-10 04:56:51 +01:00
Jordan FearnleyandGitHub 5b0db95cb4 This is barely a change
Literally just adding the letter "s"
2016-10-09 21:11:58 +01:00
Jordan FearnleyandGitHub a81ba998e3 Create Permissions System.md 2016-10-09 20:59:20 +01:00
Jordan FearnleyandGitHub 9bd1a432ed Updating Weather API
So I decided to take a peek at the weather API to see why it was down, turns out they've changed domain to this so I'm hoping weather will now work.
2016-10-05 10:22:13 +01:00
Jordan FearnleyandGitHub 5ec0440b8e Update link to commands list
The default link you get when doing `-h` should now reference the command list on the docs, rather than the github wiki
2016-09-17 16:16:12 +01:00