minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-09-02 19:22:37 +02:00
Code Issues Releases Wiki Activity
3,194 Commits 7 Branches 42 Tags
3.x
Commit Graph

3194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ementalo
6488882e1a Merge branch 'master' into 3.0 
Conflicts:
	Essentials/src/com/earth2me/essentials/Essentials.java
	Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
	Essentials/src/com/earth2me/essentials/ISettings.java
	Essentials/src/com/earth2me/essentials/Settings.java
	Essentials/src/com/earth2me/essentials/Teleport.java
	Essentials/src/com/earth2me/essentials/User.java
	Essentials/src/com/earth2me/essentials/UserData.java
	Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java
	Essentials/src/com/earth2me/essentials/commands/Commandban.java
	Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java
	Essentials/src/com/earth2me/essentials/commands/Commandessentials.java
	Essentials/src/com/earth2me/essentials/commands/Commandexp.java
	Essentials/src/com/earth2me/essentials/commands/Commandhat.java
	Essentials/src/com/earth2me/essentials/commands/Commandignore.java
	Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
	Essentials/src/com/earth2me/essentials/commands/Commandmail.java
	Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
	Essentials/src/com/earth2me/essentials/commands/Commandpay.java
	Essentials/src/com/earth2me/essentials/commands/Commandr.java
	Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
	Essentials/src/com/earth2me/essentials/commands/Commandtpa.java
	Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
	Essentials/src/com/earth2me/essentials/commands/Commandvanish.java
	Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
	Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java
	Essentials/src/items.csv
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
	EssentialsChat/src/plugin.yml
	EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java
	EssentialsSpawn/src/plugin.yml
	lib/bukkit.jar
	lib/craftbukkit.jar
 2012-06-25 23:07:37 +01:00
ementalo
f8bb4d058d Merge fixes 2012-06-25 22:24:10 +01:00
ementalo
283a9ce9fa Merge branch 'master' into 3.0 
More to follow

Conflicts:
	Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
	Essentials/src/com/earth2me/essentials/Kit.java
	Essentials/src/com/earth2me/essentials/Teleport.java
	Essentials/src/com/earth2me/essentials/User.java
	Essentials/src/com/earth2me/essentials/UserData.java
	Essentials/src/com/earth2me/essentials/commands/Commandfly.java
	Essentials/src/com/earth2me/essentials/commands/Commandgod.java
	Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
	Essentials/src/com/earth2me/essentials/commands/Commandkit.java
	Essentials/src/com/earth2me/essentials/commands/Commandmute.java
	Essentials/src/items.csv
	Essentials/src/messages.properties
	Essentials/src/messages_cs.properties
	Essentials/src/messages_da.properties
	Essentials/src/messages_de.properties
	Essentials/src/messages_en.properties
	Essentials/src/messages_es.properties
	Essentials/src/messages_fr.properties
	Essentials/src/messages_it.properties
	Essentials/src/messages_nl.properties
	Essentials/src/messages_pl.properties
	Essentials/src/messages_pt.properties
	EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java
	EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java
	EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
 2012-06-25 22:01:59 +01:00
ementalo
0395b5d222 Revert "add essentials.keepxp to allow a player to keep their level after death." 
This reverts commit 3b25235755.
 2012-06-25 21:40:22 +01:00
Iaccidentally
3b25235755 add essentials.keepxp to allow a player to keep their level after death. 2012-06-24 23:27:30 -04:00
KHobbits
4d17b73291 Revert "fix /back resetting on logout" 
This is desired behavior, and required for other features.
This reverts commit 329f93a4f6.
 2012-06-23 13:33:36 +01:00
md-5
f7a34c49fb Merge pull request #89 from necrodoom/patch-7 
major slab alias expansion for items.csv
 2012-06-23 02:07:34 -07:00
necrodoom
d0a8dc4812 major slab alias expansion for items.csv 2012-06-23 12:02:28 +03:00
Alexander Schepp
0466a60093 Too much space :D 2012-06-22 20:12:56 +03:00
Alexander Schepp
2c6a81a916 Prevent NPEs in KeywordReplacer 2012-06-22 19:16:40 +03:00
Iaccidentally
329f93a4f6 fix /back resetting on logout 2012-06-22 03:44:19 -04:00
ementalo
7ce9e42f35 Missing user methods 2012-06-21 19:35:48 +01:00
md-5
b70f950479 Merge pull request #88 from SyntaxBlitz/master 
Fix /vanish with no arguments doing nothing
 2012-06-21 04:31:18 -07:00
Timothy Aveni
38a2e2bcfd Fix /vanish with no arguments doing nothing 2012-06-21 06:17:26 -04:00
md-5
d9b91e0c34 Merge pull request #87 from necrodoom/patch-5 
updated items.csv, 43:4, 43:5, 44:4, 44:5
 2012-06-21 03:03:39 -07:00
