Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-10-07 12:09:15 +02:00
Code Issues Projects Releases Wiki Activity
5,414 Commits 10 Branches 68 Tags 420 MiB
c97918df24
Commit Graph

5414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
delbertina
c65b7b6462 Fixed error in sorting with number in message name and newlines at end of files. 2018-01-18 21:52:30 -06:00
Trent Hensler
ace361af60 Compile against 1.13 preview. 
Still a lot of work to do. One thing to note is that I used LEGACY materials in a few spots where I didn't know what the new ones are as I'm not very familiar with the 1.13 update and what it changes.
 2018-01-18 17:52:44 -08:00
delbertina
67528b25a8 Sorted messages files with the -f option 2018-01-18 15:18:22 -06:00
Trent Hensler
d4138ce843 Match default to what's in the config. Resolves #1775 2018-01-18 10:34:02 -08:00
Trent Hensler
377c716d52 Add itemflag support to kits. Resolves #795. 
Syntax is "itemflags:HIDE_ATTRIBUTES,HIDE_ENCHANTS"
 2018-01-18 00:26:40 -08:00
Trent Hensler
cd43355d4c
Move kits to kits.yml (#1774) 
* Move kits to kits.yml
We will now use a separate kits.yml file.
Any kits that were defined in the config.yml will be migrated over to the kits.yml file automatically on startup.
 2018-01-18 00:25:00 -08:00
CreedTheFreak
b096ee9703 Merge remote-tracking branch 'delbertina/mutes385test' into final_mute_reason_issue#385 
Merged changes into local branch for pushing up to the pull request of
mute reason.
 2018-01-16 17:49:49 -08:00
delbertina
9e2bb0b277 Rebase with sorted messages 2018-01-16 19:27:45 -06:00
CreedTheFreak
b8df59ae46 Updated the former pull request to include the specified formatting changes, and small edits to the hasMuteReason and Commandmute dealing with the muteReason. I also included the ability to see the mute reason from the seenOffline method which is identical to the seenOnline code. 2018-01-16 18:21:31 -06:00
delbertina
98f42c6974 Added reason stuff to msg command and deleted reference line in seen command. Oops! 2018-01-16 18:16:34 -06:00
delbertina
db19788e21 Added 8 new messages for "...Reason" versions of mute messages and implemented em. 2018-01-16 18:16:33 -06:00
delbertina
67d17472e0 Fixed logic error in hasMuteReason and errors being thrown from seen and whois. 2018-01-16 18:04:22 -06:00
delbertina
f68a6eb00d Added space before reason when a muted player tries to talk. 2018-01-16 18:04:22 -06:00
delbertina
b5a6df4fe2 Added space when adding reason to string. 2018-01-16 18:04:21 -06:00
delbertina
290379651d Added space when adding reason to string. Dirty :/ 2018-01-16 17:59:14 -06:00
delbertina
6ffbb86169 Changed if else blocks to ternary operators. Not sure if way to avoid weird empty string usage. 2018-01-16 17:54:50 -06:00
delbertina
d8b6f87087 Added method hasMuteReason in UserData. 2018-01-16 17:54:50 -06:00
delbertina
7aad95ec08 Changed muteFormat to muteReason. 
Removed space at beginning of muteReason.
 2018-01-16 17:54:49 -06:00
delbertina
574e1bc1e7 Fixed easy style issues. 2018-01-16 17:48:12 -06:00
CreedTheFreak
081c6f0263 Update plugin.yml mute command usage 2018-01-16 17:48:11 -06:00
delbertina
fc590f82a2 Added check to display mute reason when notifying 2018-01-16 17:48:10 -06:00
delbertina
729af4bb4d Added mute format to all msg files 2018-01-16 17:48:09 -06:00
CreedTheFreak
c8cb9b3735 fixed some wonky commit thing that happened, thus the following modifications are brought to you by Delbertina. 2018-01-16 17:21:54 -06:00
CreedTheFreak
4f8ea06db1 We have added the ability for the Mute to contain a reason, which is stored for the duration of the mute in the user's data file. Currently we need to add in the mute reason code into some other commands such as /afk and /me and /seen ect. We will also need to fix a problem with the reason when we dont add in a time frame for the mute, which should mute the player indefinatly rather then cancelling the mute and throwing a DataFormat exception. 2018-01-16 17:21:53 -06:00
CreedTheFreak
9378df0ff2 Started work on implementing the mute reason, and decided to write it to the UserData just like the Ban and TempBan reasons 2018-01-16 17:21:52 -06:00
Trent Hensler
1f0f77ff72
Merge pull request #1757 from SupaHam/fix-metaitemstack-keyword-replacer 
Allow KeywordReplacer to input replacements with underscore spacers.
 2018-01-16 15:12:45 -08:00
Trent Hensler
147c5e0ddf
Merge branch '2.x' into fix-metaitemstack-keyword-replacer 2018-01-16 15:11:05 -08:00
DoNotSpamPls
1518db17f8 Delete .travis.yml (#1739) 2018-01-16 15:39:12 +00:00
Johnny Cao
ef1e57f445 Performs pagination bounds check. Fixes #1509 (#1754) 
Adds pagination bounds check Fixes #1509
 2018-01-16 12:56:39 +00:00
Johnny Cao
87c6672212 Add ignore check for /me (#1768). Resolves #1767 2018-01-16 12:33:35 +00:00
Leomixer17
ab087e941e Update messages_cs.properties (#1760) @Leomixer17 
Based on #1664 - thanks to @Uranusak for submitting the original PR.
 2018-01-11 18:21:20 +00:00
Leomixer17
4f70d623a1 Update messages_pl.properties (#1759) 
Includes translations by @RikoDEV.
 2018-01-07 17:51:53 +00:00
md678685
ba143f8657
Move instructions to top of issue template 
People weren't reading them when they were at the bottom, so they have been moved to the top to encourage people to read them. This has the tradeoff of filling up the Discord webhook embed, so I've added another instruction that doubles as proof of reading the instructions.
 2018-01-07 14:55:25 +00:00
Ali Moghnieh
b6aea0a5f8
Fix splash potion support for /potion. Resolves #1166 2018-01-07 02:22:31 +00:00
Drew Mitchell
50e2d27d5b Fix NPE in /clearinventory. Fixes #1755 (#1756) 
Issue was a NullPointerException due to senderUser not being null-checked. I opted to place the couple of lines of code into the sender.isPlayer() check as opposed to null-checking.
 2018-01-07 01:45:19 +00:00
Ali Moghnieh
f0bf359df3
Allow KeywordReplacer to input replacements with underscore spacers. 
Resolves #1725 and provides a less breaking fix for #1722.

----

Revert "Consume everything after lore as lore in MetaItemStack. Fixes #1722."

This reverts commit 5fa2ce7d9e.
 2018-01-07 01:22:42 +00:00
Marten
fd6717d06d Fixed a spelling mistake (#1752) @MartenM 
Saw this when using the Dutch language file. Decided to update it.
 2018-01-06 20:02:39 +00:00
Leomixer17
126046a039 Added missing translations (#1704) 
* Added missing translations

* Update messages_da.properties

* Update messages_da.properties

* Update messages_de.properties

* Update messages_en.properties

* Update messages_es.properties

* Update messages_et.properties

* Update messages_fi.properties

* Update messages_fr.properties

* Update messages_hu.properties

* Update messages_ko.properties

* Update messages_lt.properties

* Update messages_nl.properties

* Update messages_nl.properties

* Update messages_pt.properties

* Update messages_pt_BR.properties

* Update messages_ro.properties

* Update messages_ru.properties

* Update messages_sv.properties

* Update messages_tr.properties

* Update messages_zh.properties

* Update messages_zh_HK.properties

* Update messages_zh_TW.properties

* Update messages.properties

* Update messages_da.properties

* Update messages_de.properties

* Update messages_en.properties

* Update messages_es.properties

* Update messages_et.properties

* Update messages_fi.properties

* Update messages_fr.properties

* Update messages_hu.properties

* Update messages_ko.properties

* Update messages_lt.properties

* Update messages_nl.properties

* Update messages_pt.properties

* Update messages_pt_BR.properties

* Update messages_ro.properties

* Update messages_ru.properties

* Update messages_sv.properties

* Update messages_tr.properties

* Update messages_zh.properties

* Update messages_zh_HK.properties

* Update messages_zh_TW.properties
 2018-01-06 19:59:50 +00:00
seema84
6705513cb3 Add [world] to /tppos usage (#1744) 2018-01-03 20:39:12 +00:00
Leomixer17
28fb18b6c7 Added a missing translation to messages_it.properties (#1740) 2018-01-02 10:18:36 +00:00
Leomixer17
17bb5fe1da Update messages_it.properties (#1656) 
* Update messages_it.properties

* Added missing translation

* Fixed double "="
 2018-01-02 00:33:55 +00:00
md678685
3e908b9c01
Update issue template to give clearer instructions 2017-12-31 18:18:28 +00:00
Trent Hensler
8977425475
Merge pull request #1734 from N3FS/sort-messages 
Sort messages keys alphabetically
 2017-12-29 13:49:30 -06:00
Dylan Keir
8f92e3f217 Fix JDK9 issue (#1713) 2017-12-29 14:46:09 +00:00
md678685
f07f132cfd Sort messages keys alphabetically 2017-12-28 13:56:14 +00:00
CreedTheFreak
3444c8b0d6 Merge branch 'mute_reason_changes' into final_mute_reason_issue#385 
Updating local changes made on mute_reason_changes into the final branch
 2017-12-26 17:20:40 -08:00
CreedTheFreak
822315a279 Updated the former pull request to include the specified formatting changes, and small edits to the hasMuteReason and Commandmute dealing with the muteReason. I also included the ability to see the mute reason from the seenOffline method which is identical to the seenOnline code. 2017-12-26 16:09:46 -08:00
CreedTheFreak
732da86710 Merge remote-tracking branch 'magnarisa/final_mute_reason_issue#385' into mute_reason_changes 
Updated a clean branch with the changes we have made so far.
 2017-12-26 08:23:53 -08:00
CreedTheFreak
5fbc412542 Merge remote-tracking branch 'upstream/2.x' into final_mute_reason_issue#385 2017-12-26 08:16:46 -08:00
Trent Hensler
cd7e0963ce
Merge pull request #1724 from Drkmaster83/2.x 
Implements PR#1516 - TPPos World-Teleport Permissions
 2017-12-25 18:24:01 -06:00