Commit Graph

517 Commits

Author SHA1 Message Date
mung3r 50f916e3ae fixed another conflict 2011-10-10 00:30:45 -07:00
mung3r 4a40e50891 fixed conflicts 2011-10-10 00:26:59 -07:00
mung3r ddbecef78b Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/net/milkbowl/vault/Vault.java
	src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java
2011-10-10 00:19:50 -07:00
mung3r 0c59ed0d9f changed formatting to show at most 2 decimal points for bose 6 & 7 2011-10-09 23:40:03 -07:00
mung3r 4547775b93 checked for a couple more classes to distinguish between bose 6 & 7 2011-10-09 23:36:29 -07:00
mung3r 1bc729c65f merged prelim Bose7 from upstream 2011-10-09 23:02:05 -07:00
mung3r 3a752c0747 Merge pull request #5 from mung3r/master
Updated PermissionsEx to version 1.14
2011-10-09 22:11:32 -07:00
mung3r 0728ee3ac1 updated PermissionsEx to version 1.14 2011-10-09 22:07:49 -07:00
Sleaker 280b2d3dfc Merge remote branch 'origin/master' 2011-10-09 12:11:05 -07:00
Sleaker 4ee434a791 preliminary Bose7 support - needs to be tested, unsure of method calls
for updated BOSE.
2011-10-09 12:10:29 -07:00
mung3r ab80a69001 updated PermissionsBukkit to rb1240 2011-10-03 22:24:17 -07:00
mung3r bad3e2c2aa fixed number format 2011-09-28 20:27:52 -07:00
Sleaker fe10403c57 Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git 2011-09-26 21:27:47 -07:00
Sleaker aee462ecd9 null tests for PBukkit implementations 2011-09-26 21:27:23 -07:00
Nick Minkler 6cbef7b93c Merge pull request #2 from mung3r/master
fixed an iConomy6 bug - thanks mung3r
2011-09-26 10:04:18 -07:00
mung3r b6427d22e4 fixed a bug where accounts is not initialized for iCo6 2011-09-26 09:52:21 -07:00
Sleaker 02e797a7a0 give an actual notice that SuperPerms is loaded as a backup permission
system.
2011-09-24 17:53:09 -07:00
Sleaker 435057d81a Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git 2011-09-23 11:40:42 -07:00
Sleaker f648580eef iCo should load first. 2011-09-23 11:40:21 -07:00
Nick Minkler fa162b3099 Merge pull request #1 from mung3r/master
Pulled fixes for Bose/3co + MultiCurrency support from mung3r
2011-09-23 08:28:27 -07:00
Sleaker e40c258c0f PBukkit passthrough for player.has 2011-09-23 00:45:25 -07:00
mung3r 654908c1bb added support for MultiCurrency 2011-09-22 23:43:48 -07:00
mung3r 7d1de54d6e fixed copy/paste error 2011-09-22 20:01:32 -07:00
Sleaker affbda067c forgot a file 2011-09-18 01:21:06 -07:00
Sleaker 9a9f0e3a75 Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git 2011-09-18 01:19:57 -07:00
Sleaker 7dfc283e47 enabled PermissionsBukkit/mChat & SuperPerms support. 2011-09-18 01:19:35 -07:00
Morgan 0d0cf55771 Clean up ServerListener for P3 2011-08-31 12:28:48 -04:00
Morgan 88b2bfa048 Use PluginEnableEvent instead of searching for the Plugin during onPluginEnable in P3 2011-08-31 12:26:21 -04:00
Sleaker 7c2e3a0c55 added version check to P3 when re-enabling to prevent bridge plugins
from registering as P3.
2011-08-31 09:18:09 -07:00
Sleaker d6499eb532 added Transient Permission check to playerHas for GM/P2 2011-08-23 12:01:07 -07:00
Sleaker 3c1a2bb7e3 tentative mChat support in BukkitPerm 2011-08-18 09:33:21 -07:00
Sleaker f3e7a52c86 use commands to add/remove players/groups 2011-08-17 21:45:36 -07:00
Sleaker 1b600bb359 Fix missing abstract methods 2011-08-17 21:29:59 -07:00
Sleaker e47de32687 partially added BukkitPerms - add transient support to P2/GM using
bukkit perm backend.
2011-08-17 21:26:44 -07:00
Morgan 4f63ad2113 Add transient player permissions 2011-08-12 13:30:03 -04:00
Morgan d783b66be0 Formatting 2011-08-12 13:11:25 -04:00
Morgan bfe8259216 Group Prefix & Suffix 2011-08-12 12:43:41 -04:00
Morgan db003526c0 Finish implementation of iConomy 6 2011-08-11 17:18:25 -04:00
Morgan 42f048a669 JavaDocs, Throw UnsupportedOperationExceptions when appropriate, finish PlayerPrefix & Suffix 2011-08-11 16:55:28 -04:00
Sleaker a43ab4ffba iCo6 support 2011-08-11 12:13:49 -07:00
Sleaker 46ad7835a4 Re-Added Permission2 support for legacy compatibility 2011-08-09 08:43:15 -07:00
Sleaker f0b13387b5 Re-added tentative GM support 2011-08-08 00:05:32 -07:00
Sleaker 075cc5c7eb Added set suffix support 2011-07-22 01:16:55 -07:00
Morgan 987aa76b25 Add additional nodes and change Permission to abstract instead of interface 2011-07-20 20:43:46 -04:00
Morgan 5a241def77 Remove /vault-reload command (caused memory leak) 2011-07-19 10:40:27 -04:00
Morgan 43c1e92e4a Improve vault-info && vault-reload commands 2011-07-19 10:33:01 -04:00
Sleaker dd014265a3 Import cleanup 2011-07-19 07:02:38 -07:00
Morgan cd7793b0ac Update javadocs in Interfaces 2011-07-19 09:40:17 -04:00
Morgan 36b3843144 Use Service API 2011-07-19 09:25:12 -04:00
Morgan e67ae24658 Economy.getBalance(...) now returns a final double 2011-07-18 14:31:29 -04:00
Morgan 4ad44bb1c1 Merge branch 'master' of github.com:MilkBowl/Vault 2011-07-18 12:35:28 -04:00
Morgan 29483e928e Rename commands to 'vault-info' and 'vault-reload' to allow others to use 'vault' for other purposes. 2011-07-18 12:34:54 -04:00
Sleaker 9a41f10e00 Null support for getPrimaryGroup. 2011-07-11 10:59:02 -07:00
Sleaker 027a493fc7 Added getGroups and getPrimaryGroup 2011-07-08 09:26:20 -07:00
Morgan 389f5c3b6b Merge branch 'master' of github.com:MilkBowl/Vault 2011-07-05 14:38:16 -04:00
Morgan 764bd117a0 Refactor: Remove redundant method names, improve usability 2011-07-05 14:37:51 -04:00
Sleaker e1e07b3584 cleanup imports 2011-07-01 07:16:27 -07:00
Morgan d2dcc8fb54 Require Op or Console to use the vault command 2011-06-30 11:14:09 -04:00
Morgan d3d07b407f Update Player Info Nodes for P3 Workaround 2011-06-30 11:01:39 -04:00
Morgan 640e15126f Workaround for P3 info nodes 2011-06-30 10:55:09 -04:00
Morgan 0ca8ccb710 Removed Managers (they were silly) 2011-06-30 10:37:26 -04:00
Morgan 9dd74441ab Removed PermissionManager & EconomyManager (pointless) 2011-06-30 09:49:26 -04:00
Morgan ccdc903007 Javadoc fixes 2011-06-29 19:11:03 -04:00
Morgan f841feb128 Documentation & fully implement info nodes 2011-06-29 18:24:59 -04:00
Morgan b5ae8f58d1 Removed Permissions 2.x Support, Added ability to modify Permissions 2011-06-29 17:44:42 -04:00
Morgan 5cc4c03950 Vault methods no longer static 2011-06-29 15:59:26 -04:00
Morgan 875e5f980c Initial Commit 2011-06-28 20:18:20 -04:00