Upstream/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI.git synced 2024-12-03 16:03:35 +01:00
Code Issues Projects Releases Wiki Activity
847 Commits 13 Branches 19 Tags 4.1 MiB
acb5728e65
Commit Graph

847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BlitzOffline
a654262196
Added placeholders frmo the String expansion 2021-08-15 00:04:17 +03:00
Andre_601
fa705e4572
Merge pull request #689 from TeamVK/docs/wiki 
added missing baltop related placeholders and multiplier related placeholders.
 2021-08-08 23:24:37 +02:00
vk2gpz
e687a06d6e
added missing baltop related placeholders 2021-08-09 07:19:25 +10:00
darbyjack
08c43d25e7
Add Java Version to /papi dump command 2021-08-04 14:16:15 -05:00
Andre_601
48da25659d
Merge pull request #685 from AfkF24/docs/wiki 
Update Placeholders.md
 2021-07-31 16:46:22 +02:00
AfkF24
905c9e83ee
Apply suggestions from code review 
Woop, thanks

Co-authored-by: Andre_601 <11576465+Andre601@users.noreply.github.com>
 2021-07-31 16:44:46 +02:00
AfkF24
54ddc9fd4d
Update Placeholders.md 
Swap Kingdoms+ for KingdomsX and add link to wiki
 2021-07-31 16:23:25 +02:00
Andre_601
e6da5f291e
Merge pull request #683 from TeamVK/docs/wiki 
Update Placeholders.md
 2021-07-29 00:36:40 +02:00
vk2gpz
d674893312
Update Placeholders.md 
added %levelup_pickaxe_block_count%, %levelup_bow_kill_count%, %levelup_sword_kill_count%
 2021-07-29 07:27:27 +10:00
Andre_601
9da9e8c20f
Merge pull request #680 from BlitzOffline/docs/wiki 
added changeoutput expansion placeholders
 2021-07-24 14:01:29 +02:00
BlitzOffline
33c309ee8e
used inline code instead 2021-07-24 14:17:14 +03:00
BlitzOffline
62c3261a00
added changeoutput expansion placeholders 2021-07-24 14:00:42 +03:00
Funnycube
c393392b85
Update Placeholders.md 2021-07-24 17:39:38 +10:00
Funnycube
fbf91d6393
Merge pull request #679 from TeamVK/docs/wiki 
added RandomNumber and LevelUp entries.
 2021-07-24 17:30:49 +10:00
vk2gpz
8d30c4c99d
added RandomNumber and LevelUp entries. 2021-07-24 17:12:03 +10:00
Andre_601
eb2decb93d
Merge pull request #676 from M0diis/docs/wiki 
Update Placeholders.md
 2021-07-22 22:14:10 +02:00
M0dii
d2192e3195
Update Plugins-using-PlaceholderAPI.md 
Added VenturaCalendar.
 2021-07-22 23:11:09 +03:00
M0dii
c01acfba77
Update Placeholders.md 
Change resource ID.
 2021-07-22 21:54:44 +03:00
