Commit Graph

536 Commits

Author SHA1 Message Date
Sleaker
78fb12fb94 path fix for CommandsEX.jar 2012-10-16 16:28:00 -07:00
Rodney Ramos
62f6366240 Merge pull request #285 from mung3r/master
CommandsEX fixup
2012-10-16 16:18:07 -07:00
mung3r
f4067761d8 fixed plugin name for CommandsEX hook 2012-10-16 16:16:03 -07:00
mung3r
2c87954d4f added missing entry for CommandsEX in pom.xml 2012-10-16 16:13:11 -07:00
mung3r
95824b24eb Merge remote-tracking branch 'upstream/master' 2012-10-16 16:11:36 -07:00
Rodney Ramos
7f742cdd45 Merge pull request #284 from iKeirNez/master
Added CommandsEX Support
2012-10-16 16:08:23 -07:00
Keir Nellyer
4a62ff4b3d Updated jar file 2012-10-16 21:32:38 +01:00
Keir Nellyer
2af896eb28 Added API for the Upcoming CommandsEX Economy feature (will be present
in CommandsEX Release v2.0)

Haven't tested yet, but I am pretty sure it works, when I get time I
will test it.
2012-10-16 21:02:16 +01:00
Rodney Ramos
45820e6a37 Merge pull request #4 from MilkBowl/master
sync
2012-10-16 08:16:14 -07:00
Sleaker
0e36b23d61 missing gravel 2012-10-04 22:28:49 -07:00
Rodney Ramos
155a7df34b Merge pull request #3 from MilkBowl/master
sync
2012-10-01 07:08:16 -07:00
Sleaker
e15bc63c50 version+ for dev toward next. 2012-09-30 20:18:09 -07:00
Sleaker
bce326825b fix silverfish block name search 2012-09-29 05:44:53 -07:00
Rodney Ramos
bafe9613ca Merge pull request #2 from MilkBowl/master
update
2012-09-27 08:45:57 -07:00
Sleaker
9016e29762 Fixed not updating the pom or including the proper license header. 2012-09-24 06:12:40 -07:00
Nick Minkler
0b399f5e35 Merge pull request #267 from gravypod/master
add Dosh support
2012-09-24 06:07:55 -07:00
Joshua D. Katz
7cad26e191 Update Vault to use the Dosh plugin 2012-09-23 16:47:07 -04:00
Sleaker
e39061d851 fix pom 2012-09-21 15:35:55 -07:00
Nick Minkler
32ed41b95a Merge pull request #265 from greatman/master
Craftconomy 3 file
2012-09-21 15:28:31 -07:00
William Lebel
6e57de7f9b Craftconomy 3 .jar file update. 2012-09-21 18:24:02 -04:00
Nick Minkler
240e64cb8c Merge pull request #264 from greatman/master
Craftconomy3 update.
2012-09-21 15:21:54 -07:00
William Lebel
fa8d51fa24 Craftconomy3 update
Signed-off-by: William Lebel <lebelwilliam@gmail.com>
2012-09-21 18:20:29 -04:00
Sleaker
ff3541c31a added air, apparently it's valid. 2012-09-20 15:48:56 -07:00
Sleaker
60ae2957e7 unused import. 2012-09-18 14:16:13 -07:00
Sleaker
2a48db6eed fix typo 2012-09-18 14:14:57 -07:00
Sleaker
ae92a13366 Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git 2012-09-18 14:13:44 -07:00
Sleaker
cc0ccdbb1a added missing redstone lamp/torches - these have some more specific
searching necessary to select them as they are non-standard items.
2012-09-18 14:13:30 -07:00
mung3r
63fe8aeefd removed unused import 2012-09-07 21:17:36 -07:00
mung3r
3b528dcd20 Merge remote-tracking branch 'upstream/master' 2012-09-07 21:14:06 -07:00
Rodney Ramos
c497edc557 Merge pull request #260 from xLRDxREVENGEx/patch-1
Fixed type in items.java class for ghast tear
2012-09-06 15:00:08 -07:00
xLRDxREVENGEx
759a2aed88 Fixed type in items.java class for ghast tear
It was put as Ghost Tear which is now corrected to Ghast Tear
2012-09-06 14:01:42 -07:00
Nick Minkler
1c7066e614 Merge pull request #258 from incredinex/master
A GiM1 bugfix, version updates, GiM2
2012-09-02 18:27:11 -07:00
flobi
718cb88564 GoldIsMoney update 2012-09-02 21:10:42 -04:00
flobi
b3b4512b0d Bugfix: Loading GoldIsMoney on enable event fail 2012-09-02 20:47:00 -04:00
Sleaker
44f37f6fb1 apparently GM doesn't update it's permission changes to bukkit when they
are made.
2012-09-02 00:39:20 -07:00
Sleaker
69c3b3b786 Revert "fix PEX primary group, they sort by rank in reverse (first is lowest rank)."
This reverts commit 7faa28f069.
2012-08-31 13:14:52 -07:00
Sleaker
7faa28f069 fix PEX primary group, they sort by rank in reverse (first is lowest
rank).
2012-08-31 09:00:43 -07:00
mung3r
3fb0df4d5e Merge remote-tracking branch 'upstream/master' 2012-08-29 21:51:31 -07:00
Sleaker
48b762dc70 indentation fixes 2012-08-29 10:33:53 -07:00
Sleaker
3c3a15096d fix version of mChat in pom.xml 2012-08-26 09:23:19 -07:00
Sleaker
9e6a0364be fix missing initial hook. 2012-08-26 09:02:38 -07:00
Nick Minkler
40537571eb Merge pull request #252 from MiracleM4n/master
Update mChatSuite code to latest RB.
2012-08-26 09:00:04 -07:00
Scott Chi
70b75bfa2a Update mChatSuite code to latest RB. 2012-08-25 13:14:57 -04:00
Sleaker
e067542691 Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git 2012-08-25 08:56:41 -07:00
Sleaker
3a491211bf Version++ for work toward next release 2012-08-25 08:56:29 -07:00
Rodney Ramos
239ea90a9b Merge pull request #1 from MilkBowl/master
update
2012-08-24 00:51:58 -07:00
Nick Minkler
ba322014b0 Merge pull request #251 from codename-B/master
Proper HeroChat fix
2012-08-23 20:35:36 -07:00
Ben
9f7b395eee Update src/net/milkbowl/vault/permission/plugins/Permission_bPermissions2.java
Proper HeroChat fix (YAY)
2012-08-24 02:12:05 +02:00
Ben
ddb1d7be78 Update src/net/milkbowl/vault/permission/plugins/Permission_bPermissions2.java
Implement missing has(Player player, String permission) method to the bPermissions API
2012-08-24 01:56:45 +02:00
Sleaker
4f0d149d8e Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git 2012-08-19 08:35:37 -07:00