Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-22 17:18:37 +01:00
Code Issues Projects Releases Wiki Activity
5,442 Commits 10 Branches 68 Tags 435 MiB
5ebce8965e
Commit Graph

5442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
md678685
5ebce8965e
Merge 1.13 and 1.14 items.json together 
In 2.17.0, [essx-scripts genItemsFlat](https://github.com/md678685/essx-scripts/blob/master/src/genItemsFlat.js) is being replaced with [ItemDbGenerator](https://github.com/md678685/ItemDbGenerator). To ease migration, this is a file generated by merging the 1.14 entries from the new generator into the existing 1.13 file. This will be replaced by an items.json generated entirely by ItemDbGenerator eventually.
 2019-06-09 15:10:12 +01:00
md678685
829110e89a Implement missing OfflinePlayer methods 2019-06-09 12:59:32 +01:00
md678685
dc1a0b65fa Merge branch 'mc/1.14' of https://github.com/EssentialsX/Essentials into mc/1.14 2019-06-09 12:58:06 +01:00
md678685
b140826e60
Remove unused import in MaterialUtil 2019-06-09 12:21:40 +01:00
md678685
0d9387458d
Remove unused import in AFK event 2019-06-09 12:21:25 +01:00
md678685
f2447a9134 Add fallbacks property to ItemData 
Allows items.json to specify fallback names for materials on older versions.

Additionally make non-API methods inaccessible, as they shouldn't be needed by other plugins.
 2019-05-31 15:57:51 +01:00
Josh Roy
94131edb32 Bump Bukkit to 1.14.2 (#2569) 
* Bump to API 1.14.2

* Update v1_14_2_R01 as latest supported 1.14 build
 2019-05-27 23:12:23 +01:00
md678685
e21863956c Fix checking for attached wall signs 2019-05-27 11:51:56 +01:00
md678685
4201e6ef85 Make all events async when not on primary thread 
Fixes #2566, fixes #2556, fixes #2545.
 2019-05-26 12:08:58 +01:00
Trent Hensler
5deb1de555 Allow AFK status test to pass. 2019-05-22 12:06:27 -07:00
md678685
c65534ebb1 Only make AfkStatusChangeEvent async when off primary thread 2019-05-22 11:39:26 +01:00
md678685
f22efce3ca Use MobCompat entries for other 1.11+ mobs 2019-05-18 23:51:40 +01:00
md678685
5f0909047d Use MobCompat.CAT throughout MobData 2019-05-18 22:45:43 +01:00
md678685
7cc4dc2f07 Make AfkStatusChangeEvent async 2019-05-18 20:56:57 +01:00
md678685
60ebe9e738 Add llama colour support; improve support for old game versions 
Fixes issues with /spawnmob on older versions of the game.

(Also add llama colours, which were missing from the 1.11 update.)
 2019-05-18 20:56:34 +01:00
Josh Roy
09598d0173 Update Bukkit to 1.14.1 (#2544) 
* Update v1_14_1_R01 as latest supported 1.14 build

* Bump to API 1.14.1
 2019-05-14 09:00:22 +01:00
md678685
35fc845040
Fix Metrics plugin name reporting 2019-05-13 19:15:33 +01:00
md678685
e59950966f
Fix Metrics package name 2019-05-13 19:14:01 +01:00
md678685
98cc5b33a3 Update bStats Metrics to latest version 
Now featuring server brand support!
 2019-05-12 16:17:00 +01:00
md678685
ccc000a416 Add Villager variants, pt 2 2019-05-09 22:20:45 +01:00
md678685
7790f8818b Add Villager variants, pt 1 2019-05-09 15:12:51 +01:00
JRoy
72ca629cf1 Add 1.14 Enchantments 2019-05-09 13:36:09 +01:00
md678685
65017d7f5c Fix /kittycannon 
The most important command of all!

(This hasn't been tested with 1.13 or below yet.)
 2019-05-08 23:29:55 +01:00
md678685
6d4f7afc79 Improve VersionUtil prerelease handling 
Actually includes updated regex this time! (I have no idea how I forgot to update it in cfba203981 - I had already written out the regex)

Incorporates part of https://github.com/EssentialsX/Essentials/pull/2523 - thanks @JRoy.
 2019-05-08 23:26:40 +01:00
md678685
4fcb032791 Update FakeServer 2019-05-08 23:23:15 +01:00
md678685
0e668fa0f2 Fix plural suffixes for fish and foxes 2019-05-08 23:06:50 +01:00
md678685
68b933a501 Add Ocelot.Type fallbacks for all MobCompat.CatTypes 2019-05-08 23:06:28 +01:00
md678685
5236ad9f64 Remove redundant BABY_FOX 2019-05-08 22:56:25 +01:00
md678685
937c18fe1d Update FakeWorld 2019-05-08 22:43:57 +01:00
md678685
fb48aaba9d Initial cross-version mob compatibility 
Incorporates part of https://github.com/EssentialsX/Essentials/pull/2523 - thanks @JRoy.
 2019-05-08 22:40:51 +01:00
md678685
365efe4f2d Implement missing FakeWorld and OfflinePlayer methods 2019-05-08 13:49:54 +01:00
md678685
78b2dba42a Bump to API 1.14 2019-05-08 13:49:35 +01:00
md678685
c567bc22e9 Compile against 1.14-pre5 2019-04-24 14:30:53 +01:00
md678685
d282462547 Use MaterialUtil to check signs 2019-04-24 14:28:15 +01:00
md678685
af4cfd3fe9 Update bStats Metrics to use Gson 2019-04-24 13:54:33 +01:00
md678685
cfba203981 Add prerelease support to VersionUtil 2019-04-24 13:37:43 +01:00
Glare Masters
d680ed7363 Check /tpacancel permissions before sending message (#2498) 
Fixes #1354.
 2019-04-23 09:22:50 +01:00
md678685
69232c0717
Fix missing formatting code in geoipCantFind 2019-04-22 15:24:31 +01:00
latiku
b4baa28f01 fix geoip country returning "." if the user is joining from localhost (#2494) @latiku 
Implements a check to see if the user's address is `localhost` or `127.0.0.1`, and if so return that the country is unknown.

**Edit by @md678685: fixes #2471.**
 2019-04-22 09:38:06 +01:00
md678685
0aa11b58b9 Update items.json 
Updated to md678685/essx-scripts@e6394a2884

* Fix overlapping armor/wooden pressure plate aliases
 2019-04-19 15:10:10 +01:00
md678685
7b60b562b9 Update items.json 
Update items.json to md678685/essx-scripts@581db130ef

Changes:
* Add pressure plate aliases
* Add "mushroomcow" aliases for mooshroom spawners
* Add zombie pigman spawner aliases
 2019-04-19 14:49:36 +01:00
montlikadani
6377cbfb2b Remove stale messages and add/change formatting in others (#2486) 2019-04-18 13:25:25 -04:00
montlikadani
3f5f9cc717 Fixed when the mail has already cleared (#2063) 2019-04-18 13:18:42 -04:00
Johnny Cao
eac1e9b574 Fixes #1928 - Auto-AFK issue: AFK timer not reset on disconnect (#2458) 
Update activity regardless of cancel-afk-on-interact setting
 2019-04-17 20:45:07 -04:00
Glare Masters
26d63da7aa [Feature] Implemented a message to say teleporting to home. (#2489) 
[Feature] Implemented a message to say teleporting to home.
 2019-04-17 19:14:44 -04:00
Joseph Hirschfeld
722181439e
Merge pull request #1953 from Xeyame/#1899 
Expand /exp command
 2019-04-17 12:18:58 -04:00
Joseph Hirschfeld
ddcb7041f1
Merge pull request #2455 from AgentTroll/patch-94 
Fixes #94 - Player with same first letters conflict
 2019-04-17 02:46:20 -04:00
Joseph Hirschfeld
8af33e0ae2
Merge pull request #2166 from mathiascode/commandevents 
Use chat instead of dispatchCommand
 2019-04-17 02:33:29 -04:00
Joseph Hirschfeld
d01e12ac14
Merge pull request #2158 from pop4959/near-fix 
Sort /near by nearest player.
 2019-04-17 02:31:38 -04:00
Joseph Hirschfeld
8c0aa840ab
Merge pull request #1949 from Ichbinjoe/2.x_feature_jail_no_teleport 
[Feature] Add config optn. to disable jail free tp
 2019-04-17 02:04:16 -04:00