From 68b31f19f2d9aed0106d6e982be9e34d7147ff8a Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sun, 5 Jun 2022 22:17:25 -0500 Subject: [PATCH] Update for 1.2 --- .idea/codeStyles/Plexus_Code_Style.xml | 49 ++++++++++++++++++++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 +++ CONTRIBUTING.md | 2 +- build.gradle.kts | 6 ++-- src/main/resources/module.yml | 2 +- 5 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 .idea/codeStyles/Plexus_Code_Style.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/codeStyles/Plexus_Code_Style.xml b/.idea/codeStyles/Plexus_Code_Style.xml new file mode 100644 index 0000000..a7db3e4 --- /dev/null +++ b/.idea/codeStyles/Plexus_Code_Style.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..df773a2 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e9c962b..a6199f6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ For those who are wanting to contribute, we fully encourage doing so. There are 3. Create a new branch that describes the new feature, enhancement, or bug fix. For example, this is good: `feature/add-xyz`. This is bad: `fix-this-lol`. 4. Write the code that addresses your change. - Keep in mind that it **must** be formatted correctly. If you are using IntelliJ, there is a `codeStyle.xml` file that tells IntelliJ how to format your code. Check this link for information on how to use the file: https://www.jetbrains.com/help/idea/configuring-code-style.html#import-export-schemes -- If you are not using IntelliJ, that is fine. We use Allman style so please format your code accordingly. +- If you are not using IntelliJ, that is fine. We use the Plexus Code Style (which is almost the same as Allman) so please format your code accordingly. 6. Push your changes to your new branch and make a PR based off of that branch. ## Requirements for a PR diff --git a/build.gradle.kts b/build.gradle.kts index 0f8ea9f..1bba41e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,13 +19,13 @@ dependencies { compileOnly("org.projectlombok:lombok:1.18.24") annotationProcessor("org.projectlombok:lombok:1.18.24") compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT") - compileOnly("dev.plex:server:1.1") - compileOnly("dev.plex:api:1.1") + compileOnly("dev.plex:server:1.2-SNAPSHOT") + compileOnly("dev.plex:api:1.2-SNAPSHOT") implementation("LibsDisguises:LibsDisguises:10.0.28") } group = "dev.plex" -version = "1.1" +version = "1.2-SNAPSHOT" description = "Module-LibsDisguises" java { diff --git a/src/main/resources/module.yml b/src/main/resources/module.yml index 58ed41a..9780d9e 100644 --- a/src/main/resources/module.yml +++ b/src/main/resources/module.yml @@ -1,4 +1,4 @@ name: Module-LibsDisguises main: dev.plex.LibsDisguises description: Control LibsDisguises with Plex -version: 1.1 \ No newline at end of file +version: 1.2-SNAPSHOT \ No newline at end of file