necrodoom
4ae5579068 while enraged at mibbit and esper failing to work, updated items.csv 2012-06-21 12:18:14 +03:00
md_5
f1a7be09c2 Merge remote-tracking branch 'origin/groupmanager' 2012-06-21 18:27:21 +10:00
md_5
0742ca23c1 Update Czech translation. 2012-06-21 18:18:57 +10:00
Iaccidentally
8823ce070e change some default values 2012-06-21 05:05:22 -03:00
Iaccidentally
d77f6cbbf1 fixxy fixxy 2012-06-19 18:13:47 -04:00
Iaccidentally
909c8b3cb5 Add Finnish translation 2012-06-19 18:02:05 -04:00
Iaccidentally
5b7d29fa55 Merge branch 'master' of https://github.com/essentials/Essentials 2012-06-19 17:56:43 -04:00
KHobbits
8dfb3c03c7 *borrows snowleo's strainer* 2012-06-19 20:57:40 +01:00
Iaccidentally
6e8031f477 Merge branch 'master' of https://github.com/essentials/Essentials 2012-06-19 12:48:55 -04:00
Paul A.
81c545f45b Merge pull request #86 from necrodoom/patch-4 
adding beef and steak to items.csv - thanks @necrodoom
 2012-06-19 07:13:37 -07:00
KHobbits
65025d47c5 Little safety check for bad plugins. 2012-06-19 09:03:37 +01:00
KHobbits
4f23e8aaeb Patch to allow plugins to use ignore lookup, without updating their own code. 2012-06-19 08:59:26 +01:00
KHobbits
aea2c00a95 Add optional 2n'd param to temp ban reason TL key. 2012-06-19 08:46:33 +01:00
necrodoom
eafe0380e1 hotfix before 2.9.2 release 2012-06-19 10:04:13 +03:00
ementalo
bfbec1c46c Remove fake explosion. 
Missing bits of commandr
 2012-06-18 15:51:48 +01:00
ementalo
3975ceb2a0 Fixing vanish on off arguments 2012-06-18 15:35:21 +01:00
ementalo
89eca7d991 2.9 Merges 
Make /vanish follow the same rules as /fly, /god and /gamemode
Add espawn to plugin.yml
Allow your hat to be removed with /hat remove
void silent command failures on /hat (ie typing /hat fish will no longer silently return as if broken)
Fix /exp so it can be used in the console
Using /exp, show can't find player message, if no matching player is found

Replace op ignore exempt with ignore exempt chat permission:
essentials.chat.ignoreexempt
This permission won't prevent a player from ignoring the player, but the player will see the chat messages anyway.
Fix chat showing [spy] prefix when social spy was not required to see the message
Players should not be able to ignore Console
Also implement chat exempt permission in other commands.
Prevent joinbots from triggering join code, unless they are actually connected to the server and online.
 2012-06-18 13:55:25 +01:00
ementalo
88e7e684af Messing around with whois syntax (TL's probably need some love) 2012-06-18 13:06:32 +01:00
ementalo
faea8af22e Adding mute status to /whois 2012-06-18 12:57:56 +01:00
ementalo
6db7de9c4d Enchantments update 2012-06-18 12:53:53 +01:00
ementalo
16f9163c45 Fix vanish 2012-06-18 12:52:36 +01:00
ementalo
8bdcec9072 Big boolean cleanup 2012-06-18 12:16:21 +01:00
ementalo
933d648ef6 3 char min length on /pay and /msg 
Make /whois throw an error if no matching players are found.
 2012-06-18 12:13:58 +01:00
ementalo
93246f020f Pass the actual player object to Bukkit. 
Add the list that hides vanished players
 2012-06-18 12:05:41 +01:00
ementalo
492239724c Broadcast command allows colour formatting. 2012-06-18 12:01:17 +01:00
ementalo
8cc61d3b33 Fix /lightning <player> <damage> to actually deal the proper set damage (5 or 25% by default) 2012-06-18 12:00:16 +01:00
ementalo
6677f75c52 Fix /essentials command to not show command debugging if there were no conflicts 2012-06-18 11:58:14 +01:00
ementalo
cfbfd5ee46 Try to be a little more sensible with stored cooldowns. 2012-06-18 11:54:40 +01:00
ementalo
ca21b92762 Fix /mute to follow same convention as /tjail 
Fixed #2056
 2012-06-18 11:39:27 +01:00
ementalo
962d49517b Missing event aborts in sign code. 2012-06-18 11:25:51 +01:00
ementalo
5545553345 Fix bug with /remove and minecarts 2012-06-18 11:22:39 +01:00
ementalo
dd8a3cfa4f Allow syntax: /god <player> <on/off> 2012-06-18 11:21:28 +01:00
ementalo
3a38e4102a Allow syntax: /fly <player> <on/off> 2012-06-18 10:58:44 +01:00
ementalo
dc4fc46c4b Latest translations and items.csv 2012-06-18 10:36:56 +01:00
ementalo
b9f529e53d Play a bit less greedy with events 2012-06-18 10:33:52 +01:00