TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 04:20:41 +00:00
Code Issues Projects Releases Wiki Activity
5678 commits 5 branches 46 tags 420 MiB
Commit graph

5678 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Drkmaster83
9dc58948b2 Implements PR#1516 - TPPos World-Teleport Permissions 
https://github.com/EssentialsX/Essentials/issues/1516
Considerations:
• TPPos on a target doesn't consider the target's world access permissions, reminiscent of the TP A to B command.
 2017-12-25 01:08:08 -06:00
CreedTheFreak
f0b262cbd5
Merge pull request #15 from delbertina/mutes385 
Added 8 new messages for "...Reason" versions of mute messages
 2017-12-23 22:13:57 -08:00
delbertina
ff37ef3bc5 Added reason stuff to msg command and deleted reference line in seen command. Oops! 2017-12-24 00:03:36 -06:00
CreedTheFreak
68fab2c328 Merge branch 'mutes385' of https://github.com/delbertina/Essentials into final_mute_reason_issue#385 
Testing PR Changes
 2017-12-23 22:03:01 -08:00
CreedTheFreak
f9d81c4302 Merge branch 'mutes385' of https://github.com/delbertina/Essentials into final_mute_reason_issue#385 
Testing PR
 2017-12-23 21:51:21 -08:00
Ali Moghnieh
d16e67c51e
Remove debug message. 2017-12-22 20:01:58 +00:00
Ali Moghnieh
5fa2ce7d9e
Consume everything after lore as lore in MetaItemStack. Fixes #1722. 2017-12-22 19:50:33 +00:00
Ali Moghnieh
0a0c45238c
Merge branch '2.x' of github.com:EssentialsX/Essentials into 2.x 2017-12-22 19:46:41 +00:00
delbertina
3d33bbc33d Added 8 new messages for "...Reason" versions of mute messages and implemented em. 2017-12-20 00:35:51 -06:00
Trent Hensler
ea36ee37a2 Use correct value 2017-12-19 00:22:00 -08:00
md678685
a907dab432 Show tempban expiry on join. Fixes #1680 
Outputs a different message with the expiry included.

Add unlocalised tempbanJoin to locale files

Outputs a different message with the expiry included.
 2017-12-19 00:08:42 -08:00
CreedTheFreak
53c604c1b5
Merge pull request #14 from delbertina/mutes385 
Fixed spacing
 2017-12-18 18:53:57 -08:00
CreedTheFreak
2975118e5b Merge branch 'mutes385' of https://github.com/delbertina/Essentials into final_mute_reason_issue#385 2017-12-18 18:40:27 -08:00
delbertina
e3ee9cb4c7 Fixed logic error in hasMuteReason and errors being thrown from seen and whois. 2017-12-18 20:37:34 -06:00
Francois Robinson
9a3b4db387 Added quotes to afk-list-name (#1696) 
The custom text may not parse properly if the quotes are missing. By adding them to the default config, just like on lines `443` & `447`, it will discourage making the typo by mistake.
 2017-12-18 16:40:59 +00:00
CreedTheFreak
297a616460 Merge branch 'mutes385' of https://github.com/delbertina/Essentials into final_mute_reason_issue#385 2017-12-16 23:48:27 -08:00
delbertina
afe0ff0ca7 Added space before reason when a muted player tries to talk. 2017-12-17 01:46:43 -06:00
CreedTheFreak
adf1bc291c Merge branch 'mutes385' of https://github.com/delbertina/Essentials into final_mute_reason_issue#385 2017-12-16 22:27:52 -08:00
delbertina
034ffbd0bc Added space when adding reason to string. 2017-12-17 00:16:06 -06:00
delbertina
127a7bb2ce Merge branch 'mutes385' of https://github.com/delbertina/Essentials into mutes385 
Updated local copy
Conflicts:
	Essentials/src/com/earth2me/essentials/commands/Commandafk.java
	Essentials/src/com/earth2me/essentials/commands/Commandmail.java
	Essentials/src/com/earth2me/essentials/commands/Commandme.java
	Essentials/src/com/earth2me/essentials/commands/Commandr.java
	Essentials/src/com/earth2me/essentials/commands/Commandseen.java
	Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
 2017-12-17 00:02:52 -06:00
delbertina
e8bfac0790 Added space when adding reason to string. Dirty :/ 2017-12-16 23:26:09 -06:00
CreedTheFreak
62d5dd3516 Merge remote-tracking branch 'magnarisa/final_mute_reason_issue#385' into final_mute_reason_issue#385 
Updated my local repos for testing purposes
 2017-12-16 19:43:56 -08:00
CreedTheFreak
bcd66fec39
Merge pull request #12 from delbertina/mutes385 
Address requested changes to formatting and logic
 2017-12-16 19:40:27 -08:00
Trent Hensler
cdabe4a46e Readme update 2017-12-14 12:30:13 -08:00
Trent Hensler
29bc7ca19e Update live support 2017-12-14 12:26:16 -08:00
Trent Hensler
36ee10a52b Add discord and update links in readme 2017-12-14 11:55:28 -08:00
Trent Hensler
1a820ad9b7 Initial removal of item IDs. 
We do not rely on Bukkit's item ids anymore, though we still support them in commands via a mapping built off of the items.csv.
 2017-12-12 22:06:25 -08:00
md678685
dcbc106e62
Fix powertools when clicking in air (#1657) 
Should restore behaviour prior to #1534 and fix #1622.
 2017-12-06 08:37:52 +00:00
Lax
cdf777384e Add server logs to the issue template. (#1669) 2017-12-03 15:26:39 +00:00
delbertina
849b329213 Changed if else blocks to ternary operators. Not sure if way to avoid weird empty string usage. 2017-12-02 20:35:44 -06:00
delbertina
d555c1b081 Added method hasMuteReason in UserData. 2017-12-02 19:46:46 -06:00
delbertina
43cbab37f0 Changed muteFormat to muteReason. 
Removed space at beginning of muteReason.
 2017-11-26 01:32:22 -06:00
delbertina
6f7af90488 Fixed easy style issues. 2017-11-26 00:55:05 -06:00
md678685
3a6f04e461
Fix Commandclearinventoryconfirmtoggle class 2017-11-15 18:17:29 +00:00
Marten
d36f6e45de Added 4 messages to messages_NL (#1629) 
Added 4 missing messages to the language file.
Only did those that were also found in the EN file.
 2017-11-14 10:49:45 +00:00
Ali 'SupaHam' M
f8ddb50140
Rename Commandclearconfirmtoggle.java to Commandclearinventoryconfirmtoggle.java 2017-11-13 12:46:15 +00:00