Commit graph

203 commits

Author SHA1 Message Date
Skidder
e37893c6cc
Merge pull request #55 from BigBotNetwork/dependabot/maven/net.dv8tion-JDA-4.0.0_60
Bump JDA from 4.0.0_59 to 4.0.0_60
2019-11-14 16:22:42 +01:00
dependabot-preview[bot]
0b67064e34
Bump JDA from 4.0.0_59 to 4.0.0_60
Bumps JDA from 4.0.0_59 to 4.0.0_60.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-14 13:44:49 +00:00
Skidder
04b7a43a8d
Merge pull request #54 from BigBotNetwork/dependabot/maven/net.dv8tion-JDA-4.0.0_59
Bump JDA from 4.0.0_56 to 4.0.0_59
2019-11-11 15:48:04 +01:00
dependabot-preview[bot]
5e67ef48db
Bump JDA from 4.0.0_56 to 4.0.0_59
Bumps JDA from 4.0.0_56 to 4.0.0_59.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 13:22:38 +00:00
Skidder
b3b2f53109
Merge pull request #53 from BigBotNetwork/greg-dev
Some stuff
2019-11-10 20:49:09 +01:00
Skidder
101a31f338
Update README.md 2019-11-10 20:48:18 +01:00
GregTCLTK
352a772fe5
Hello my friends 2019-11-10 13:16:03 +01:00
GregTCLTK
8d0aabb09c
Few changes 2019-11-10 13:11:29 +01:00
Skidder
0e1f278b84
Merge pull request #52 from BigBotNetwork/greg-dev
Nothing special ;)
2019-11-05 17:14:39 +01:00
GregTCLTK
da3e81d02a
Not needed 2019-11-05 17:09:08 +01:00
GregTCLTK
8f6d51a2b6
Fixing Gif Command 2019-11-04 20:54:10 +01:00
GregTCLTK
58135122f7
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-11-04 18:19:56 +01:00
GregTCLTK
b4d2e81c41
Version 2019-11-04 18:19:49 +01:00
Skidder
7efa86329e
Merge pull request #51 from BigBotNetwork/master
Merge
2019-11-04 18:19:17 +01:00
Skidder
f2d88a7a94
Merge pull request #50 from BigBotNetwork/hax-dev
Hax dev
2019-11-04 18:18:54 +01:00
Hax
fcb33ef5c7 Updated some things 2019-11-04 18:15:51 +01:00
Skidder
9cdfc8761c
Merge pull request #49 from BigBotNetwork/dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.2.0
Bump maven-jar-plugin from 3.1.2 to 3.2.0
2019-11-04 15:33:00 +01:00
dependabot-preview[bot]
9bc1f55fd3
Bump maven-jar-plugin from 3.1.2 to 3.2.0
Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.1.2 to 3.2.0.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.1.2...maven-jar-plugin-3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 14:32:43 +00:00
Skidder
35cc4efa8d
Merge pull request #48 from BigBotNetwork/dependabot/maven/net.dv8tion-JDA-4.0.0_56
Bump JDA from LATEST to 4.0.0_56
2019-11-04 15:32:42 +01:00
dependabot-preview[bot]
24085abeec
Bump JDA from LATEST to 4.0.0_56
Bumps JDA from LATEST to 4.0.0_56.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 14:32:13 +00:00
Skidder
0e700d1536
Merge pull request #47 from BigBotNetwork/greg-dev
Greg dev
2019-11-03 22:05:58 +01:00
GregTCLTK
6f02672830
Adding Discord Boats 2019-11-03 22:03:21 +01:00
Hax
007f7ff056 Merge branch 'dev-merge' 2019-11-03 20:39:08 +01:00
Hax
1efeacd55a Merge branch 'dev-merge' into hax-dev 2019-11-03 20:38:26 +01:00
Hax
64c0352bba Merge branch 'dev-merge' into greg-dev 2019-11-03 20:38:18 +01:00
Hax
66c8243fb0 Merge remote-tracking branch 'origin/greg-dev' into dev-merge 2019-11-03 20:37:55 +01:00
Hax
a5951c47ea Hello, i changed everything and it works
Changed Stuff:
Command System
Database Connection
Config Reader
Command Event

Please sub to bbn Pog
2019-11-03 20:31:50 +01:00
Hax
23c7af5ba5
Merge pull request #46 from BigBotNetwork/hax-dev
The ting goes grrrrra
2019-11-03 16:49:47 +01:00
Skidder
4a7a7acb0f
Merge pull request #45 from BigBotNetwork/master
Test PR
2019-11-03 16:27:31 +01:00
Skidder
97e1a80fff
Update CODEOWNERS 2019-11-03 16:26:01 +01:00
Skidder
3e7e730f1d
Merge pull request #44 from BigBotNetwork/greg-dev
Create CODEOWNERS
2019-11-03 16:24:11 +01:00
Skidder
02d69428e0
Create CODEOWNERS 2019-11-03 16:22:52 +01:00
Skidder
14a6fc91b5
Merge pull request #43 from BigBotNetwork/greg-dev
Greg dev
2019-11-03 12:03:51 +01:00
GregTCLTK
41fced853e
Added Discord Best Bots 2019-11-03 12:03:19 +01:00
GregTCLTK
10658cf8bc
Two more Bot Lists :) 2019-11-03 11:57:29 +01:00
GregTCLTK
4d47be3d5a Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-11-03 01:43:31 +01:00
GregTCLTK
5570021b96 Test 2019-11-03 01:43:19 +01:00
Skidder
9d08d9f5b1
Merge pull request #42 from BigBotNetwork/greg-dev
Fixxx
2019-11-03 01:41:06 +01:00
Skidder
e025875a8c
Merge branch 'master' into greg-dev 2019-11-03 01:41:00 +01:00
GregTCLTK
da9a2af4ad OOOPPPPSSSS 2019-11-03 01:39:09 +01:00
GregTCLTK
ed6f53dda0 First Bot List Integration 2019-11-03 01:38:39 +01:00
Skidder
c4ffa1b9a1
Merge pull request #41 from BigBotNetwork/greg-dev
Merge greg into master
2019-11-03 01:32:30 +01:00
GregTCLTK
ace8587f96 First Bot List Integration 2019-11-03 01:31:32 +01:00
GregTCLTK
c96792f7c9 Public ShardManager 2019-11-03 01:30:49 +01:00
Hax
961dedbc31 Added Equals Command, Screenshare Command and introduced Eventwaiters 2019-11-02 20:12:23 +01:00
Hax
6f4372a463 Merge remote-tracking branch 'origin/hax-dev' into hax-dev 2019-11-02 18:42:37 +01:00
Hax
cdd52f1430 Merge remote-tracking branch 'origin/master' into hax-dev 2019-11-02 18:42:32 +01:00
Skidder
1a8150018f
Merge pull request #40 from BigBotNetwork/greg-dev
Greg dev
2019-11-02 15:49:58 +01:00
GregTCLTK
8fa1a98256 Fix 2019-11-02 15:49:42 +01:00
GregTCLTK
de0562753a english 2019-11-02 15:14:05 +01:00