1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-09-25 05:41:36 +02: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
2012-06-25 23:07:37 +01:00
2012-06-06 01:53:34 +01:00
2012-06-18 15:51:48 +01:00
2012-06-06 01:53:34 +01:00
2012-06-18 15:51:48 +01:00
2012-06-06 01:53:34 +01:00
2012-06-25 22:24:10 +01:00
2012-06-25 22:01:59 +01:00

Essentials Development Readme

The official repository is at: https://github.com/essentials/Essentials

We use NetBeans 7 for development.

Recommended NetBeans plugins:

Please follow the format guidelines that are saved in the project properties.

Windows users, please read this: http://help.github.com/line-endings/ The default line ending is LF.

To build all jars, select the BuildAll project and build that. You'll find all jars inside the dist/lib folder of the BuildAll project.

If you create pull requests, always make them for the master branch.

The essentials bug tracker can be found at http://www.assembla.com/spaces/essentials/tickets

Description
No description provided
Readme GPL-3.0 342 MiB
Languages
Java 87.4%
CSV 9.3%
PHP 3.3%