-
Notifications
You must be signed in to change notification settings - Fork 260
Sync Master branch with Development (Possible Release) #558
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Trigger on docs/wiki branch
Update wiki branch
Update docs/wiki from master
Added RocketPlaceholsers which provides their own placeholders. The placeholders are customizable from the config.
Added RocketPlaceholsers
Update placeholders for tntrun_reloaded and parkour
…-drops Add Streaming Drops (#451)
Update the out of date BentoBox placeholders
Update BentoBox Placeholders
Update Plugins-using-PlaceholderAPI.md
Update Placeholders.md
Add TimeManager placeholders
Updated listing for Clans [Free] and Clans [Pro] Listings. Both plugins are utilizing the API and are available on spigot as i type this.
Updated listing for Clans [Free] and Clans [Pro] Listings. Both plugins are utilizing the API and are available on spigot as i type this.
PR to correct branch.
Added the RNG expansion Updated the chat reaction placeholders list
Added extra placeholders to wiki
Add more advancements placeholders
Added more placeholders to wiki
Adds and updates InteractiveChat, InteractionVisualizer and HoloMobHealth on the wiki
Update ajParkour + add ajLeaderboards placeholders
Update LuckPerms placeholders
…ckup Add VKAutoPickup
Sync Development and docs/wiki
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request
Type
Description
Closes N/A
Updates the master branch with latest changes that have been merged into the development branch.
I personally recommend to only merge this, once a release is planned... Just a suggestion tho.