aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' of https://github.com/AnInternetTroll/mcbeDiscordBotAnInternetTroll2020-06-031-3/+9
|\|
| * Merge pull request #13 from Mango0x45/patch-11Luca Matei Pintilie2020-06-031-3/+9
| |\ | | | | | | kai secret maybe fix who knows
| | * Added some documentationThomas Voss2020-06-031-0/+1
| | |
| | * kai secret maybe fix who knowsThomas Voss2020-06-031-3/+8
| |/
* | Merge branch 'master' of https://github.com/AnInternetTroll/mcbeDiscordBotAnInternetTroll2020-06-031-1/+1
|\|
| * Merge pull request #12 from kaiisnothere/patch-2Luca Matei Pintilie2020-06-031-1/+1
| |\ | | | | | | kai time the sequel
| | * kai time the sequelkaiisnothere2020-06-031-1/+1
| |/ | | | | pog
* | Merge branch 'master' of https://github.com/AnInternetTroll/mcbeDiscordBotAnInternetTroll2020-06-031-0/+5
|\|
| * Merge pull request #11 from kaiisnothere/patch-1Luca Matei Pintilie2020-06-031-0/+5
| |\ | | | | | | kai time bby
| | * kai time bbykaiisnothere2020-06-031-0/+5
| |/ | | | | -1 eye seed time woohoo
* / modified: .gitignoreAnInternetTroll2020-06-0313-0/+0
|/
* General improvementsAnInternetTroll2020-06-0313-5/+55
|
* modified: .gitignoreAnInternetTroll2020-06-0212-203/+232
| | | | | | | | | | | | | | modified: .vscode/settings.json modified: bot.py modified: cogs/admin.py modified: cogs/general.py modified: cogs/help.py modified: cogs/player.py modified: cogs/src.py modified: cogs/trans.py modified: cogs/utils.py modified: custom_commands.json modified: main.py
* Replace DynoAnInternetTroll2020-05-317-9/+59
|
* Replacing DynoAnInternetTroll2020-05-312-0/+207
|
* Replacing DynoAnInternetTroll2020-05-3110-3/+12
|
* modified: .gitignoreAnInternetTroll2020-05-3010-0/+0
| | | | | | | | | | | | modified: .vscode/settings.json modified: bot.py modified: cogs/admin.py modified: cogs/help.py modified: cogs/src.py modified: cogs/trans.py modified: cogs/utils.py modified: custom_commands.json modified: main.py
* It now removes the roles...kindaAnInternetTroll2020-05-301-2/+14
|
* Better verify commandAnInternetTroll2020-05-3010-93/+88
|
* Merge branch 'master' of https://github.com/AnInternetTroll/mcbeDiscordBotAnInternetTroll2020-05-291-0/+54
|\
| * Merge pull request #10 from Mango0x45/patch-10Luca Matei Pintilie2020-05-291-0/+54
| |\ | | | | | | uuuuh dont question it
| | * added a fun story for people to readThomas Voss2020-05-291-0/+46
| | |
| | * fixed it!Thomas Voss2020-05-291-2/+5
| | |
| | * uuuuh dont question itThomas Voss2020-05-291-0/+5
| |/
* / modified: main.pyAnInternetTroll2020-05-2910-0/+0
|/
* Transparency addedAnInternetTroll2020-05-2910-18/+42
|
* modified: cogs/utils.pyAnInternetTroll2020-05-291-4/+4
|
* Merge branch 'master' of https://github.com/AnInternetTroll/mcbeDiscordBotAnInternetTroll2020-05-291-0/+3
|\
| * Merge pull request #9 from Mango0x45/patch-9Luca Matei Pintilie2020-05-291-0/+3
| |\ | | | | | | more secrets
| | * more secretsThomas Voss2020-05-291-0/+3
| |/
* / Various updatesAnInternetTroll2020-05-2910-381/+381
|/
* Blacklisted screenshotAnInternetTroll2020-05-2911-0/+1
|
* Nothing to see hereAnInternetTroll2020-05-291-3/+0
|
* Screenshot websites :DAnInternetTroll2020-05-294-4/+17
|
* Various fixesAnInternetTroll2020-05-295-5/+20
|
* Merge pull request #8 from Mango0x45/patch-8Luca Matei Pintilie2020-05-291-11/+45
|\ | | | | added more secrets and made code cleaner (maybe idk actually)
| * added a commentThomas Voss2020-05-281-0/+4
| |
| * added more secrets and made code cleaner (maybe idk actually)Thomas Voss2020-05-281-11/+41
|/ | | Please read my code on line 47 idk if its correct it should be tho
* Merge pull request #7 from Mango0x45/patch-7Luca Matei Pintilie2020-05-281-0/+14
|\ | | | | secret
| * secretThomas Voss2020-05-281-0/+14
|/
* modified: cogs/src.pyAnInternetTroll2020-05-281-1/+1
|
* modified: cogs/admin.pyAnInternetTroll2020-05-281-2/+1
|
* pull and report command added, plus fixed Mango's trashy spacingAnInternetTroll2020-05-287-268/+296
|
* Merge pull request #6 from Mango0x45/patch-6Luca Matei Pintilie2020-05-271-181/+229
|\ | | | | I want to die
| * I want to dieThomas Voss2020-05-271-181/+229
|/
* modified: bot.pyAnInternetTroll2020-05-273-2/+37
| | | | | modified: cogs/src.py modified: custom_commands.json
* Merge branch 'master' of https://github.com/AnInternetTroll/mcbeDiscordBotAnInternetTroll2020-05-261-7/+8
|\
| * Merge pull request #5 from Mango0x45/patch-5Luca Matei Pintilie2020-05-261-7/+8
| |\ | | | | | | Update src.py
| | * Update src.pyThomas Voss2020-05-261-7/+8
| |/
* | Merge branch 'master' of https://github.com/AnInternetTroll/mcbeDiscordBotAnInternetTroll2020-05-261-2/+2
|\| | | | | | | Merge from the Mango