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

83 Commits

Author SHA1 Message Date
Chris Ward
e49b2c5508 BuildAll -> EssentialsParent 2013-12-01 17:08:32 +11:00
Iaccidentally
cf3ab408b4 More work on the API 2013-05-25 18:52:17 -04:00
drtshock
3ff12f6bf5 More logging! 2013-05-02 22:19:28 -05:00
snowleo
0387d18ce2 Use correct translations with color 2013-04-06 16:09:02 +02:00
snowleo
fd1c7f4fcc Moving all default messages back to the code, where they should be 
Also tweaking I18n class and YamlStorageWriter a bit
 2013-04-06 04:05:37 +02:00
Iaccidentally
fa3f4f92f4 Remove all instances of transient. (properly formatted this time!) 2013-01-14 20:38:11 -05:00
Iaccidentally
2a097530e5 Revert "Remove Transient :: Formatting Cleanup" 2013-01-14 20:06:28 -05:00
Iaccidentally
8e54bf13b2 Remove Transient :: Formatting Cleanup 2013-01-14 20:02:22 -05:00
md_5
4818bec0d8 Update the build system slightly to use embedded libraries. 2013-01-13 09:51:23 +11:00
Iaccidentally
859ca6e919 Cleanup :: Standardize import organization :: lots of comments :: remove unused eco systems 2013-01-11 19:56:02 -05:00
Chris Ward
1ccbf8dd68 Use the right formatter in XMPP 
9ecb501e00
 2013-01-09 22:05:12 +11:00
KHobbits
8661927599 Merge gravy's pull and reformat code 2012-12-31 02:28:52 +00:00
snowleo
cf0386be7a Essentials Team instead of Essentialsteam 2012-11-27 12:26:04 +01:00
snowleo
00df93b709 Update authors fields of all plugins to a link instead of an outdated list of developers 2012-11-27 12:19:36 +01:00
ementalo
e0d3b9cfcf Fix command handlers 2012-10-19 10:33:10 +01:00
snowleo
ae10bcdffe Cleanup 2012-10-06 17:02:58 +02:00
snowleo
bb798a1051 Organize Imports 2012-10-06 16:58:46 +02:00
snowleo
f2e31e56c5 Fix startup errors 2012-10-06 11:06:52 +02:00
snowleo
10b161ce09 Move format methods from Util to FormatUtil 2012-09-02 19:41:30 +02:00
snowleo
50ab5ffd93 Removing server layer part 2 2012-08-26 20:17:29 +02:00
ementalo
26e5b52c26 Some user matching updates 2012-07-20 12:12:21 +01:00
ementalo
a661bce7b3 Merge of server-layer branch 2012-07-17 14:21:03 +01:00
ementalo
3c385e6927 Package Renames 2012-07-16 15:01:16 +01:00
snowleo
fff9f07994 server-layer part 2 2012-07-15 19:58:08 +02:00
ementalo
16d0b5c228 package name change to net.ess3 2012-06-27 13:35:39 +01:00
md_5
7bef2d3817 Cleanup signs, update and xmpp, more to come. 2012-06-27 20:03:26 +10:00
md_5
93f4713f8b Bit of maven magic, no more huge EssProtect jar. 2012-06-26 18:19:29 +10: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
330c7271a7 Fix xmpp format stripping 2012-06-17 18:43:01 +01:00
snowleo
071254ed8d Fix xmpp format stripping 2012-06-08 00:34:25 +03:00
snowleo
711d42d604 Server-Layer Part 1 2012-04-08 00:07:53 +02:00
md_5
5014b93e16 Use maven for versioning. Note GroupManager versioning is broken. 2012-03-18 14:33:16 +11:00
snowleo
c7a4d37f6e Moved CommandsHandler to commands package 2012-03-14 03:53:30 +01:00
md_5
7e8ca05203 Complete the transition to maven :D 2012-03-04 10:37:05 +11:00
md_5
3099855562 Merge remote-tracking branch 'origin/master' 2012-03-01 16:23:21 +11:00
md_5
bae337cc49 Remove old, unwanted manifest.mf files 2012-03-01 12:27:59 +11:00
snowleo
4da3f52164 Merge branch 'refs/heads/master' into 3.0 
Conflicts:
	.gitignore
	Essentials/src/com/earth2me/essentials/Essentials.java
	Essentials/src/com/earth2me/essentials/EssentialsTimer.java
	Essentials/src/com/earth2me/essentials/ISettings.java
	Essentials/src/com/earth2me/essentials/Jails.java
	Essentials/src/com/earth2me/essentials/OfflinePlayer.java
	Essentials/src/com/earth2me/essentials/Settings.java
	Essentials/src/com/earth2me/essentials/User.java
	Essentials/src/com/earth2me/essentials/UserData.java
	Essentials/src/com/earth2me/essentials/UserMap.java
	Essentials/src/com/earth2me/essentials/Util.java
	Essentials/src/com/earth2me/essentials/commands/Commandnear.java
	Essentials/src/com/earth2me/essentials/commands/Commandping.java
	Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
	Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
	Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
	Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
	Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
	Essentials/src/messages_en.properties
	Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
	Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java
	EssentialsChat/src/plugin.yml
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
 2012-02-21 18:34:53 +01:00
