SpigotMC-Mirrors/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI synced 2025-11-04 07:22:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
706 Commits 17 Branches 20 Tags
5fb45d13dacff0bf30196b3e38a3dc1605131cc5
Commit Graph

706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PiggyPiglet
5fb45d13da removed dev for release 2021-07-10 12:16:37 +08:00
PiggyPiglet
5710972288 Merge remote-tracking branch 'origin/master' 2.10.10 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
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
Starmism
4c968f012d Cleanup build.gradle 
(cherry picked from commit 7750ba7033)
 2021-06-30 05:59:22 -06:00
Andre_601
438a665b74 add render 2021-06-27 14:31:15 +02:00
PiggyPiglet
247a5cde8f Merge pull request #623 from PlaceholderAPI/feature/621-build-jars-on-pr 
Build jars on PR (Compile and build validation)
 2021-06-26 11:51:00 +08:00
Andre_601
af268c4941 adoPt 
I always make that mistake...
 2021-06-25 16:33:27 +02:00
Andre_601
4c4b1602d9 Build against Java 8, 11 and 16 2021-06-25 16:32:45 +02:00
PiggyPiglet
8c69a164b8 Merge pull request #649 from Vshnv/patch/expansion-classloader 
Fixed issue with expansions not being able to access their resources
 2021-06-25 22:11:58 +08:00
Vaishnav Anil
df8583df57 Close URLClassLoader if Expansion class was not found 2021-06-25 05:08:14 +05:30
Vaishnav Anil
09e68e7510 Extracted URLClassLoader out of try-with-resources block 2021-06-25 05:07:14 +05:30
darbyjack
71b5433326 Initial 1.17 Changes 2021-06-11 01:33:29 -05:00
Andre_601
748b9f33f7 Build jars on PR (Compile and build validation) 2021-04-26 18:05:42 +02:00
Andre_601
d14f319eb4 Improve description of bug_report.yml 2021-04-21 14:30:46 +02:00
Andre_601
0927760d76 Merge pull request #619 from PlaceholderAPI/feature/remove-issue-body-field 
Remove deprecated issue_body type
 2021-04-21 14:25:40 +02:00
Andre_601
91af12f575 Update feature_request.yml 2021-04-21 14:24:40 +02:00
Andre_601
5dbbe01b95 Remove deprecated issue_body type 2021-04-21 14:24:14 +02:00
Andre_601
0c6dd5466c Merge pull request #610 from PlaceholderAPI/fix/update-missing-copyright 
Update Copyright
 2021-04-13 17:59:21 +02:00
Andre601
41275509b2 Undo renaming of boolean 2021-04-13 17:58:42 +02:00
Andre601
4e8b1b47d1 Re-add removed code 
That should actually NOT be here...
 2021-04-13 17:57:59 +02:00
Andre601
d0e62e6434 Update Copyright 
~ Fixed a typo and updated missed files from #543
 2021-04-13 17:54:57 +02:00
Andre_601
2086fcb299 Merge pull request #583 from HSGamer/patch-1 
should it use setBracketPlaceholders??
 2021-04-13 17:20:59 +02:00
PiggyPiglet
3a31c5cb78 Merge pull request #485 from PlaceholderAPI/fix/477-remove-gson 
Remove Gson
 2021-04-12 21:40:55 +08:00
PiggyPiglet
20b2a69b5e Merge pull request #558 from PlaceholderAPI/development 
Sync Master branch with Development (Possible Release)
 2021-04-12 21:35:32 +08:00
PiggyPiglet
682717660f Merge pull request #546 from PlaceholderAPI/feature/add-sections 
Add contributing and expansion section
 2021-04-12 21:16:18 +08:00
PiggyPiglet
7b7bfb7306 Merge pull request #543 from ElijahRus250/master 
2021 🥳
 2021-04-12 21:13:38 +08:00
Andre_601
8f796e3940 Add field for logs 2021-03-26 14:53:02 +01:00
Andre_601
bf1527a40f Use id option for error and dump fields 2021-03-26 14:42:20 +01:00
Andre_601
ec127dbeb1 Merge pull request #595 from PlaceholderAPI/docs/wiki 
Sync Development and docs/wiki
 2021-03-24 09:17:58 +01:00
Andre_601
5d80119fcd Merge pull request #594 from PlaceholderAPI/feature/wiki-add-vkautopickup 
Add VKAutoPickup
 2021-03-24 09:14:56 +01:00
Andre_601
f6c972c9a2 Add VKAutoPickup 2021-03-24 09:12:31 +01:00