From fb77c42bba4fcc284c44007c22785943cb1f209e Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Sun, 24 Jan 2021 17:35:30 +0100 Subject: [PATCH 1/5] Brag a bit more about this --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 56f2631..a6c7930 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Support for specific plugins are provided either by the plugin itself or through expansions. The expansions may be downloaded in-game through the PAPI Expansion Cloud. There are currently over 150+ expansions that support a wide variety of plugins, such as Essentials, Factions, LuckPerms, and Vault. -PlaceholderAPI has been downloaded over 400,000 times and has been used concurrently on over 20,000 servers, which makes it a must-have for a server of any type or scale. +PlaceholderAPI has been downloaded over 500,000 times and has been used concurrently on over 20,000 servers, which makes it a must-have for a server of any type or scale. From 155fc0592aee4428a4f33eaaa72fa55cf3e4a81f Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Tue, 9 Feb 2021 04:01:29 +0100 Subject: [PATCH 2/5] Branch is actually called development --- .github/CONTRIBUTING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b230db7..21412d2 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,7 +1,8 @@ [issue]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new [discord]: https://helpch.at/discord [code of conduct]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/CODE_OF_CONDUCT.md -[wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/wiki +[wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/docs/wiki/wiki +[dev]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/development [style]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/master/config/style # Contributing Guidelines @@ -39,7 +40,7 @@ In those cases should you report the issue to the issue tracker of the expansion As an open source project are we welcoming all contributions to improve PlaceholderAPI, being it changes to its code like bug fixes or new features, or contributions to its documentation such as the [Wiki] or the Javadoc. ### Code contributions -Any contributions to PlaceholderAPI's code should be done towards the `develop` branch. Targeting the `master` branch in your Pull request may get it closed without warning. +Any contributions to PlaceholderAPI's code should be done towards the [`development`][dev] branch. Targeting the `master` branch in your Pull request may get it closed without warning. Additionally should you follow the project's codestyle which you can find in the [`config/style`][style] directory. ### Wiki/Javadoc contributions From 021d5b1f47078640948a841e557d2529c8267b48 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Wed, 10 Feb 2021 15:29:03 +0100 Subject: [PATCH 3/5] Update label-commenter-config.yml --- .github/label-commenter-config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml index b047b6f..4b3c23b 100644 --- a/.github/label-commenter-config.yml +++ b/.github/label-commenter-config.yml @@ -64,14 +64,14 @@ labels: It is recommended to [join our Discord Server](https://helpch.at/discord) as you often receive faster response compared to the issue tracker here. Questions about PlaceholderAPI should be asked in our [Discussions](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions). action: close - pull_request: + pr: body: |- - Your Pull Request has been marked as invalid. + Your Pull request has been marked as **invalid**. This means that it doesn't follow our [Contributing Guidelines](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/.github/CONTRIBUTING.md). Here is a small summary of what you should know: - - Pull requests for PlaceholderAPI should target the `develop` branch. + - Pull requests for PlaceholderAPI should target the `development` branch. - Pull requests for the Wiki should target the `docs/wiki` branch. Don't hesitate to ask us any questions. From 6b04b6c39bcc61fae0c79b55f758d429468b0cfc Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Wed, 10 Feb 2021 15:29:33 +0100 Subject: [PATCH 4/5] Use pull_request_target --- .github/workflows/label_comment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label_comment.yml b/.github/workflows/label_comment.yml index e81fa87..759051b 100644 --- a/.github/workflows/label_comment.yml +++ b/.github/workflows/label_comment.yml @@ -5,7 +5,7 @@ on: types: - labeled - unlabeled - pull_request: + pull_request_target: types: - labeled - unlabeled From 32d5b7697df11b8cd7081db4138229df6bd15f6c Mon Sep 17 00:00:00 2001 From: HappyRogelio7 <58347721+HappyRogelio7@users.noreply.github.com> Date: Wed, 10 Feb 2021 13:21:43 -0300 Subject: [PATCH 5/5] Update Plugins-using-PlaceholderAPI.md --- wiki/Plugins-using-PlaceholderAPI.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wiki/Plugins-using-PlaceholderAPI.md b/wiki/Plugins-using-PlaceholderAPI.md index 544888a..0ce3d93 100644 --- a/wiki/Plugins-using-PlaceholderAPI.md +++ b/wiki/Plugins-using-PlaceholderAPI.md @@ -536,6 +536,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl - **[Nameless Plugin](https://www.spigotmc.org/resources/59032/)** - [ ] Supports placeholders. - [x] Provides own placeholders. [**[[Link|Placeholders#nameless-plugin]]**] +- **[NameMC-API-ServersMC](https://www.spigotmc.org/resources/88871/)** + - [x] Supports placeholders. + - [x] Provides own placeholders. [**[[Link|Placeholders##namemc-api-serversmc]]**] - **[Nicknamer](https://www.spigotmc.org/resources/5341/)** - [ ] Supports placeholders. - [x] Provides own placeholders. [**[[Link|Placeholders#nicknamer]]**]