Josh (Vicarious) 719172c185 Merge branch 'master' into master		2019-06-30 21:40:51 -07:00
..
java/me/clip/placeholderapi	Merge branch 'master' into master	2019-06-30 21:40:51 -07:00
resources	We don't even need an api version. It breaks stuff..	2019-05-10 10:48:40 -04:00