Commit graph

221 commits

Author SHA1 Message Date
AidanTheBandit
b415168ac2 Merge branch 'development' of https://github.com/AidanTheBandit1/Ellie-bot into development
# Conflicts:
#	.idea/compiler.xml
#	.idea/jarRepositories.xml
#	.idea/misc.xml
#	README.md
2022-09-02 23:24:20 -04:00
AidanTheBandit
2d72520af8 Template added and maven 2022-09-02 23:15:29 -04:00
AidanTheBandit
3d3ed2b43b
Delete gradle/wrapper directory 2022-09-02 23:06:09 -04:00
AidanTheBandit
837542dafb
Delete build.gradle.kts 2022-09-02 23:05:59 -04:00
AidanTheBandit
0c2451dd31
Delete gradlew 2022-09-02 23:05:50 -04:00
AidanTheBandit
e0ecf9e5ec
Delete gradlew.bat 2022-09-02 23:05:43 -04:00
AidanTheBandit
45436b4f2e
Delete settings.gradle.kts 2022-09-02 23:05:33 -04:00
Emotion
0d2c3ec0fc
Update codeql-analysis.yml 2022-09-03 02:52:57 +12:00
Emotion
e2212238df
New beginnings
Java rewrite
2022-09-03 02:50:02 +12:00
Emotion
249a157631
Update CODEOWNERS 2022-08-29 13:56:21 +12:00
Emotion
345bae1845
Merge pull request #128 from EllieBotDevs/EmotionChild-patch-1
Create dependency-review.yml
2022-08-29 13:14:24 +12:00
Emotion
f9cba15e65
Create dependency-review.yml 2022-08-29 13:13:31 +12:00
Emotion
7efe3b3db1
Merge pull request #127 from EllieBotDevs/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
2022-08-29 13:10:06 +12:00
Emotion
20aeaf3e69
Create CODE_OF_CONDUCT.md 2022-08-29 13:09:30 +12:00
Emotion
d37ac0812c
Update README.md 2022-08-29 12:41:38 +12:00
EmotionChild
ba788c5c20
Updated dependabot.yml 2022-08-06 14:48:56 +12:00
EmotionChild
f11fe05859
More stuff 2022-08-06 14:44:33 +12:00
EmotionChild
2e7ad3f1d3
Forgot a file 2022-08-06 12:48:55 +12:00
EmotionChild
e4dae5d1c6
Added java files 2022-08-06 12:48:31 +12:00
EmotionChild
7a9950618e
Why 2022-08-06 10:50:43 +12:00
EmotionChild
0595a3ff9d
Merge branch 'java-rewrite' of https://github.com/EllieBotDevs/Ellie-Bot into java-rewrite 2022-08-06 10:47:13 +12:00
EmotionChild
9dc3ee5342
Preparation for java rewrite 2022-08-06 10:44:22 +12:00
Emotion
100722e4ac
Updated License and Dependencies
Updated discord.js, and @types/node also changed license to the Apache 2.0 license
2022-08-03 00:10:22 +12:00
Emotion
ebef2a5e3a
Update README.md 2022-08-03 00:06:30 +12:00
Emotion
2681d16832
Update README.md 2022-08-03 00:04:58 +12:00
Emotion
69b72d8568
Merge pull request #111 from EllieBotDevs/add-license-1
Create LICENSE
2022-08-03 00:03:05 +12:00
Emotion
10de047f32
Create LICENSE 2022-08-03 00:02:43 +12:00
Emotion
99c54c9554
Delete LICENSE 2022-08-03 00:01:54 +12:00
Emotion
bb3e11d5dd
Merge pull request #109 from EllieBotDevs/dependabot/npm_and_yarn/development/types/node-18.6.3
Bump @types/node from 18.6.2 to 18.6.3
2022-08-03 00:01:32 +12:00
Emotion
09da662c48
Merge pull request #110 from EllieBotDevs/dependabot/npm_and_yarn/development/discord.js-14.1.2
Bump discord.js from 14.1.1 to 14.1.2
2022-08-03 00:01:15 +12:00
dependabot[bot]
cba845b935
Bump discord.js from 14.1.1 to 14.1.2
Bumps [discord.js](https://github.com/discordjs/discord.js) from 14.1.1 to 14.1.2.
- [Release notes](https://github.com/discordjs/discord.js/releases)
- [Commits](https://github.com/discordjs/discord.js/compare/14.1.1...14.1.2)

---
updated-dependencies:
- dependency-name: discord.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-01 14:59:16 +00:00
dependabot[bot]
2d7cce7248
Bump @types/node from 18.6.2 to 18.6.3
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.6.2 to 18.6.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-01 14:59:07 +00:00
Emotion
f29ba28f76
Merge pull request #108 from EllieBotDevs/development
Development
2022-07-31 14:27:14 +12:00
Emotion
d9ee3543f3
Merge branch 'main' into development 2022-07-31 14:25:11 +12:00
Emotion
b8def973a2
Updated discord.js
Bump discord.js from 14.0.3 to 14.1.1
2022-07-31 14:24:00 +12:00
Emotion
d2f0611400
Merge pull request #106 from EllieBotDevs/dependabot/npm_and_yarn/development/types/node-18.6.2
Bump @types/node from 18.6.1 to 18.6.2
2022-07-31 14:23:33 +12:00
dependabot[bot]
35b8ab5491
Bump discord.js from 14.0.3 to 14.1.1
Bumps [discord.js](https://github.com/discordjs/discord.js) from 14.0.3 to 14.1.1.
- [Release notes](https://github.com/discordjs/discord.js/releases)
- [Commits](https://github.com/discordjs/discord.js/compare/14.0.3...14.1.1)

---
updated-dependencies:
- dependency-name: discord.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-29 14:49:51 +00:00
dependabot[bot]
50e7c34522
Bump @types/node from 18.6.1 to 18.6.2
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.6.1 to 18.6.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-28 14:53:27 +00:00
Emotion
7acbdcb1c3
Merge pull request #105 from EllieBotDevs/development
Development
2022-07-26 14:41:06 +12:00
Emotion
ecf4bbe8f4
Merge pull request #104 from EllieBotDevs/dependabot/npm_and_yarn/development/types/node-18.6.1
Bump @types/node from 18.0.6 to 18.6.1
2022-07-26 14:29:38 +12:00
dependabot[bot]
79d0996177
Bump @types/node from 18.0.6 to 18.6.1
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.0.6 to 18.6.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-25 15:00:32 +00:00
Emotion
07148d5a8b
Merge pull request #103 from EllieBotDevs/development
Update README.md
2022-07-26 02:09:28 +12:00
Emotion
51dd0ed462
Update README.md 2022-07-26 02:07:00 +12:00
Emotion
30148c6d0a
Merge pull request #102 from EllieBotDevs/development
Development
2022-07-25 01:58:16 +12:00
Emotion
755c2c9181
Update CHANGELOG.md
Fixed some stuff to do with this file
2022-07-25 01:55:51 +12:00
Emotion
dedc6e2906
Delete release.yml 2022-07-25 01:52:40 +12:00
Emotion
4c0cfcb20d
Merge pull request #101 from EllieBotDevs/development
Development
2022-07-25 01:47:50 +12:00
Emotion
17f4d446e3
Delete add-to-project.yml 2022-07-25 01:45:17 +12:00
Emotion
9dcfd5c1e2
Update add-to-project.yml 2022-07-25 01:44:24 +12:00
Emotion
dd7809ba40
Create release.yml 2022-07-25 01:42:23 +12:00