minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-09-25 05:41:36 +02:00
Code Issues Releases Wiki Activity
2,974 Commits 7 Branches 42 Tags
f03361b0c61265902ed5e7fc69452cce5ad1457e
Commit Graph

2974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snowleo
c1230bd6ae Remove obsolete version output 2012-06-27 14:06:49 +02:00
snowleo
d88211bdf6 Fix EssentialsUpdate 2012-06-27 14:06:49 +02:00
snowleo
6123f17ef4 Renamed plugin from Essentials3 to Essentials-3 2012-06-27 14:06:49 +02:00
md_5
06f54fdbac That just leaves the big ol' core. Largely ignore Compat as it is very temporary. 2012-06-27 20:27:27 +10:00
md_5
4561a7f010 Fairly expansive cleanup of ess protect. 2012-06-27 20:23:06 +10:00
md_5
7bef2d3817 Cleanup signs, update and xmpp, more to come. 2012-06-27 20:03:26 +10:00
ementalo
3d96c9caaf Use essentials data folder location for protect db 2012-06-27 10:15:20 +01:00
ementalo
c5d93a7e54 Fix Colours 2012-06-27 00:29:50 +01:00
ementalo
44e71dcbb9 Import sappin mah sentry 2012-06-26 23:34:31 +01:00
ementalo
68463b4af8 Add some default values to protect config. 
Figure out a better way to do this for HashMaps....
 2012-06-26 23:31:38 +01:00
ementalo
1596ea1335 Fix GeoIP config 2012-06-26 23:08:33 +01:00
Iaccidentally
99a2ddee6f Merge branch 'master' of https://github.com/essentials/Essentials 2012-06-26 15:15:48 -04:00
Iaccidentally
ce740d6bd2 add fixed keepxp. 2012-06-26 15:15:11 -04:00
ementalo
a46f194832 Assign EssentialsTimer to the declared variable. Fixes gc 2012-06-26 14:40:54 +01:00
ementalo
39c8355ed7 implement request teleport 2012-06-26 14:23:37 +01:00
ementalo
88d8a9cee2 remove deprecated code 2012-06-26 13:37:38 +01:00
ementalo
845fa00856 fix some encoding issues for § 
Don't attempt to close on null objects
 2012-06-26 13:21:48 +01:00
ementalo
d1dad4fca5 change pattern match for essentials update 2012-06-26 11:36:54 +01:00
md_5
451abd2bec Bogus class reference to leave in jmx extensions 2012-06-26 19:18:18 +10:00
md_5
93f4713f8b Bit of maven magic, no more huge EssProtect jar. 2012-06-26 18:19:29 +10:00
Paul A.
e31008d1eb Fix build format on spanish properties file. 3.0 uses ${build.number} instead of TeamCity 2012-06-26 10:13:43 +02:00
md_5
459f1b70cb Compile time fixes. 2012-06-26 18:07:11 +10:00
Iaccidentally
ba82ff0f4e fixes to the spainish translation thanks to dx 2012-06-26 00:22:33 -04:00
ementalo
01f2b93abc @khobbits Add optional 2n'd param to temp ban reason TL key. 2012-06-26 00:07:33 +01:00
ementalo
a9fae0faad .properties updates 2012-06-26 00:01:09 +01:00
ementalo
61ac58bb2d Merge branch '3.0' 
Conflicts:
	Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java
	Essentials/src/items.csv
 2012-06-25 23:51:14 +01:00
ementalo
09ef49cbaf @SyntaxBlitz Fix /vanish with no arguments doing nothing 2012-06-25 23:47:51 +01:00
ementalo
5604231367 @necrodoom major slab alias expansion for items.csv 
d0a8dc4812
 2012-06-25 23:44:06 +01:00
ementalo
49465358f9 snowleo Prevent NPEs in KeywordReplacer 
2c6a81a916
 2012-06-25 23:38:20 +01:00
ementalo
da968c60a2 3.0 is now master 2012-06-25 23:15:38 +01:00
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