321fcd7b84
Merge pull request #2850 from DylanCare/master
...
Fixes Alchemy for Stage 1 Potions and Lingering
2016-03-23 21:21:51 -05:00
c5970e9246
Ensure NETHER_WARTS are renamed to NETHER_STALK
2016-03-21 14:42:57 -04:00
538a0c5d6c
Fixes Stage 1 Potions
...
The 'NETHER_WARTS' material enum should be 'NETHER_STALK' to represent the actual item.
Adds Dragon's Breath as Tier 1 Ingredient so lingering potions are actually validated as an mcMMO brew.
Adds second type of Potion of Water to support water potions that are spawned in via commands or other plugins.
2016-03-21 14:38:58 -04:00
4c4df60b81
Was in a second location as well.
2016-03-20 17:52:21 -05:00
d1cf08c6ba
Null check. Fixes #2840 #2842
2016-03-20 12:47:27 -05:00
e091a8eb55
Fix material validation errors.
2016-03-20 12:42:16 -05:00
d579c9a2af
Merge pull request #2829 from DorCoMaNdO/master
...
Stop duplicate messages from abilities.
2016-03-17 19:38:55 -05:00
a711d3a3e3
Stop duplicate messages from abilities.
2016-03-18 02:18:40 +02:00
2c197af9fd
Merge remote-tracking branch 'refs/remotes/mcMMO-Dev/master'
2016-03-18 02:17:03 +02:00
d58d621f96
Bump java compat version (reverted from commit 0203252b63)
2016-03-17 16:57:27 -05:00
0203252b63
Bump java compat version
2016-03-17 16:52:41 -05:00
22edd121d3
Back to dev
2016-03-17 12:36:32 -05:00
31b83becad
Version bump 1.5.04
2016-03-17 12:36:08 -05:00
6cce3098db
Update PotionConfigGenerator and default potions.yml for missing potions
2016-03-17 12:31:20 -05:00
fd3d60d112
Merge pull request #2828 from SidShakal/master
...
Moved center of block drops to block center. Fixes #2544 .
2016-03-17 11:16:24 -05:00
9094e5feb8
French Translation update provided by @HollishKid Resolves #2819
2016-03-17 12:12:22 -05:00
60bfabb097
Moved salvaged material spawn center to center of top face of anvil.
...
My fix for the central spawn points of various block-based item drops
moved them from the low corner of the block to the center of the block.
In the case of the salvaged materials, this moved the central spawn
point from the low corner of the top face of the anvil block to the
center of the block above the anvil block. This felt unnatural, so the
point has been moved to the center of the top face of the anvil block.
2016-03-17 02:06:19 -05:00
2d4cf76825
... (completing the previous style fix)
...
Not sure how I missed this one. (Well, sure I do. I used the GitHub
editor for the re-casing of the variable name. Noob mistake.)
2016-03-16 20:38:24 -05:00
6a7279ea05
Merge pull request #2824 from DorCoMaNdO/master
...
Custom potion brewing now consume fuel from the brewing stand.
2016-03-16 18:07:45 -05:00
4cb4a6224b
Added javadoc for Misc.getBlockCenter(BlockState)
...
And camel-cased the parameter name to conform to style.
2016-03-16 15:47:24 -05:00
a6e445b7ef
Minor formatting adjustments to keep my commit to code style.
...
Whoops. Eclipse removed a line in imports, and I placed a brace on the
wrong line. Fixed.
2016-03-16 12:01:52 -05:00
123a139e43
Moving the center of block drops to block center. Fixes #2544 .
2016-03-16 11:47:40 -05:00
4054315c19
Custom potion brewing now consume fuel from the brewing stand.
...
Fixed a glitch that let players remove the ingredient of a custom potion
from the brewing stand without cancelling the brewing task (this doesn't
seem to have caused any duplicates, once the task finished nothing
happened).
2016-03-16 15:16:48 +02:00
d942cedb8e
Merge remote-tracking branch 'refs/remotes/mcMMO-Dev/master'
2016-03-16 15:11:51 +02:00
ec774b590b
Fix potions. Fixes #2813 , #2814
2016-03-16 00:39:36 -05:00
988a11a5da
Merge remote-tracking branch 'refs/remotes/mcMMO-Dev/master'
2016-03-13 01:11:51 +02:00
1488946fc5
Merge pull request #2694 from Maximvdw/patch-1
...
Fixed NPE when skill is not in config
2016-03-12 17:56:40 -05:00
1f05967b0b
Merge pull request #2725 from EvilOlaf/patch-3
...
Fix space and color code
2016-03-12 17:56:11 -05:00
4924391ae8
Merge pull request #2726 from JamieSinn/master
...
If sender is console, strip colours for mctop
2016-03-12 17:55:59 -05:00
f2668d7dbb
Merge pull request #2735 from EvilOlaf/patch-2
...
fixed typo
2016-03-12 17:55:46 -05:00
d26779bee9
Merge pull request #2810 from DorCoMaNdO/master
...
Fix Shroom Thumb not removing the item held.
2016-03-12 17:55:35 -05:00
c75715b186
We need to name the custom potions.
2016-03-12 17:52:19 -05:00
a238b7029d
Update default potions.yml and add tool to do so in the future.
2016-03-12 17:45:14 -05:00
98511136ee
Fix Shroom Thumb not removing the item held.
2016-03-12 20:35:19 +02:00
6723b3a4c6
Merge pull request #2803 from DorCoMaNdO/master
...
Treat grass path as grass...
2016-03-12 12:17:04 -05:00
40c61149cf
Treat grass paths as grass.
2016-03-12 08:12:27 +02:00
4f9a463b9d
Merge remote-tracking branch 'refs/remotes/mcMMO-Dev/master'
2016-03-12 08:03:30 +02:00
f3a8208425
Add new enchants and fallback to bukkit enchant name map
2016-03-11 22:55:01 -05:00
cbf2f34f93
Update Treasures for potions
2016-03-11 22:42:55 -05:00
898fad6be4
Merge pull request #2801 from DorCoMaNdO/master
...
Chorus plant experience reward is now 1 instead of 2.
2016-03-11 22:38:46 -05:00
eaa1a8edca
Chorus plant experience reward is now 1 instead of 2.
...
Sneaking is required if the player has an item in the off hand and
they're not in a vehicle.
2016-03-12 05:31:11 +02:00
08db154791
Merge pull request #3 from mcMMO-Dev/master
...
Merge master
2016-03-12 05:29:35 +02:00
e1cf4c0c67
Merge pull request #2800 from DorCoMaNdO/master
...
Fix config auto update.
2016-03-11 22:21:59 -05:00
529c43b0e6
Fix config auto update.
2016-03-12 05:10:41 +02:00
376abdf49e
Merge pull request #2799 from DorCoMaNdO/patch-3
...
Use getItemInMainHand()
2016-03-11 22:09:08 -05:00
11a744a772
Properly calculate potionstage
2016-03-11 22:07:27 -05:00
47f73ba455
Merge pull request #2 from mcMMO-Dev/master
...
Merge master
2016-03-12 05:05:37 +02:00
001b11efc6
Better Auto-Update config loader, still cannot handle multiple options with the exact same name and spacing, but will not break configs anymore in those situations, just mis-comment.
2016-03-11 21:54:57 -05:00
089f3a0e71
Does this fix the CI? (reverted from commit af9a3c85c6)
2016-03-11 21:30:11 -05:00
af9a3c85c6
Does this fix the CI?
2016-03-11 21:28:46 -05:00
