SpigotMC-Mirrors/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI synced 2025-10-31 06:12:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
919 Commits 17 Branches 19 Tags
83261eee49b7efb4ff0317e023750e38f791386f
Commit Graph

919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Starmism
4c968f012d Cleanup build.gradle 
(cherry picked from commit 7750ba7033)
 2021-06-30 05:59:22 -06:00
Andre_601
ba71486151 Merge pull request #655 from LOOHP/docs/wiki 
Update InteractionVisualizer placeholders
 2021-06-30 11:35:46 +02:00
LOOHP
e1269d6c86 Update InteractionVisualizer placeholders 2021-06-30 13:48:22 +08: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
aa9ac65d02 Merge pull request #650 from SaltyAimbOtter/patch-1 
update BetonQuest docs link
 2021-06-25 23:34:36 +02:00
SaltyAimbOtter
ba983f7fb3 update BetonQuest docs link 2021-06-25 23:23:04 +02: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
Andre_601
2c223ffc87 Merge pull request #647 from cj89898/docs/wiki 
Added 2.3.0 Checkitem changes
 2021-06-20 18:38:27 +02:00
cj89898
5571ba5d70 Added 2.3.0 Checkitem changes 2021-06-20 10:49:28 -05:00
Andre_601
b77b1b9649 Update Placeholders.md 2021-06-17 14:49:16 +02:00
Andre_601
bf9b34eb57 Merge pull request #645 from stumper66/docs/wiki 
LevelledMobs Wiki Addition
 2021-06-17 14:45:07 +02:00
Penal Buffalo
215fd7e3f0 Update wiki/Placeholders.md 
Co-authored-by: Andre_601 <11576465+Andre601@users.noreply.github.com>
 2021-06-17 07:44:14 -05:00
stumper66
aca624c2d3 LevelledMobs 
Added LevelledMobs info to the wiki
 2021-06-17 07:26:07 -05:00
Andre_601
5826390251 Merge pull request #642 from garagepoort/feature/add_staffplusplus_wiki 
Add staff++ to the wiki
 2021-06-15 21:59:55 +02:00
David Maes
a91a5c85ba Better phrasing 2021-06-15 21:57:47 +02:00
David Maes
156243a549 Add staff++ to the wiki 2021-06-15 21:52:32 +02:00
Andre_601
eceb236121 Merge pull request #640 from cj89898/docs/wiki 
Update Placeholders.md
 2021-06-11 11:43:03 +02:00
darbyjack
71b5433326 Initial 1.17 Changes 2021-06-11 01:33:29 -05:00
cj89898
2c8314200f Update Placeholders.md 
Added 2.2.0 checkitem placeholder
 2021-06-10 21:52:36 -05:00
Andre_601
0b70ea61aa Merge pull request #639 from darbyjack/docs/wiki 
Added in some missing placeholders for Player Expansion
 2021-06-09 16:00:38 +02:00
darbyjack
ac31e107ad Added in some missing placeholders 2021-06-09 08:58:49 -05:00
Andre_601
b9230ef9c5 Merge pull request #631 from broken1arrow/docs/wiki 
Docs/wiki
 2021-05-13 14:58:20 +02:00
broken1arrow
06e6765870 Try for the 10 times to make it right 
See if this work better
 2021-05-13 14:45:46 +02:00