Merge remote-tracking branch 'origin/master'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,14 +4,23 @@ about: Report bugs of PlaceholderAPI with this template
 
 ---
 
-## Please read
+<!--
+  ### 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.  
+  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.
+  For changes to the wiki consider making a Pull request towards the "wiki" folder containing your changes.
 
-Please also make sure that you use the [latest release][Spigot] or the latest [developement build][Jenkins] and that your bug isn't already reported on the [issues] page.
+  Please also make sure that you use the latest Spigot release or the latest developement build and that your bug isn't already reported on the issues page.
+  You may get Releases from following sources:
   
-**Please report issues with expansions/placeholders to the corresponding issue tracker! Only report it here if you can't find any place to report it!**
+  - Spigot:  https://www.spigotmc.org/resources/6245/
+  - Jenkins: http://ci.extendedclip.com/job/PlaceholderAPI/
+
+  NOTE:
+  PLEASE REPORT ISSUES WITH EXPANSIONS AND/OR PLACEHOLDERS TO THEIR CORRESPONDING REPOSITORY/ISSUE TRACKER.
+  THIS REPOSITORY IS NOT FOR SUCH ISSUES.
+-->
+## 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`
 <!-- Please write below this line to prevent formatting issues -->
-
-
-
-<!-- DO NOT ALTER ANYTHING BELOW THIS LINE! -->
-
-[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

.github/ISSUE_TEMPLATE/change_request_placeholderapi.md

@@ -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)
-<!--
-      Please select the right options by replacing the [ ] with a [x]
--->
-- [ ] 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: __________ <!-- Use this if none of the above matches your request -->
-
-### Info
-> What is the change?  
-> Please provide as much information (including links, images and code-snippeds) as possible.
-<!-- Please write below this line to prevent formatting issues -->
-
-
-
-<!-- DO NOT ALTER ANYTHING BELOW THIS LINE! -->
-
-[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

.github/ISSUE_TEMPLATE/change_request_wiki.md

@@ -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)
-<!--
-      Please select the right one, by changing the [ ] to [x]
--->
-- [ ] 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: __________ <!-- Use this if none of the above matches your request -->
-
-### 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)
-<!-- Please write below this line to prevent formatting issues -->
-
-
-
-<!-- DO NOT ALTER ANYTHING BELOW THIS LINE! -->
-
-[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

.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.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,33 @@
+---
+name: Feature Request
+about: Request a update/change of the PlaceholderAPI-code
+
+---
+
+<!--
+  ### Please read ###
+  Before suggesting any new features, make sure that it wasn't suggested before and that no open issue with it exists already.
+
+  If possible would we suggest to create a Pull request instead.
+  When doing so, make sure to follow our Contributing Guidelines: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/.github/CONTRIBUTING.md
+-->
+
+## Feature Request
+
+### Type
+> What kind of request is this? (Multiple selections possible)
+<!--
+      Please select the right options by replacing the [ ] with a [x]
+-->
+- [ ] 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: __________ <!-- Use this if none of the above matches your request -->
+
+### Info
+> What is the change?  
+> Please provide as much information (including links, images and code-snippeds) as possible.
+<!-- Please write below this line to prevent formatting issues -->

.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
         #

wiki/Placeholders.md

@@ -2438,27 +2438,31 @@ More info about these placeholders can be found [here](https://panoply.tech/lead
 > NO DOWNLOAD COMMAND
 
 ```
-%mbedwars_<arena>-players%
+%mbedwars_arena-<arena>-maxplayers%
-%mbedwars_<arena>-maxplayers%
+%mbedwars_arena-<arena>-players%
-%mbedwars_<arena>-status%
+%mbedwars_arena-<arena>-status%
-%mbedwars_<arena>-teams%
+%mbedwars_arena-<arena>-teams%
-%mbedwars_<arena>-teamsize%
+%mbedwars_arena-<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-beds_destroyed%
-%mbedwars_stats-rank%
-%mbedwars_stats-wins%
-%mbedwars_stats-loses%
-%mbedwars_stats-kills%
 %mbedwars_stats-deaths%
-%mbedwars_stats-bedsdestroyed%
+%mbedwars_stats-kd%
-%mbedwars_stats-roundsplayed%
+%mbedwars_stats-kills%
-%mbedwars_stats-playtime%
+%mbedwars_stats-loses%
+%mbedwars_stats-play_time%
+%mbedwars_stats-rank%
+%mbedwars_stats-rounds_played%
+%mbedwars_stats-wins%
+%mbedwars_stats-wl%
 ```
 ----