M0dii
a494add04c
Update Placeholders.md 2021-07-22 21:48:38 +03:00
Andre_601
059047905f
Update formatter placeholders 2021-07-22 17:28:06 +02:00
Andre_601
fa717c34ef
fix code examples 2021-07-22 12:56:56 +02:00
Andre_601
e16287405b
Update nav entries (#674) 
* Update nav entries

* Update Home.md
 2021-07-22 01:36:43 +02:00
Andre_601
afdf80bf00
Rework PlaceholderExpansion page (#654) 
* Rework PlaceholderExpansion page

* typo

* Implement suggestions of FunnyCube

* Apply suggestions from code review

Co-authored-by: Star <iamstarmism@gmail.com>

* Update wiki/PlaceholderExpansion.md

Co-authored-by: Star <iamstarmism@gmail.com>

* Rename "With a Plugin (Internal Jar)" to "With a Plugin (Internal Class)"

Co-authored-by: Star <iamstarmism@gmail.com>
 2021-07-22 01:29:30 +02:00
Andre_601
ec7943fe0a
Fix formatting too 2021-07-17 22:23:28 +02:00
Andre_601
6493963d8a
Forgot the list-entry 2021-07-17 22:22:22 +02:00
Andre_601
c48e11bd70
Add OreMarket placeholders (#671) 
* Add OreMarket placeholders

* Update Plugins-using-PlaceholderAPI.md

* Add URL
 2021-07-17 22:18:53 +02:00
PiggyPiglet
6348c88c6f
added dev back 2021-07-10 12:17:08 +08:00
PiggyPiglet
5fb45d13da
removed dev for release 2021-07-10 12:16:37 +08:00
PiggyPiglet
5710972288
Merge remote-tracking branch 'origin/master' 2021-07-10 11:27:08 +08:00
PiggyPiglet
63955511a8
added 1.17 to nmsversion (what does this even do) 2021-07-10 11:26:56 +08:00
PiggyPiglet
9a7790c808
Merge pull request #661 from PlaceholderAPI/adventure 
Adventure
 2021-07-09 17:00:44 +08:00
PiggyPiglet
3abc78ff64
Merge pull request #660 from PlaceholderAPI/development 
Sync Dev with master (#659)
 2021-07-09 15:50:01 +08:00
PiggyPiglet
c4789b7db0
finished kyori impl 2021-07-09 12:24:36 +08:00
PiggyPiglet
d7a4acc2f5
started moving to pure adventure 2021-07-07 15:37:35 +08:00
darbyjack
dd7751332f
Initial test on adventure 2021-07-06 11:59:17 -05:00
Andre_601
7b50453294
Add new Essentials placeholders 2021-07-03 17:56:32 +02:00
Andre_601
fa7c30df80
Sync Dev with master (#659) 
* Add contributing and expansion section

* Start using new Issue template system

* Create bug_report.yml

* Rename feature_request.md to feature_request_old.md

* Create feature_request.yml

* fix unique name

* Update feature_request_old.md

* Add Checkboxes

* Add checkboxes

* disable default issue body

* Delete bug_report_old.md

* Delete feature_request_old.md

* Rename bug_report_new.yml to bug_report.yml

* Check if deleting this fixed the PR...

* Use description in favour of about

* improve feature_request.md

* Update bug_report.yml

* Assign "Type: Issue (Unconfirmed)" label

* Use lists and not comma-separated string

* Update feature_request.yml

* Use id option for error and dump fields

* Add field for logs

* Remove deprecated issue_body type

* Update feature_request.yml

* Improve description of bug_report.yml

* Initial 1.17 Changes

* add render

* Revert build.gradle dependencies change

* Fixed duplicate files

Co-authored-by: PiggyPiglet <PiggyPiglet@users.noreply.github.com>
Co-authored-by: darbyjack <admin@glaremasters.me>
 2021-07-01 21:03:01 +02:00
darbyjack
89053354e9
Fixed duplicate files 2021-07-01 09:24:01 -05:00
Andre_601
ead63ca763
Revert build.gradle dependencies change 2021-07-01 16:21:49 +02:00
Andre_601
0fa592383f
Merge branch 'development' into master 2021-07-01 16:16:29 +02:00
PiggyPiglet
7df3a5c6e0
Merge pull request #657 from Starmism/development 
Small changes on the correct branch!
 2021-07-01 22:08:04 +08:00
Starmism
c4a2256fff Appease the Pigman 2021-07-01 07:54:42 -06:00
Starmism
9b6b558002 Add method implementation checking and nullchecking for fields. 2021-06-30 10:13:47 -06:00
Starmism
94bf5fea57 POJO to help with checking that expansions have all required methods implemented. 2021-06-30 10:13:29 -06:00
Starmism
252802dcbe Removed nullcheck from hashcode, and moved it up the chain. 2021-06-30 10:13:12 -06:00
PiggyPiglet
8932a92049
Merge pull request #658 from PlaceholderAPI/1.17 
Initial 1.17 Changes
 2021-06-30 21:16:12 +08:00
Starmism
679ef90091 Re-add NotNull's 
(cherry picked from commit 2bfd8e7e5e)
 2021-06-30 05:59:57 -06:00
Star
ac9b0c42b7 Update src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java 
Co-authored-by: Andre_601 <11576465+Andre601@users.noreply.github.com>
(cherry picked from commit ccf4f59343)
 2021-06-30 05:59:52 -06:00
Starmism
14d885392c Fix version checker to compare the individual semver numbers instead of combining it together. 
(cherry picked from commit ef5cd9d376)
 2021-06-30 05:59:45 -06:00
Starmism
0c102a1823 Remove the @NotNull's because they are overridden by expansion devs anyways, and it turns out people can make them null anyways. This adds a hashcode check and pretty error for it. 
(cherry picked from commit f5386d4ca5)
 2021-06-30 05:59:33 -06:00