From 529399e4865c8ab94c9b475e86a856da8a6cc427 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 31 Jul 2020 00:00:16 +0200 Subject: [PATCH 1/6] Remove request change (wiki) template --- .github/ISSUE_TEMPLATE/change_request_wiki.md | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/change_request_wiki.md diff --git a/.github/ISSUE_TEMPLATE/change_request_wiki.md b/.github/ISSUE_TEMPLATE/change_request_wiki.md deleted file mode 100644 index cc5ed35..0000000 --- a/.github/ISSUE_TEMPLATE/change_request_wiki.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -name: Request change (Wiki) -about: Request a update/change of a wiki-page - ---- - -## Please read -This template is only for requesting new information to be added to the wiki or for updating of already existing information! -Please use the [Request change (PlaceholderAPI)] template to ask for additions/changes to the plugin PlaceholderAPI. -For reporting bugs of PlaceholderAPI use the [Bug report] template. - -Also make sure that the [wiki] doesn't already have the change and that there isn't a issue about this change on the [issues] page. - -### Type -> What kind of change is it? (Multiple selections possible) - -- [ ] New plugin/expansion supporting PlaceholderAPI. -A new plugin/expansion uses and/or provides placeholders. -- [ ] Placeholder(s) changed. -An already listed expansion/plugin has new placeholders or old ones have changed. -- [ ] Plugin/Expansion no longer supports PlaceholderAPI and/or was deleted. -- [ ] Other: __________ - -### Info -> Please provide any information that is useful including links and images. -> For plugins/expansion providing new placeholders or updating old ones, provide the placeholders (that have changed) - - - - - - -[Request change (PlaceholderAPI)]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=change_request_placeholderapi.md -[Bug report]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=bug_report.md -[issues]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues -[wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki From 3bcffa0112e091f6b37cc7c5f7d4ba4c6f172bc9 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 31 Jul 2020 00:07:33 +0200 Subject: [PATCH 2/6] Move comments into block --- .github/ISSUE_TEMPLATE/bug_report.md | 31 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index ddeb6e7..9c3768a 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -4,14 +4,23 @@ about: Report bugs of PlaceholderAPI with this template --- -## Please read -This template is only for reporting bugs of PlaceholderAPI! -If you want to request changes to the code of PlaceholderAPI, use the [Request change (PlaceholderAPI)] template. -For changes to the wiki use the [Request change (Wiki)] template. + +## Bug Report ### Issue > What is the issue? Describe it like you would tell a friend. @@ -36,13 +45,3 @@ Please also make sure that you use the [latest release][Spigot] or the latest [d ### Installed expansions > Please list all expansions that are displayed when running `/papi list` - - - - - -[Request change (Wiki)]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=change_request_wiki.md -[Request change (PlaceholderAPI)]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=change_request_placeholderapi.md -[Spigot]: https://www.spigotmc.org/resources/6245/ -[Jenkins]: http://ci.extendedclip.com/job/PlaceholderAPI/ -[issues]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues \ No newline at end of file From ee86fa7460cbf6c76364f46be84a0b69d266a8cb Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 31 Jul 2020 00:17:16 +0200 Subject: [PATCH 3/6] Rename to Feature Request --- .../change_request_placeholderapi.md | 42 ------------------- .github/ISSUE_TEMPLATE/feature_request.md | 33 +++++++++++++++ 2 files changed, 33 insertions(+), 42 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/change_request_placeholderapi.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/change_request_placeholderapi.md b/.github/ISSUE_TEMPLATE/change_request_placeholderapi.md deleted file mode 100644 index bd3ccf5..0000000 --- a/.github/ISSUE_TEMPLATE/change_request_placeholderapi.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -name: Request change (PlaceholderAPI) -about: Request a update/change of the PlaceholderAPI-code - ---- - -## Please read -This template is only for requesting new functions to be added to PlaceholderAPI or for old one to be changed! -Please use the [Request change (Wiki)] template to ask for additions/changes to the wiki. -For reporting bugs of PlaceholderAPI use the [Bug report] template. - -Also make sure that the [wiki] doesn't already mention such a function/change and that there isn't a issue about this change on the [issues] page. - -We recommend to [open a Pull Request][Pull Requests] for making changes to PlaceholderAPI's code. - -### Type -> What kind of request is this? (Multiple selections possible) - -- [ ] New function for PlaceholderAPI. -A new function that developers could use. -- [ ] Change to code (Internal). -Changes to code that won't affect the end-user. -- [ ] Change to code (External). -Changes to code that will affect the end-user (breaks stuff). -- [ ] Other: __________ - -### Info -> What is the change? -> Please provide as much information (including links, images and code-snippeds) as possible. - - - - - - -[Request change (Wiki)]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=change_request_wiki.md -[Bug report]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=bug_report.md -[issues]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues -[wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki -[Pull Requests]: https://github.com/PlaceholderAPI/PlaceholderAPI/pulls \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..0e16cfa --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,33 @@ +--- +name: Feature Request +about: Request a update/change of the PlaceholderAPI-code + +--- + + + +## Feature Request + +### Type +> What kind of request is this? (Multiple selections possible) + +- [ ] New function for PlaceholderAPI. +A new function that developers could use. +- [ ] Change to code (Internal). +Changes to code that won't affect the end-user. +- [ ] Change to code (External). +Changes to code that will affect the end-user (breaks stuff). +- [ ] Other: __________ + +### Info +> What is the change? +> Please provide as much information (including links, images and code-snippeds) as possible. + From 466509c578abfab8e67d86281aa6ef6066397c23 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 31 Jul 2020 00:18:19 +0200 Subject: [PATCH 4/6] Update config.yml --- .github/ISSUE_TEMPLATE/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 1da4d14..7553dc0 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -9,3 +9,6 @@ contact_links: - name: Hastebin url: https://paste.helpch.at about: Use our Hastebin-site for sharing errors and configuration files. + - name: Update Wiki + url: https://github.com/PlaceholderAPI/PlaceholderAPI/pulls + about: Please make a Pull request towards the "wiki" folder to update the wiki. From 51975cbe4000a5f05a41167033d810babd391499 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 31 Jul 2020 14:33:00 +0200 Subject: [PATCH 5/6] Update Marcely's Bedwars --- wiki/Placeholders.md | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/wiki/Placeholders.md b/wiki/Placeholders.md index ca07888..df33bf2 100644 --- a/wiki/Placeholders.md +++ b/wiki/Placeholders.md @@ -2438,27 +2438,31 @@ More info about these placeholders can be found [here](https://panoply.tech/lead > NO DOWNLOAD COMMAND ``` -%mbedwars_-players% -%mbedwars_-maxplayers% -%mbedwars_-status% -%mbedwars_-teams% -%mbedwars_-teamsize% +%mbedwars_arena--maxplayers% +%mbedwars_arena--players% +%mbedwars_arena--status% +%mbedwars_arena--teams% +%mbedwars_arena--teamsize% + +%mbedwars_playerarena-current-team% +%mbedwars_playerarena-current-team-color% +%mbedwars_playerarena-maxplayers% %mbedwars_playerarena-name% %mbedwars_playerarena-players% -%mbedwars_playerarena-maxplayers% %mbedwars_playerarena-status% %mbedwars_playerarena-teams% %mbedwars_playerarena-teamsize% -%mbedwars_playerarena-current-team% -%mbedwars_playerarena-current-team-color% -%mbedwars_stats-rank% -%mbedwars_stats-wins% -%mbedwars_stats-loses% -%mbedwars_stats-kills% + +%mbedwars_stats-beds_destroyed% %mbedwars_stats-deaths% -%mbedwars_stats-bedsdestroyed% -%mbedwars_stats-roundsplayed% -%mbedwars_stats-playtime% +%mbedwars_stats-kd% +%mbedwars_stats-kills% +%mbedwars_stats-loses% +%mbedwars_stats-play_time% +%mbedwars_stats-rank% +%mbedwars_stats-rounds_played% +%mbedwars_stats-wins% +%mbedwars_stats-wl% ``` ---- From 8a12d324e31e209d5930b841a7d4b4ffb1b3f2ac Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 31 Jul 2020 14:50:30 +0200 Subject: [PATCH 6/6] Trigger on docs/wiki branch --- .github/workflows/wiki.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml index 539e720..97be2c0 100644 --- a/.github/workflows/wiki.yml +++ b/.github/workflows/wiki.yml @@ -12,7 +12,7 @@ on: paths: - 'wiki/**' branches: - - 'master' + - 'docs/wiki' # # Releases cause this action to also fire. # Using this prevents this problem. @@ -45,7 +45,7 @@ jobs: # We only want to target files in the wiki folder # MD_FOLDER: 'wiki' - WIKI_PUSH_MESSAGE: 'Updating wiki from commit ${{ github.event.after }}' + WIKI_PUSH_MESSAGE: '${{ github.event.commits[0].message }}' # # We skip/ignore the README.md file in the Wiki folder #