EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 11:03:43 +01:00
Code Issues Projects Releases Wiki Activity
2,482 Commits 48 Branches 45 Tags
9689c506032a8903ae3f5d15d66b5aac6f9f1323
Commit Graph

2482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glitchfinder
32e0be481a Merge pull request #458 from Glitchfinder/master 
Adding a bit more in the way of Dye-related backwards compatibility.
 2013-01-08 15:29:57 -08:00
Glitchfinder
e5592c5da8 Resolving minor merge conflict. 2013-01-08 15:27:59 -08:00
Glitchfinder
b0500332bc Finishing up backwards compatibility for dye colors. 2013-01-08 15:14:12 -08:00
gmcferrin
78b8ac663e A little more cleanup. 2013-01-08 18:09:13 -05:00
Glitchfinder
e41ab3ac18 Merge pull request #457 from Glitchfinder/master 
Minor updates.
 2013-01-08 14:50:39 -08:00
gmcferrin
36d97bbcaf Store the scheduler. 2013-01-08 17:45:52 -05:00
gmcferrin
f3c89fe48b Archery cleanup. 2013-01-08 17:44:05 -05:00
Glitchfinder
9b31520684 Basic error check for backwards compatibility with dye colors. 2013-01-08 14:39:08 -08:00
Glitchfinder
660e68b0a3 Merge branch 'master' of https://github.com/mcMMO-Dev/mcMMO 2013-01-08 14:32:30 -08:00
gmcferrin
08b46e1a7c Cover ALL the bases. 2013-01-08 17:26:11 -05:00
gmcferrin
b78299bbbd Metadata does nothing, apparently. 2013-01-08 17:24:09 -05:00
Glitchfinder
c8687bfc74 Setting up Travis CI. 2013-01-08 14:23:07 -08:00
Glitchfinder
a5219055ef Merge pull request #454 from Glitchfinder/master 
Fixing a minor omission in the Permissions setup.
 2013-01-08 14:07:22 -08:00
Glitchfinder
f79a9e5182 Fixing minor omission in permissions setup. 2013-01-08 14:05:41 -08:00
TfT_02
3904b172ad Better formatting for the comments 2013-01-08 22:19:03 +01:00
gmcferrin
e0da506d1a Protected, not public. 2013-01-08 16:10:19 -05:00
gmcferrin
d2f6191615 Starting on cleaning up null checks & type casting 2013-01-08 16:07:29 -05:00
gmcferrin
7c211fa50c Fix for Super Breaker & Giga Drill Breaker double/triple drops. 2013-01-08 14:56:31 -05:00
gmcferrin
fadec1a846 Remove unused import. 2013-01-08 14:27:09 -05:00
gmcferrin
d2aa19e31f Whoops, forgot to change a reference. 2013-01-08 14:23:21 -05:00
gmcferrin
ccfe1181be More mining restructuring. 2013-01-08 12:52:16 -05:00
gmcferrin
85fb12a4ec Use new Bukkit DyeColor data. 2013-01-08 11:31:07 -05:00
gmcferrin
84994c2b2f Remove a few unused imports & variables. 2013-01-08 10:50:37 -05:00
gmcferrin
1a2dfb9b19 Fixed parameterization issue. 2013-01-08 10:48:30 -05:00
gmcferrin
753652dcf9 More mining updates. 2013-01-08 10:46:19 -05:00
gmcferrin
b99d261084 Remove our workaround for NBT tag issues since Bukkit fixed it. 2013-01-08 10:45:49 -05:00
gmcferrin
aee4bcd65e More mining restructuring. 2013-01-08 09:42:37 -05:00
gmcferrin
159ec3f04d Pass location & type as params, rather than calling inside the function. 2013-01-08 09:35:41 -05:00
Glitchfinder
57ff84cd4d Merge pull request #452 from Glitchfinder/master 
Fixing yet another concurrency error.
 2013-01-08 01:34:31 -08:00
Glitchfinder
2933f80d69 Fixing yet another concurrency error. 2013-01-08 01:32:42 -08:00
gmcferrin
3d38892f7e Only call for an instance of Config once. 2013-01-07 17:40:33 -05:00
gmcferrin
1d990979ac Made the casting a little less complex. 
No need to cast them BOTH to a double, only one is needed.
 2013-01-07 17:27:52 -05:00
gmcferrin
d69cf09d4e Removed some unnecessary casting. 2013-01-07 17:08:53 -05:00
gmcferrin
b8d346d890 More work on Mining restructuring. 2013-01-07 12:51:39 -05:00
gmcferrin
5d58d85eae Remove unused import. 2013-01-07 11:39:59 -05:00
Glitchfinder
bc4d34f2fc Merge pull request #446 from Glitchfinder/master 
Shutting down more concurrency errors.
 2013-01-07 01:21:47 -08:00
Glitchfinder
6565d84cf9 Shutting down more concurrency errors. 2013-01-07 01:20:36 -08:00
Glitchfinder
95ed33b2ce Merge pull request #443 from Glitchfinder/master 
Merge conflicts are fun.
 2013-01-06 18:03:56 -08:00
Glitchfinder
e8f6d4107b Merge conflicts are fun. 2013-01-06 18:02:52 -08:00
Glitchfinder
deb0b211b4 Merge pull request #442 from Glitchfinder/master 
Updating permissions to be more consistent.
 2013-01-06 17:59:50 -08:00
Glitchfinder
83888f80d4 Fixing merge conflicts 2013-01-06 17:59:31 -08:00
Glitchfinder
974862a60a Updating permissions for consistency. 2013-01-06 17:52:31 -08:00
TfT_02
2965f35d6d Merge pull request #1 from WasBornForJustice/patch-1 
Update src/main/resources/locale/locale_ru.properties
 2013-01-06 10:30:32 -08:00
WasBornForJustice
6aa300dac0 Update src/main/resources/locale/locale_ru.properties 
Little translation fixes
 2013-01-06 20:58:31 +04:00
TfT_02
00020a9cbb Skill commands now show the perk effect, if any are active 2013-01-06 12:16:08 +01:00
TfT_02
99c6c46d54 Adding another missing line to all locale files 2013-01-05 11:53:35 +01:00
TfT_02
d183b1b940 Fishermans diet now uses the FoodChance value from advanced.yml 2013-01-05 00:52:11 +01:00
TfT_02
49fc2a93fa Adding missing line to locale files 2013-01-05 00:48:05 +01:00
TfT_02
1c3066aaf7 Fixing a small error pointed out by @sh4z 2013-01-04 12:16:31 +01:00
TfT_02
cdd9745341 Fixing formatting 2013-01-03 17:40:22 +01:00