snowleo
f46948249e Updated Essentials to work with R5 2012-02-21 17:33:46 +01:00
KHobbits
5137502646 Switch website URL's to point at wiki. 2012-01-28 00:20:46 +00:00
KHobbits
c689b55c4d Fix depends 2012-01-25 23:56:54 +00:00
snowleo
cc0e9aa84b Merge branch 'refs/heads/master' into 3.0 
The changes to EssChat have not been merged

Conflicts:
	Essentials/src/com/earth2me/essentials/Essentials.java
	Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
	Essentials/src/com/earth2me/essentials/ISettings.java
	Essentials/src/com/earth2me/essentials/OfflinePlayer.java
	Essentials/src/com/earth2me/essentials/Settings.java
	Essentials/src/com/earth2me/essentials/Util.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java
	Essentials/src/messages.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_nl.properties
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
	EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
	EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
	EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
	EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java
 2012-01-24 00:52:08 +01:00
snowleo
6af054631f More work on 3.0 branch 2012-01-24 00:01:31 +01:00
snowleo
e46fe381b4 Removing load info, bucket displays that now. 2012-01-20 05:52:35 +01:00
snowleo
792f70efa5 Update for new CraftBukkit Event Code 
EssentialsSpawn can't be updated yet, because the new event system lacks dynamic priorities.
 2012-01-20 05:20:37 +01:00
snowleo
f0dd81ee00 Merge branch 'refs/heads/master' into 3.0 
Did some tweaks, so that it actually works.

Conflicts:
	Essentials/src/com/earth2me/essentials/Essentials.java
	Essentials/src/com/earth2me/essentials/User.java
	Essentials/src/com/earth2me/essentials/Util.java
	Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java
	Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
	Essentials/src/com/earth2me/essentials/commands/Commandmail.java
	Essentials/src/com/earth2me/essentials/commands/Commandme.java
	Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
	Essentials/src/com/earth2me/essentials/commands/Commandnick.java
	Essentials/src/com/earth2me/essentials/commands/Commandr.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
	build.xml
 2012-01-18 04:01:01 +01:00
snowleo
eb5c88ef08 Netbeans 7.1 stuff 2012-01-12 23:37:39 +01:00
snowleo
cc3cd5e89c Cleanup of Console class 2012-01-06 01:55:41 +01:00
snowleo
a552b88172 I always forget these 2012-01-03 02:53:57 +01:00
snowleo
a20e96af4e Netbeans 7.1 RC2 project stuff 2012-01-02 22:37:44 +01:00