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
710 Commits 4 Branches 2 Tags 118 MiB
8ff13422b6
Commit Graph

710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Keir Nellyer
4c2f73afd8 Added CommandsEX to the README file 2012-11-17 12:17:30 +00:00
Keir Nellyer
ff988e6d4a Update for CommandsEX API changes 2012-11-17 12:08:50 +00:00
Sleaker
86bd5746fd missed nether star 2012-11-10 17:37:36 -08:00
Sleaker
245a0c8cff updated to CB 1.4.2 beta. added 1.4 items to item class. 2012-11-10 17:34:42 -08:00
Sleaker
88ec6335d2 fix BOSE7 impl to use builtin currency formatter. 2012-11-08 23:58:06 -08:00
Sleaker
2551f28e48 coding style. 2012-10-26 17:00:21 -07:00
Rodney Ramos
b52b2443ab Merge pull request #291 from greatman/master 
Fixed pom.xml to be able to be used with Sonar. Can probably fix some building issues also.
 2012-10-26 15:27:48 -07:00
William Lebel
2d5c702ca9 Fixing the pom.xml to be able to be used with Sonar. 2012-10-26 18:14:51 -04:00
Sleaker
b90b6d6ce5 build against latest CB. 2012-10-17 19:45:02 -07:00
Nick Minkler
3dde120abf Merge pull request #286 from iKeirNez/master 
Fix name of plugin to get having incorrect capitalisation
 2012-10-17 06:40:00 -07:00
Keir Nellyer
e650f84f77 Fix name of plugin to get having incorrect capitalisation 2012-10-17 09:40:56 +01:00
Sleaker
78fb12fb94 path fix for CommandsEX.jar 2012-10-16 16:28:00 -07:00
Rodney Ramos
62f6366240 Merge pull request #285 from mung3r/master 
CommandsEX fixup
 2012-10-16 16:18:07 -07:00
mung3r
f4067761d8 fixed plugin name for CommandsEX hook 2012-10-16 16:16:03 -07:00
mung3r
2c87954d4f added missing entry for CommandsEX in pom.xml 2012-10-16 16:13:11 -07:00
mung3r
95824b24eb Merge remote-tracking branch 'upstream/master' 2012-10-16 16:11:36 -07:00
Rodney Ramos
7f742cdd45 Merge pull request #284 from iKeirNez/master 
Added CommandsEX Support
 2012-10-16 16:08:23 -07:00
Keir Nellyer
4a62ff4b3d Updated jar file 2012-10-16 21:32:38 +01:00
Keir Nellyer
2af896eb28 Added API for the Upcoming CommandsEX Economy feature (will be present 
in CommandsEX Release v2.0)

Haven't tested yet, but I am pretty sure it works, when I get time I
will test it.
 2012-10-16 21:02:16 +01:00
Rodney Ramos
45820e6a37 Merge pull request #4 from MilkBowl/master 
sync
 2012-10-16 08:16:14 -07:00
Sleaker
0e36b23d61 missing gravel 2012-10-04 22:28:49 -07:00
Rodney Ramos
155a7df34b Merge pull request #3 from MilkBowl/master 
sync
 2012-10-01 07:08:16 -07:00
Sleaker
e15bc63c50 version+ for dev toward next. 2012-09-30 20:18:09 -07:00
Sleaker
bce326825b fix silverfish block name search 2012-09-29 05:44:53 -07:00
Rodney Ramos
bafe9613ca Merge pull request #2 from MilkBowl/master 
update
 2012-09-27 08:45:57 -07:00
Sleaker
9016e29762 Fixed not updating the pom or including the proper license header. 2012-09-24 06:12:40 -07:00
Nick Minkler
0b399f5e35 Merge pull request #267 from gravypod/master 
add Dosh support
 2012-09-24 06:07:55 -07:00
Joshua D. Katz
7cad26e191 Update Vault to use the Dosh plugin 2012-09-23 16:47:07 -04:00
Sleaker
e39061d851 fix pom 2012-09-21 15:35:55 -07:00
Nick Minkler
32ed41b95a Merge pull request #265 from greatman/master 
Craftconomy 3 file
 2012-09-21 15:28:31 -07:00
William Lebel
6e57de7f9b Craftconomy 3 .jar file update. 2012-09-21 18:24:02 -04:00
Nick Minkler
240e64cb8c Merge pull request #264 from greatman/master 
Craftconomy3 update.
 2012-09-21 15:21:54 -07:00
William Lebel
fa8d51fa24 Craftconomy3 update 
Signed-off-by: William Lebel <lebelwilliam@gmail.com>
 2012-09-21 18:20:29 -04:00
Sleaker
ff3541c31a added air, apparently it's valid. 2012-09-20 15:48:56 -07:00
Sleaker
60ae2957e7 unused import. 2012-09-18 14:16:13 -07:00
Sleaker
2a48db6eed fix typo 2012-09-18 14:14:57 -07:00
Sleaker
ae92a13366 Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git 2012-09-18 14:13:44 -07:00