Commit graph

269 commits

Author SHA1 Message Date
Emotion
bd58ab6d12
Merge pull request #152 from EllieBotDevs/development
Development
2022-09-23 14:32:51 +12:00
Emotion
5d468044f4
Merge pull request #151 from EmotionChild/development
Create FUNDING.yml
2022-09-23 14:30:59 +12:00
Emotion
d74519db2d
Create FUNDING.yml 2022-09-23 14:29:49 +12:00
Emotion
de614a4cff
Merge pull request #150 from EllieBotDevs/development
Updated README.md
2022-09-20 18:29:37 +12:00
Emotion
1cb175fce4
Merge pull request #149 from EmotionChild/development
Update README.md
2022-09-20 18:27:32 +12:00
Emotion
600826b6a6
Update README.md 2022-09-20 18:00:42 +12:00
Emotion
93c6ee4508
Merge pull request #147 from EllieBotDevs/development
Development
2022-09-13 20:28:18 +12:00
Emotion
e0bde1233e
Updated a few files
Updated a few files and updated the version number to be the right one
2022-09-13 20:04:58 +12:00
EmotionChild
2f5289d47a
Updated pom.xml with the right version number 2022-09-13 19:51:49 +12:00
EmotionChild
002795f42a
Updated HelloEvent.java, main.java and UserInfoCommand.java 2022-09-13 19:50:36 +12:00
EmotionChild
1850083cf1
Updated a few files and remade the .idea files
Signed-off-by: EmotionChild <emotion@elliebot.net>
2022-09-13 19:47:32 +12:00
Emotion
bbd360097e
Updated ISSUE_TEMPLATES
Updated some files
2022-09-13 15:20:21 +12:00
Emotion
28e60210d3
Updated ISSUE_TEMPLATES
Updated feature_request.md
2022-09-13 15:17:28 +12:00
Emotion
3f834c356d
Updated feature_request.md 2022-09-13 15:16:04 +12:00
Emotion
e84ca65352
Updated feature_request.md 2022-09-13 15:11:39 +12:00
Emotion
ccd2db07ec
Merge pull request #143 from EllieBotDevs/development
Updated SECURITY.md
2022-09-13 14:29:15 +12:00
Emotion
73f118078f
Updated SECURITY.md 2022-09-13 14:28:12 +12:00
Emotion
9249895d7a
Merge pull request #142 from EllieBotDevs/development
Changed version number and nuked old changelogs
2022-09-13 14:22:46 +12:00
Emotion
86f393406a
Changed version number and nuked old changelogs 2022-09-13 14:14:31 +12:00
Emotion
16f916051e
Changed some main files
Removed .idea files, updated JDA to version 4.4.0_352, updated CONTRIBUTING.md, and updated dependabot.yml
2022-09-13 13:46:05 +12:00
Emotion
a9432e4a88
Removed .idea files 2022-09-13 13:42:44 +12:00
Emotion
a70ab56b38
Updated README.md 2022-09-13 13:41:59 +12:00
Emotion
19aa5a72e2
Updating JDA
Bump JDA from 4.3.0_277 to 4.4.0_352
2022-09-05 22:02:49 +12:00
Emotion
2c5afa2d5e
Update CONTRIBUTING.md 2022-09-05 21:50:49 +12:00
Emotion
b739bb2224
Create CONTRIBUTING.md
Undid a stupid decision and added a line asking for ideas on what to add
2022-09-04 23:47:12 +12:00
Emotion
66ff6f074c
Delete CONTRIBUTING.md 2022-09-04 23:43:52 +12:00
Emotion
0040a32f84
Update dependabot.yml 2022-09-03 16:51:07 +12:00
dependabot[bot]
587ba01494
Bump JDA from 4.3.0_277 to 4.4.0_352
Bumps JDA from 4.3.0_277 to 4.4.0_352.

---
updated-dependencies:
- dependency-name: net.dv8tion:JDA
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-03 04:48:00 +00:00
Emotion
7104a0bdc5
Merge pull request #139 from EllieBotDevs/all-contributors/add-AidanTheBandit1
Update README.md
2022-09-03 16:37:08 +12:00
Emotion
8a19955121
Merge branch 'main' into all-contributors/add-AidanTheBandit1 2022-09-03 16:34:27 +12:00
Emotion
069093e095
Update README.md 2022-09-03 16:31:06 +12:00
Emotion
20ad3f7a60
Update README.md 2022-09-03 16:26:30 +12:00
Emotion
72081f0054
Create .all-contributorsrc 2022-09-03 16:22:00 +12:00
Emotion
83abd3e103
Delete .all-contributorsrc 2022-09-03 16:14:33 +12:00
Emotion
59ec109bba
Merge pull request #138 from EllieBotDevs/all-contributors/add-EmotionChild
docs: add EmotionChild as a contributor for code
2022-09-03 16:14:14 +12:00
allcontributors[bot]
a3dcccb5c2
docs: update .all-contributorsrc [skip ci] 2022-09-03 04:13:22 +00:00
allcontributors[bot]
407fce48ab
docs: update README.md [skip ci] 2022-09-03 04:13:21 +00:00
Emotion
8d4782bfb0
Update README.md 2022-09-03 16:12:23 +12:00
Emotion
cafd86ba71
Merge pull request #137 from EllieBotDevs/all-contributors/add-AidanTheBandit1
docs: add AidanTheBandit1 as a contributor for code
2022-09-03 16:11:29 +12:00
allcontributors[bot]
b7b3dca399
docs: create .all-contributorsrc [skip ci] 2022-09-03 04:08:12 +00:00
allcontributors[bot]
c6497adcda
docs: update README.md [skip ci] 2022-09-03 04:08:11 +00:00
Emotion
2003947ab8
It is rewrite time!
Ellie-bot Java Rewrite
2022-09-03 16:05:26 +12:00
Emotion
49bf8bd154
Update dependabot.yml 2022-09-03 15:51:53 +12:00
Emotion
0c3fef6aa6
Merge pull request #134 from AidanTheBandit1/development
Development
2022-09-03 15:44:56 +12:00
AidanTheBandit
0df2a98ea0
Delete target/classes/com/aidanthebandit/banditbot2 directory 2022-09-02 23:35:05 -04:00
AidanTheBandit
22b307b287 Re-added files 2022-09-02 23:29:50 -04:00
AidanTheBandit
07ab0f7498 Re-added files 2022-09-02 23:27:53 -04:00
AidanTheBandit
894864b7c7 Switched to maven and added JDA 2022-09-02 23:24:37 -04:00
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