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

597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sleaker
c351f78f62 fixed iCo version thing. 2012-12-12 23:39:13 -08:00
Sleaker
be482c64f1 revert dynamic version. 2012-12-12 16:19:54 -08:00
Sleaker
03392869eb fix bug in iConomy versioning that shows up before the plugin is loaded. 2012-12-12 11:50:20 -08:00
Nick Minkler
95fc0362dd Merge pull request #319 from krinsdeath/master 
Due to a method signature change, a few methods broke (playerAddGroup and playerRemoveGroup).
 2012-12-11 18:08:15 -08:00
Jeffrey Wardian
05707c6256 Fixed method signature change. 2012-12-11 11:40:29 -08:00
Rodney Ramos
25277c1e18 Merge pull request #318 from mung3r/master 
fixed sample code in README
 2012-12-10 12:59:08 -08:00
mung3r
2124ad4405 Merge remote-tracking branch 'upstream/master' 2012-12-10 12:56:22 -08:00
mung3r
2d9d4e17a0 fixed sample code in README 2012-12-10 12:55:08 -08:00
Sleaker
2c7ebf8500 version increase 2012-12-10 07:17:18 -08:00
Sleaker
b89459a6ba fix pom 2012-12-10 06:45:55 -08:00
Sleaker
bebed4bcfc fix removed methods in ooooold connectors. 2012-12-10 01:12:28 -08:00
Sleaker
3f72dfbffc Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git 2012-12-10 01:04:15 -08:00
Sleaker
1edb6d2bb1 build against latest CB 2012-12-10 01:03:57 -08:00
mung3r
820b40e356 Merge remote-tracking branch 'upstream/master' 2012-12-03 20:51:39 -08:00
Rodney Ramos
58db755bda Merge pull request #311 from krinsdeath/master 
I stupidly inverted the parameters of my own API. This pull fixes that.
 2012-12-03 20:50:59 -08:00
Jeffrey Wardian
28e229e409 Fixed my stupidity. 2012-12-03 20:29:51 -08:00
Rodney Ramos
7b5da490e3 Merge pull request #309 from krinsdeath/master 
Updated Privileges' implementation in Vault
 2012-12-02 14:20:36 -08:00
Jeffrey Wardian
397ad340c7 Fixed Privileges implementation. 2012-12-01 19:00:40 -08:00
mung3r
692eb58c2a Merge remote-tracking branch 'upstream/master' 2012-11-28 11:25:44 -08:00
Sleaker
2105f3d92c changed how ico adapter detects version. 2012-11-28 07:50:47 -08:00
mung3r
54808f7c0a Merge remote-tracking branch 'upstream/master' 2012-11-20 08:10:57 -08:00
Sleaker
0caff7662f version increase for development toward next release 2012-11-19 20:54:59 -08:00
Sleaker
cdf3bebe9a Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git 2012-11-19 20:52:31 -08:00
Sleaker
7f58092b56 item changes for 1.4 2012-11-19 20:51:56 -08:00
Rodney Ramos
1cd18a86cd Merge pull request #5 from MilkBowl/master 
code sync
 2012-11-17 09:49:24 -08:00
Nick Minkler
16618d1f0c Merge pull request #301 from iKeirNez/master 
Updated Vault API for CommandsEX
 2012-11-17 09:05:02 -08:00