1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-10-02 17:16:59 +02:00
Commit Graph

3022 Commits

Author SHA1 Message Date
Chris Ward
a98abba39d Adding enchantment aliases for fire protection 2012-07-15 19:47:53 +10:00
ElgarL
94b6f8f17c Fix a typo because Necrodoom is anal. 2012-07-13 16:22:52 +01:00
ElgarL
0e85f0f0be 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
f37199f988 Fix version in messages_se.properties 2012-07-11 13:22:44 +02:00
snowleo
cb9afeb125 Added swedish translation (from 3.0 branch) 2012-07-11 13:18:54 +02:00
KHobbits
05694b8140 Add missing triggers from /mute block list 2012-07-11 02:46:45 +02:00
ElgarL
2235364711 If a permission is found return the correct node for mangcheckp (not
null).
2012-07-10 14:35:08 +01:00
ElgarL
dfaa1db76f 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
2ecddaa46e Stop force removing attachments and let Bukkit handle it's own mess. 2012-07-10 14:10:13 +01:00
Alexander Schepp
9e819f7de3 Ignore players, that don't have an IP 2012-07-10 15:57:49 +03:00
Alexander Schepp
fbd83d527b Another NPE fix for bots 2012-07-10 15:56:12 +03:00
md-5
6503e49d4d 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
733eaf7453 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
3767df465f Throw a better error than 'null' when someone removes all groups from a
yml.
2012-07-06 08:33:57 +01:00
ElgarL
ce0fdbb5cb 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
272988299c Update 2.9 2012-07-03 04:50:29 -03:00
KHobbits
73693ea072 Update 2.9 2012-07-01 16:40:48 +02:00
md_5
a243082c3f Fix issue with cross world local chat. 2012-06-26 18:13:53 +10:00
ementalo
afb8cfc042 Revert "add essentials.keepxp to allow a player to keep their level after death."
This reverts commit 5d9806ad96.
2012-06-25 21:40:22 +01:00
Iaccidentally
5d9806ad96 add essentials.keepxp to allow a player to keep their level after death. 2012-06-24 23:27:30 -04:00
ElgarL
1e880373d4 Fix loading users with only numerals in their names to be seen as
strings.
2012-06-24 13:10:22 +01:00
KHobbits
50ffc2ce78 Merge branch 'master' of github.com:essentials/Essentials into release 2012-06-23 13:47:32 +01:00
KHobbits
5078cfebc9 Revert "fix /back resetting on logout"
This is desired behavior, and required for other features.
This reverts commit db08af3c07.
2012-06-23 13:33:36 +01:00
md-5
4b07be4bb8 Merge pull request #89 from necrodoom/patch-7
major slab alias expansion for items.csv
2012-06-23 02:07:34 -07:00
necrodoom
e26fb4a985 major slab alias expansion for items.csv 2012-06-23 12:02:28 +03:00
Alexander Schepp
d3de38cb66 Too much space :D 2012-06-22 20:12:56 +03:00
Alexander Schepp
89acbca412 Prevent NPEs in KeywordReplacer 2012-06-22 19:16:40 +03:00
ElgarL
2b3a1b3778 Only output a Data update message if something has changed. 2012-06-22 15:44:04 +01:00
Iaccidentally
db08af3c07 fix /back resetting on logout 2012-06-22 03:44:19 -04:00
md-5
47e73206df Merge pull request #88 from SyntaxBlitz/master
Fix /vanish with no arguments doing nothing
2012-06-21 04:31:18 -07:00
Timothy Aveni
1f30404ebf Fix /vanish with no arguments doing nothing 2012-06-21 06:17:26 -04:00
md-5
f4505b287f 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
4b0df9fb22 while enraged at mibbit and esper failing to work, updated items.csv 2012-06-21 12:18:14 +03:00
md_5
cb8e2dea93 Merge branch 'master' into release 2012-06-21 18:27:54 +10:00
md_5
57cbeb6178 Merge remote-tracking branch 'origin/groupmanager' 2012-06-21 18:27:21 +10:00
md_5
74eda330cf Update Czech translation. 2012-06-21 18:18:57 +10:00
Iaccidentally
b00e23ceb0 change some default values 2012-06-21 05:05:22 -03:00
Iaccidentally
e4419f826b fixxy fixxy 2012-06-19 18:13:47 -04:00
Iaccidentally
1c2cc34c2d Add Finnish translation 2012-06-19 18:02:05 -04:00
Iaccidentally
d803aee015 Merge branch 'master' of https://github.com/essentials/Essentials 2012-06-19 17:56:43 -04:00
KHobbits
0770ea5bcb *borrows snowleo's strainer* 2012-06-19 20:57:40 +01:00
Iaccidentally
53fffbc531 Merge branch 'master' of https://github.com/essentials/Essentials 2012-06-19 12:48:55 -04:00
Paul A.
f0afe26804 Merge pull request #86 from necrodoom/patch-4
adding beef and steak to items.csv - thanks @necrodoom
2012-06-19 07:13:37 -07:00
KHobbits
bdc0ae7610 Little safety check for bad plugins. 2012-06-19 09:03:37 +01:00
KHobbits
b2db6bd225 Patch to allow plugins to use ignore lookup, without updating their own code. 2012-06-19 08:59:26 +01:00
KHobbits
a2e52d4652 Add optional 2n'd param to temp ban reason TL key. 2012-06-19 08:46:33 +01:00
necrodoom
fee92f1e1d hotfix before 2.9.2 release 2012-06-19 10:04:13 +03:00
ementalo
108eef097c Fixing vanish on off arguments 2012-06-18 15:35:21 +01:00
ementalo
dccf936e5e Use the assigned variable when looking at durability in itemdb 2012-06-18 10:28:37 +01:00
KHobbits
2535e12941 Add sign throttle config option.
Allows you to limit how often an Essentials sign can be spammed per player.
2012-06-17 19:28:59 +01:00