KHobbits
4aecc034c2
Fixing typo in release build.
2011-10-11 22:51:30 +01:00
KHobbits
a111a07bca
Merge branch 'essmaster' into essrelease
2011-10-11 20:06:23 +01:00
KHobbits
eb71097546
Merge remote branch 'remotes/ess/master' into essrelease
2011-10-11 17:52:56 +01:00
KHobbits
c7fcb72d6c
Merge remote branch 'remotes/ess/master' into essrelease
2011-10-10 17:21:48 +01:00
snowleo
04af8ef329
Merge branch 'master' into release
2011-10-10 00:30:47 +02:00
snowleo
4cdf803ab7
Merge branch 'master' into release
2011-10-09 23:52:15 +02:00
snowleo
4595c15bee
Merge branch 'master' into release
2011-10-09 17:54:59 +02:00
snowleo
1e3d2fbfd2
Merge branch 'master' into release
2011-10-08 19:43:07 +02:00
snowleo
57c25bf151
Merge branch 'master' into release
2011-10-04 23:07:30 +02:00
snowleo
ae030b227a
Merge branch 'master' into release
2011-10-04 22:20:10 +02:00
snowleo
4f85751694
Merge branch 'master' into release
2011-10-04 21:34:28 +02:00
KHobbits
6b0d0daa2e
Merge branch 'essmaster' into essrelease
2011-10-04 14:40:12 +01:00
KHobbits
401498a4f7
Merge branch 'essmaster' into essrelease
2011-10-04 09:51:51 +01:00
KHobbits
8bb50189bc
Merge remote branch 'remotes/ess/master' into essrelease
2011-09-29 00:43:42 +01:00
KHobbits
eb665a059a
Merge branch 'essmaster' into essrelease
2011-09-29 00:40:16 +01:00
KHobbits
3dc29be083
Merge branch 'essmaster' into essrelease
2011-09-27 02:01:52 +01:00
KHobbits
82e5447526
Merge branch 'essmaster' into essrelease
2011-09-26 23:06:02 +01:00
KHobbits
066f3fd726
Merge branch 'essmaster' into essrelease
2011-09-22 15:29:47 +01:00
snowleo
f0acf733a5
Merge branch 'master' into release
2011-09-22 10:47:58 +02:00
snowleo
96c4dd2ab9
Merge branch 'master' into release
2011-09-05 14:15:07 +02:00
snowleo
df3b9a7ef9
Merge branch 'master' into release
2011-09-04 20:47:46 +02:00
snowleo
70a3a5919e
Merge branch 'master' into release
2011-09-02 00:05:05 +02:00
snowleo
688d37ee60
Merge branch 'master' into release
2011-09-01 16:35:47 +02:00
snowleo
3dcf8bc8fc
Merge branch 'master' into release
2011-08-30 09:46:49 +02:00
snowleo
7039d613ee
Merge branch 'master' into release
2011-08-29 20:43:49 +02:00
snowleo
256c963370
Merge branch 'master' into release
2011-08-21 21:44:58 +02:00
snowleo
7b8c2a4575
Merge branch 'master' into release
2011-08-21 20:22:28 +02:00
snowleo
7f1ba0d6ae
Merge branch 'master' into release
2011-08-19 02:32:56 +02:00
snowleo
7e5b79aa14
Merge branch 'master' into release
2011-08-19 02:10:36 +02:00
snowleo
086343ee48
Merge branch 'master' into release
2011-08-19 01:06:52 +02:00
snowleo
a1ad512a80
Merge branch 'master' into release
2011-08-19 00:42:26 +02:00
snowleo
9bb2ef9cbe
Merge branch 'master' into release
2011-07-27 01:04:37 +02:00
snowleo
832910d480
Merge branch 'master' into release
2011-07-23 22:34:43 +02:00
snowleo
13da2b2924
Merge branch 'master' into release
2011-07-23 20:06:00 +02:00
snowleo
84ac520353
Master and Release branch are now identical again.
...
Removed warning for an older bukkit version.
2011-07-23 20:05:44 +02:00
snowleo
5613975314
Merge branch 'master' into release
2011-07-23 03:11:14 +02:00
snowleo
662d30ae45
Merge branch 'master' into release
2011-07-23 03:07:38 +02:00
snowleo
57bee443b1
Merge branch 'master' into release
2011-07-23 02:39:37 +02:00
snowleo
621618e41f
Merge branch 'master' into release
2011-07-21 02:58:39 +02:00
snowleo
6ccb60813a
Merge branch 'master' into release
2011-07-21 02:52:25 +02:00
snowleo
b34119901e
Merge branch 'master' into release
2011-07-21 02:29:45 +02:00
snowleo
b317aef8c9
Merge branch 'master' into release
2011-07-21 00:31:39 +02:00
snowleo
fdbc6fa94f
Merge branch 'master' into release
2011-07-20 23:18:34 +02:00
snowleo
0ffe24903a
Merge branch 'master' into release
2011-07-20 23:09:40 +02:00
snowleo
e550a7cc44
Merge branch 'master' into release
2011-07-20 22:37:43 +02:00
snowleo
82165a2af6
Merge branch 'master' into release
2011-07-20 22:22:02 +02:00
snowleo
63a4fe32c1
Merge branch 'master' into release
2011-07-20 18:40:04 +02:00
snowleo
1c44a25a4a
Merge branch 'master' into release
2011-07-20 12:13:24 +02:00
snowleo
cf21ecee2e
Merge branch 'master' into release
2011-07-19 12:09:48 +02:00
snowleo
5467e502a5
Merge branch 'master' into release
2011-07-19 11:42:18 +02:00
snowleo
6af9ec266b
Merge branch 'master' into release
2011-07-19 01:52:44 +02:00
snowleo
faa7e0e7a9
Merge branch 'master' into release
2011-07-19 00:47:14 +02:00
snowleo
aa3606007a
Merge branch 'master' into release
2011-07-19 00:42:10 +02:00
snowleo
db5974970d
Merge branch 'master' into release
2011-07-18 20:55:31 +02:00
snowleo
ba2539db67
Merge branch 'master' into release
2011-07-18 02:30:16 +02:00
snowleo
21d0661d79
Merge branch 'master' into release
2011-07-18 01:49:45 +02:00
snowleo
9f3eb461a9
Merge branch 'master' into release
2011-07-16 17:04:46 +02:00
snowleo
34b0deba29
Merge branch 'master' into release
2011-07-16 16:53:13 +02:00
snowleo
d9a93d8dff
Merge branch 'master' into release
2011-07-16 14:04:49 +02:00
snowleo
747776344b
Fixing merge error
2011-07-16 13:32:10 +02:00
snowleo
f979a79081
Merge branch 'master' into release
...
Conflicts:
Essentials/src/com/earth2me/essentials/Essentials.java
Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
Essentials/src/com/earth2me/essentials/register/payment/Methods.java
Essentials/src/items.csv
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
lib/bukkit-0.0.1-SNAPSHOT.jar
lib/craftbukkit-0.0.1-SNAPSHOT.jar
2011-07-16 13:25:12 +02:00
snowleo
367e9840cc
Fix save inventory after logout for new players.
2011-07-08 02:19:59 +02:00
snowleo
ea590c2ed1
NPE fix for offline users in UserData
...
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1583 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-07-08 02:16:23 +02:00
snowleo
d93120257b
Update of bukkit version number in essentials class
2011-07-02 01:10:48 +02:00
snowleo
e763b362d9
CB# 953
...
B# 754
2011-07-02 01:09:19 +02:00
snowleo
e5eb1ca0cb
More names for pistons (items.csv)
...
Fix for /unlimited and pistons
2011-07-01 10:52:59 +02:00
snowleo
ea2649db5e
Updated items.csv
2011-06-30 19:16:50 +02:00
snowleo
b53fc9cadc
Renamed functions
2011-06-30 18:54:05 +02:00
snowleo
4b35e1b729
CB #946
...
B #750
2011-06-30 18:43:23 +02:00
snowleo
40e106db13
Fix /spawner command
...
The name had to be first letter uppercase, the rest lowercase
2011-06-27 11:57:03 +02:00
snowleo
3dc0659f66
Another fix to /spawnmob
...
Merged for release
2011-06-27 11:53:57 +02:00
snowleo
e652ed2981
Copy&Paste is bad.
2011-06-26 02:00:57 +02:00
snowleo
28db891aa5
Fix for Register inside Essentials
2011-06-26 01:43:59 +02:00
snowleo
b63ae9b771
SEVERE error messages for other plugins, that try to manually enable Essentials, FakePermissions or GroupManager
2011-06-26 01:43:19 +02:00
snowleo
27c84ceaac
Remove the restriction of EssEcoApi to not use iConomy or BOSE
2011-06-25 15:35:47 +02:00
snowleo
d67ccd03ca
Merge branch 'bukkitupdate' into release
2011-06-25 14:27:30 +02:00
snowleo
96b0f27c51
Fix for Craftbukkit Bug 912
2011-06-12 02:59:34 +02:00