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

331 Commits

This Branch
This Branch
All Branches
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
Nick Minkler
37c954ab1e Merge pull request #4 from mung3r/master 
Updated PermissionsBukkit support for rb1240
 2011-10-03 22:33:56 -07:00
mung3r
ab80a69001 updated PermissionsBukkit to rb1240 2011-10-03 22:24:17 -07:00
Nick Minkler
2442bacc8b Merge pull request #3 from mung3r/master 
fixed number formatting for 3co
 2011-09-29 10:02:51 -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
69c35c0dae REally fix libraries 2011-08-17 21:32:50 -07:00
Sleaker
6bc5739a3e missing library 2011-08-17 21:31:09 -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
1b810dda8a Update README.md 2011-08-11 17:26:26 -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
Morgan
c3689d8909 Merge branch 'master' of github.com:MilkBowl/Vault 2011-08-11 15:29:45 -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
Morgan
5efd4d0d73 Fix random ant build warnings 2011-07-26 16:40:27 -04:00
Sleaker
075cc5c7eb Added set suffix support 2011-07-22 01:16:55 -07:00