From 587ba01494f4dd658258a68a3de0788be58914da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Sep 2022 04:48:00 +0000 Subject: [PATCH 1/7] 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] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 888fe1f..5eecc74 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ net.dv8tion JDA - 4.3.0_277 + 4.4.0_352 From 0040a32f844808dfb747188c1121523e8ad217b0 Mon Sep 17 00:00:00 2001 From: Emotion Date: Sat, 3 Sep 2022 16:51:07 +1200 Subject: [PATCH 2/7] Update dependabot.yml --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7c42b8e..1fd32f9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,5 +14,5 @@ updates: - EmotionChild target-branch: "development" labels: - - "npm" + - "maven" - "dependencies" From 66ff6f074c99313efe080c3e1c7e8946ab0d3d3a Mon Sep 17 00:00:00 2001 From: Emotion Date: Sun, 4 Sep 2022 23:43:52 +1200 Subject: [PATCH 3/7] Delete CONTRIBUTING.md --- CONTRIBUTING.md | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index ddc84a5..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,6 +0,0 @@ -1.Fork this repository -2.Clone your fork: git clone https://github.com/your-username/Ellie-bot.git -3.Create your feature branch: git checkout -b my-new-feature -4.Commit your changes: git commit -am 'Add some feature' -5.Push to the branch: git push origin my-new-feature -6.Submit a pull request From b739bb2224e85140f4379fbdbe65ac983e57bea8 Mon Sep 17 00:00:00 2001 From: Emotion Date: Sun, 4 Sep 2022 23:47:12 +1200 Subject: [PATCH 4/7] Create CONTRIBUTING.md Undid a stupid decision and added a line asking for ideas on what to add --- .github/CONTRIBUTING.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/CONTRIBUTING.md diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 0000000..4f80ebb --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,10 @@ +### This is a work in progress if you have any ideas please place them in this file + +``` +1.Fork this repository +2.Clone your fork: git clone https://github.com/your-username/Ellie-bot.git +3.Create your feature branch: git checkout -b my-new-feature +4.Commit your changes: git commit -am 'Add some feature' +5.Push to the branch: git push origin my-new-feature +6.Submit a pull request +``` From 2c5afa2d5eb5350ae295aaa8ff3dc4a77d3c45c8 Mon Sep 17 00:00:00 2001 From: Emotion Date: Mon, 5 Sep 2022 21:50:49 +1200 Subject: [PATCH 5/7] Update CONTRIBUTING.md --- .github/CONTRIBUTING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4f80ebb..b0c978a 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,5 +1,6 @@ ### This is a work in progress if you have any ideas please place them in this file +Here is the current steps ``` 1.Fork this repository 2.Clone your fork: git clone https://github.com/your-username/Ellie-bot.git @@ -8,3 +9,8 @@ 5.Push to the branch: git push origin my-new-feature 6.Submit a pull request ``` + + +### New steps which are still in the works + +1. If you find a security issue please contact us at `devs@elliebot.net` and we will take a look into it as soon as we can From a70ab56b3877dc50f929e09990bdae27357302c6 Mon Sep 17 00:00:00 2001 From: Emotion Date: Tue, 13 Sep 2022 13:41:59 +1200 Subject: [PATCH 6/7] Updated README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67bb677..cd3a8bf 100644 --- a/README.md +++ b/README.md @@ -84,4 +84,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d -[Discord Server]: https://discord.gg/SVQVzJq +[Discord Server]: https://discord.elliebot.net From a9432e4a8850356e59832b360cb87a24f672dafe Mon Sep 17 00:00:00 2001 From: Emotion Date: Tue, 13 Sep 2022 13:42:44 +1200 Subject: [PATCH 7/7] Removed .idea files --- .idea/.gitignore | 3 - .idea/compiler.xml | 15 ----- .idea/discord.xml | 7 -- .idea/gradle.xml | 17 ----- .idea/jarRepositories.xml | 25 -------- .idea/misc.xml | 14 ---- .idea/runConfigurations.xml | 10 --- .idea/uiDesigner.xml | 124 ------------------------------------ .idea/vcs.xml | 6 -- 9 files changed, 221 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/discord.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/runConfigurations.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 0485eb1..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/discord.xml b/.idea/discord.xml deleted file mode 100644 index d8e9561..0000000 --- a/.idea/discord.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 611e7c8..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 335a3ec..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index ea84697..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file