Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2024-11-23 19:16:31 +01:00
Code Issues Projects Releases Wiki Activity
608 Commits 4 Branches 2 Tags 118 MiB
382cb4fffd
Commit Graph

608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sleaker
ecb374c3a2 no longer use toLower for group/perm info in PBukkit implementation. 
WARNING: PBukkit is going to be unstable because of this.  There is no
gaurantee the implementation can work like this.
 2012-08-19 08:35:21 -07:00
Nick Minkler
273ff78745 Update src/net/milkbowl/vault/Vault.java 
alter load priorities on permissions so Group-based permission plugins are detected over non-group based. And legacy plugins are last-load.
 2012-08-14 13:22:05 -07:00
Sleaker
757d3bf21d version increase. 2012-08-13 12:17:46 -07:00
Nick Minkler
686e33f7f6 Merge pull request #244 from greatman/master 
Craftconomy3 support
 2012-08-13 12:10:10 -07:00
William Lebel
e95cac855c Added Craftconomy3 support 2012-08-13 15:04:04 -04:00
Rodney Ramos
6ffd9dad7d Merge pull request #241 from mung3r/master 
bukkit rb
 2012-08-08 23:52:30 -07:00
mung3r
efb90167bb updated bukkit to rb in pom.xml 2012-08-08 23:46:49 -07:00
Sleaker
deefa25dfb fix improper formatting on gringotts, and incorrect jdocs. Jdocs are 
not to be used in implementing classes as the return values MUST match
what the jdoc/parent class defines.
 2012-08-08 20:44:27 -07:00
jast
54252e65a6 update to gringotts with faction support 2012-08-09 01:37:18 +02:00
jast
70d627266e Updated Gringotts version 2012-08-08 23:45:38 +02:00
Sleaker
ff6cd32630 send a completion message after converting. 2012-08-08 12:45:30 -07:00
Sleaker
0404360071 updated some more libs 2012-08-08 06:42:50 -07:00
Sleaker
e797ba912e Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git 2012-08-08 06:42:28 -07:00
Sleaker
1414610edd update to 1.19.3 for PEX 2012-08-08 06:33:41 -07:00
Rodney Ramos
a4a5427628 Merge pull request #238 from mung3r/master 
let's go!
 2012-08-07 22:22:57 -07:00
mung3r
a17ff21c60 fixed a few minor copy/paste errors 2012-08-07 21:33:25 -07:00
Rodney Ramos
98651a872e Merge pull request #237 from mung3r/master 
a few fixes
 2012-08-07 13:34:05 -07:00
mung3r
69944e01a3 fixed some ambiguity with local vars 2012-08-07 12:14:56 -07:00
mung3r
49aef0d7d9 fixed potential infinite loops 2012-08-07 12:14:07 -07:00
Sleaker
c688b250f1 Merge remote-tracking branch 'mcwars/master' 2012-08-06 20:52:30 -07:00
Nick Minkler
2b5f447c1f Merge pull request #235 from Spyboticsguy/master 
DroxPerms update.
 2012-08-06 11:54:14 -07:00
Tristen Allen
fed09f6bbe Upload correct DroxPerms version. 2012-08-04 16:00:23 -04:00
Tristen Allen
c8b8be0ac2 Updated DroxPerms to 0.4.0 
Couple changes here - DroxPerms 0.4.0 has methods
for getting a list of groups, so now DroxPerms is 100% Vault
compatible. *woo*
 2012-08-04 15:35:31 -04:00
Harry Jeffery
20938f91ed Updated fractional digits 
Gringotts now only stores fractional digits to 2 decimal places.
 2012-08-04 16:07:14 +01:00
Sleaker
4bf02f2444 added new Book sub-items. 2012-08-03 16:02:07 -07:00
Sleaker
52fa0ec0bf fix slab types. 2012-08-03 15:54:09 -07:00
Sleaker
feff3044df fix pom.xml for Gringotts merge. 
Started working on new Wood step/stair for 1.3.1
 2012-08-03 10:01:23 -07:00
Harry Jeffery
72dba73b15 Merge pull request #1 from eXeC64/master 
Pulling todays changes to the org's repo
 2012-08-03 09:27:33 -07:00