Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-20 09:36:19 +01:00
Code Issues Projects Releases Wiki Activity
5,466 Commits 10 Branches 68 Tags 427 MiB
8b7bcbb880
Commit Graph

5466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
md678685
8b7bcbb880 Don't update user activity on physical interactions 
Fixes #2578.
 2019-06-17 11:06:45 +01:00
md678685
dbd86155fb Only accept square recipes in /condense 
Fixes #1194.
 2019-06-16 13:28:02 +01:00
md678685
9b77c0802b
Switch Travis to openjdk8 2019-06-16 11:25:25 +01:00
md678685
cd7fa79560
Don't warn about CloudNet SLPEs 
Fixes #2592.
 2019-06-16 11:13:32 +01:00
md678685
10e9879a64
Update to 1.14.x (#2510) 
Add support for Spigot/Paper 1.14.2.
 2019-06-16 10:15:12 +01:00
md678685
d1dcc47a27
Specify Java 8 for Travis build 
Required due to BuildTools not supporting Java 9 or above for MC 1.8.x.
 2019-06-16 10:12:35 +01:00
Pokechu22
7a73301a37 Add permissions for individual colors (#1441) 
* Add tests for existing format behavior

* Replace formatting implementation

* Add permissions for individual color codes

Resolves #415

* Use format code names

* Fix escaping

* Mockito: test scope only

* Explicitly check the .magic permission

Once I switch to checking if a perm's set in the loop, the explicit check is needed for an * perm.

* Add support for removing individual colors

* Use `obfuscated` as the name for §k

`magic` is still accepted as the group name, so this is not a breaking change.
 2019-06-09 15:56:58 +01:00
md678685
e1dec7d9e7
Fix items.json merging 2019-06-09 15:34:24 +01:00
md678685
99fefdb47d
Re-add header to items.json 2019-06-09 15:18:16 +01:00
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
5a0b7285d4
Add FUNDING.yml Patreon link 2019-06-09 13:04:51 +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
md678685
2ea3d8943e Update outdated meme 2019-05-30 19:34:18 +01:00
Drew Mitchell
e4cc78a750 Implement PR #1682 - TPA Event (#1727) @DrewAMitchell 
* Attempts to implement #1682 - TPARequestEvent
Awaiting further feedback. I've implemented the event, and elected to send a message to the requester of the TPA when the event gets cancelled.
* Fix formatting
* Fix up l18s errors, remove todos
* Clean up for merge
 2019-05-30 19:17:57 +01:00
md678685
a08832cfc8
Implement /itemname command (#2573) 
Implement /itemname command, across three PRs. Originally implemented by SupaHam, and updated by zsturgess and myself.
 2019-05-30 19:16:43 +01:00
md678685
c97918df24 Add safe-usermap-names option to control usermap key sanitisation 
This is necessary to stop players with Chinese characters in their username losing their balances.
 2019-05-30 18:50:51 +01:00
Glare
e9833d1cd2 Implement essentials.balancetop.exclude permission (#2499) 
Closes #595.
 2019-05-30 15:20:30 +01:00
md678685
111a18585d Allow clearing item names + add locale messages for /itemname 2019-05-30 15:12:52 +01:00
Zac Sturgess
155d3ec938 Update /itemname in plugin.yml 
This contains changes from #2555 squashed into one commit.

Closes #2555.
 2019-05-30 14:53:15 +01:00
Ali Moghnieh
8bafacbd51 Create /itemname command that names held items. 
This contains changes from #672 minus messages, squashed into one commit.

Closes #672.
 2019-05-30 14:53:06 +01:00
montlikadani
0e3f48ee54 Improve disposal, /bigtree and /fireball (#2461) @montlikadani 
* Allow the Disposal inventory title to be configurable
* Add darkoak to `/bigtree`'s usage message
* Allow potions to be fired with `/fireball`

## Commits
* Update plugin.yml
* Update Commanddisposal.java
* Update messages.properties
* Update Commandfireball.java
* Update SignDisposal.java
* Fix import
* Remove colour code from disposal message
 2019-05-30 14:03:12 +01:00
Trent Hensler
b566b4a0c6 Update translations from Crowdin (#2571) 
* New translations messages.properties (German)
* New translations messages.properties (Romanian)
* New translations messages.properties (Korean)
* New translations messages.properties (Latvian)
* New translations messages.properties (Lithuanian)
* New translations messages.properties (Norwegian)
* New translations messages.properties (Polish)
* New translations messages.properties (Portuguese)
* New translations messages.properties (Portuguese, Brazilian)
* New translations messages.properties (Russian)
* New translations messages.properties (Italian)
* New translations messages.properties (Serbian (Cyrillic))
* New translations messages.properties (Serbian (Latin))
* New translations messages.properties (Slovak)
* New translations messages.properties (Spanish)
* New translations messages.properties (Swedish)
* New translations messages.properties (Thai)
* New translations messages.properties (Turkish)
* New translations messages.properties (Japanese)
* New translations messages.properties (Icelandic)
* New translations messages.properties (Dutch)
* New translations messages.properties (Bulgarian)
* New translations messages.properties (Vietnamese)
* New translations messages.properties (French)
* New translations messages.properties (Hungarian)
* New translations messages.properties (English, United Kingdom)
* New translations messages.properties (English, United States)
* New translations messages.properties (Basque)
* New translations messages.properties (Bosnian)
* New translations messages.properties (Chinese Simplified)
* New translations messages.properties (Hebrew)
* New translations messages.properties (Chinese Traditional)
* New translations messages.properties (Chinese Traditional, Hong Kong)
* New translations messages.properties (Croatian)
* New translations messages.properties (Czech)
* New translations messages.properties (Danish)
* New translations messages.properties (Estonian)
* New translations messages.properties (Finnish)
* New translations messages.properties (Greek)
* New translations messages.properties (Ukrainian)
 2019-05-28 17:56:17 +01:00
md678685
a9ed66d5e0
Add essentials.keepinv to plugin.yml 2019-05-28 12:24:07 +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
minksuki
a1297feb9d adds a permission node that keeps a player's inventory on death (#2531) @minksuki 
Closes #2524.

Adds a permission node, `essentials.keepinv` so on player death their inventory will not be wiped.
 2019-05-15 07:59:48 +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
Julian van Doorn
d107d00ac3 Fix spawning shields with enchantments (#2515) @Argetan 
* Moved comment to newline for style consistency.
* Fixed issue 2507 by checking if an enchantment is being applied.
* Added a couple newlines for readability.
* Removed faulty ifs).
 2019-05-12 13:50:35 +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