Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-14 22:55:55 +01:00
Code Issues Projects Releases Wiki Activity
2,882 Commits 10 Branches 68 Tags 427 MiB
fbc0f13b2b
Commit Graph

2882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iaccidentally
d299309c67 Merge branch '2.9' of https://github.com/essentials/Essentials 2012-07-29 14:23:36 -04:00
Iaccidentally
fcf39ed85b KeepXp fixed. 2012-07-29 14:20:09 -04:00
KHobbits
0badd09ad3 Merge branch '2.9' of github.com:essentials/Essentials into 2.9 2012-07-29 17:16:10 +01:00
KHobbits
cfc8faa43a Recommit Keep Exp on death permission 
Permission: essentials.keepxp
Code by Iaccidentially.
 2012-07-29 17:15:44 +01:00
Alexander Schepp
b0586abc67 Prevent that Essentials breaks other plugins signs 2012-07-28 00:26:04 +03:00
KHobbits
41235b6ee1 Revert optimization, doesn't find glass blocks. 2012-07-17 21:05:13 +01:00
KHobbits
141a2bb190 Add small optimization tweak to new safe block function. 2012-07-17 01:28:20 +01:00
KHobbits
fb71ebdfdf Remove debugging messages. 2012-07-17 00:47:23 +01:00
KHobbits
66ae1d5b94 Try to do a little better when searching for safe teleport locations. 2012-07-17 00:46:07 +01:00
KHobbits
ada077fead Merge pull request #101 from chrisgward/patch-1 
Adding enchantment aliases for fire protection
 2012-07-15 10:13:33 -07:00
Chris Ward
45367b17a5 Adding enchantment aliases for fire protection 2012-07-15 19:47:53 +10:00
ElgarL
76717350d6 Fix a typo because Necrodoom is anal. 2012-07-13 16:22:52 +01:00
ElgarL
b71a6ac5e1 Change to our own Yaml parsing for globalgroups instead of using the 
YAMLConfiguration class in bukkit.
 2012-07-13 13:38:53 +01:00
snowleo
58544c9eea Fix version in messages_se.properties 2012-07-11 13:22:44 +02:00
snowleo
f15cb410ce Added swedish translation (from 3.0 branch) 2012-07-11 13:18:54 +02:00
KHobbits
b0cec9782d Add missing triggers from /mute block list 2012-07-11 02:46:45 +02:00
ElgarL
1eac05799f If a permission is found return the correct node for mangcheckp (not 
null).
 2012-07-10 14:35:08 +01:00
ElgarL
8fac5f6beb Merge branch 'groupmanager' of 
https://ElgarL@github.com/essentials/Essentials.git into groupmanager

Conflicts:
	EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
 2012-07-10 14:27:50 +01:00
ElgarL
a46497255e Stop force removing attachments and let Bukkit handle it's own mess. 2012-07-10 14:10:13 +01:00
Alexander Schepp
89670bdfd1 Ignore players, that don't have an IP 2012-07-10 15:57:49 +03:00
Alexander Schepp
71e552c0d1 Another NPE fix for bots 2012-07-10 15:56:12 +03:00
md-5
efec7c8f95 Merge pull request #96 from mbax/groupmanager 
Fix critical flaw in permissions removal with regards to fake players and Tekkit.
 2012-07-10 02:25:56 -07:00
Matt Baxter
ed668fcac4 Fix critical flaw in permissions removal. 
Potential for removing the removal entirely but this can be figured out later.
 2012-07-10 06:24:17 -03:00
ElgarL
72015d42fc Throw a better error than 'null' when someone removes all groups from a 
yml.
 2012-07-06 08:33:57 +01:00
ElgarL
24ec84730e Ignore any sub folders in the Worlds folder which start with a period 
(fix for storing data in svn respoitories).
 2012-07-04 11:32:17 +01:00
Iaccidentally
dab13931ca Update 2.9 2012-07-03 04:50:29 -03:00
KHobbits
b1c7004d7e Update 2.9 2012-07-01 16:40:48 +02:00
md_5
69ff8b28d8 Fix issue with cross world local chat. 2012-06-26 18:13:53 +10: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
ElgarL
51d61e7a91 Fix loading users with only numerals in their names to be seen as 
strings.
 2012-06-24 13:10:22 +01:00
KHobbits
4d0ce90787 Merge branch 'master' of github.com:essentials/Essentials into release 2012-06-23 13:47:32 +01: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
ElgarL
656f25dc97 Only output a Data update message if something has changed. 2012-06-22 15:44:04 +01:00
Iaccidentally
329f93a4f6 fix /back resetting on logout 2012-06-22 03:44:19 -04: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
622d710aa9 Merge branch 'master' into release 2012-06-21 18:27:54 +10: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