Merge #51

Merged
greg6775 merged 10 commits from master into greg-dev 2019-11-04 18:19:17 +01:00

10 commits

Author SHA1 Message Date
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
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
23c7af5ba5
Merge pull request #46 from BigBotNetwork/hax-dev
The ting goes grrrrra
2019-11-03 16:49:47 +01:00