Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2024-11-23 11:05:48 +01:00
Code Issues Projects Releases Wiki Activity
623 Commits 4 Branches 2 Tags 118 MiB
dd98beb9d9
Commit Graph

623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mung3r
dd98beb9d9 Merge remote-tracking branch 'upstream/master' 2013-02-18 10:05:36 -08:00
Nick Minkler
016dae60b5 version increase 2013-02-13 10:30:22 -08:00
Rodney Ramos
b13f7b4379 Merge pull request #10 from MilkBowl/master 
sync
 2013-02-08 12:34:50 -08:00
Nick Minkler
20159ae028 fix all the errors. 2013-02-07 23:48:05 -08:00
Rodney Ramos
85b74d93f0 Merge pull request #9 from MilkBowl/master 
sync
 2013-02-07 22:11:22 -08:00
Nick Minkler
be7551b813 Merge pull request #363 from Sebc722/master 
Add support for Xperms
 2013-02-07 21:50:31 -08:00
Sebastien Carriere
4227bcc2f1 Add Xperms support 
adds Permissions_Xperms.java to allow support for Xperms
 2013-02-07 22:57:51 -05:00
mung3r
904c18c3b1 Merge remote-tracking branch 'upstream/master' 2013-02-06 17:03:29 -08:00
Nick Minkler
bc9ec51fad wrong scope 2013-02-06 16:43:09 -08:00
Nick Minkler
f2e3e2b3e4 compile against Priveleges repository version. 2013-02-06 16:41:55 -08:00
Nick Minkler
a514f066c8 don't check if economy is enabled in PluginEnableEvent assume it is 
being enabled and add the hook.
 2013-02-06 16:32:39 -08:00
Nick Minkler
30a9603647 Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git 2013-02-06 16:25:52 -08:00
Nick Minkler
785d2f5b4b don't check plugin enabled status when hooking a plugin in 
PluginEnableEvent
 2013-02-06 16:25:43 -08:00
Nick Minkler
382cb4fffd Merge pull request #358 from greatman/master 
Updated Craftconomy for 3.1
 2013-02-05 20:56:22 -08:00
William Lebel
79bbee126d Updated Craftconomy hook to latest API changes. Made the pom.xml downloads from the repository. 2013-02-05 14:22:40 -05:00
Nick Minkler
a0e3e42d7d Merge pull request #352 from Acrobot/patch-1 
Fix JavaDocs
 2013-01-30 11:02:02 -08:00
Andrzej Pomirski
8af9ae3e56 Fix JavaDocs 2013-01-30 17:57:48 +01:00
Rodney Ramos
41c9c6d008 Merge pull request #8 from MilkBowl/master 
sync
 2013-01-30 07:52:59 -08:00
Sleaker
7ff0b98b94 revert abstracting the interface. 2013-01-20 14:15:35 -08:00
Sleaker
f76441fdf4 build against latest beta. Added missing 1.4.6 items. 2013-01-20 14:09:39 -08:00
Sleaker
b81be20069 update pom.xml for new CB version 2013-01-19 10:59:31 -08:00
Sleaker
a2315b26cd resolve merge conflicts with upstream 2013-01-19 10:58:41 -08:00
Sleaker
5fbdd4fa7f BREAKING CHANGE: abstracted the Economy interface. 2013-01-19 10:55:33 -08:00
Nick Minkler
5759685c45 Merge pull request #342 from Marenwynn/master 
Update lib and economy plugin class for full bank support.
 2013-01-10 07:07:37 -08:00
Stephanie Gardner
b4c3a6df9b Update for full bank support. 
Nearly finished.
 2013-01-09 23:58:53 -05:00
Rodney Ramos
9586e30ae0 Merge pull request #7 from MilkBowl/master 
sync
 2013-01-06 22:26:03 -08:00
Nick Minkler
d0200930dd Merge pull request #340 from coaster3000/master 
Fixed Compiler Warnings
 2013-01-06 22:22:28 -08:00
coaster3000
2e3fdfe0e3 Fixed annoying compiler warnings from javadocs (For IDE's that warn about javadoc errors and missing content) 
Signed-off-by: coaster3000 <ckrier.3000@gmail.com>
 2013-01-06 17:03:23 -05:00
Rodney Ramos
1c3ceec79d Merge pull request #339 from mung3r/master 
bPerms2 fixup
 2013-01-03 12:17:47 -08:00
mung3r
95f105a2e7 fixed problems with last commit for bPerms2 update 2013-01-03 12:15:31 -08:00
mung3r
b2dbf74d78 Merge remote-tracking branch 'upstream/master' 2013-01-03 11:17:39 -08:00
Nick Minkler
27bc8bdffe Merge pull request #338 from codename-B/patch-1 
Update src/net/milkbowl/vault/permission/plugins/Permission_bPermissions...
 2013-01-03 10:29:29 -08:00
Ben
ab08b3f4ba Update src/net/milkbowl/vault/permission/plugins/Permission_bPermissions2.java 
Fix for latest bPermissions refactoring changes.
 2013-01-03 17:43:55 +00:00
Nick Minkler
f49a5e3960 Merge pull request #337 from YLivay/master 
Implemented MineConomy getCurrencyName() methods
 2012-12-31 06:51:21 -08:00
Yariv Livay
64e9072c96 Implemented getCurrencyNameSingular() and getCurrencyNamePlural() for MineConomy using default currency. 2012-12-31 16:26:34 +02:00
Sleaker
f6cee62506 Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git 2012-12-26 16:22:43 -08:00
Sleaker
48e66f2e34 update for new timertask scheduling. cancel all tasks when the plugin is 
shutdown.
 2012-12-26 16:22:32 -08:00
mung3r
2687ae8300 Merge remote-tracking branch 'upstream/master' 2012-12-23 13:56:18 -08:00
Nick Minkler
e008a6cbc8 Merge pull request #331 from omwah/sdfeconomy 
Add changes necessary for supporting SDFEconomy
 2012-12-22 14:47:13 -08:00
Omwah
97331d95be Add changes necessary for supporting SDFEconomy 2012-12-22 14:40:59 -08:00
Nick Minkler
ecbe4a1c1a Merge pull request #326 from Marenwynn/master 
Hooks XPBank
 2012-12-17 11:47:29 -08:00
Stephanie Gardner
84299c15bb The rest of the files for an XPBank hook 2012-12-17 11:02:29 -05:00
Stephanie Gardner
684d8a4bef Hooks XPBank, a new XP economy plugin 
Bukkit: http://dev.bukkit.org/server-mods/xpbank/
GitHub: https://github.com/Marenwynn/XPBank
 2012-12-17 10:17:23 -05:00
mung3r
a722371d18 Merge remote-tracking branch 'upstream/master' 2012-12-16 14:28:56 -08:00
Rodney Ramos
136eaefbe2 Merge pull request #325 from coaster3000/master 
Compiler Warnings Fix (JavaDocs)
 2012-12-16 13:38:42 -08:00
coaster3000
af7ac43e8c Fixed compiler warnings on return statements of javadocs. 
Signed-off-by: coaster3000 <ckrier.3000@gmail.com>
 2012-12-16 15:34:22 -05:00
Sleaker
ce768078b1 fix privs thinking it's simplyperms. 2012-12-14 19:21:03 -08:00
Rodney Ramos
47e923d2f0 Merge pull request #6 from MilkBowl/master 
sync
 2012-12-13 18:46:14 -08:00
Sleaker
43cdabaeeb update pom 2012-12-13 07:32:31 -08:00
Sleaker
a970099eaa version up 2012-12-12 23:43:26 -08:00