4842 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dor	4f9a463b9d	Merge remote-tracking branch 'refs/remotes/mcMMO-Dev/master'	2016-03-12 08:03:30 +02:00
t00thpick1	f3a8208425	Add new enchants and fallback to bukkit enchant name map	2016-03-11 22:55:01 -05:00
t00thpick1	cbf2f34f93	Update Treasures for potions	2016-03-11 22:42:55 -05:00
t00thpick1	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
Dor	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
Dor	08db154791	Merge pull request #3 from mcMMO-Dev/master ... Merge master	2016-03-12 05:29:35 +02:00
t00thpick1	e1cf4c0c67	Merge pull request #2800 from DorCoMaNdO/master ... Fix config auto update.	2016-03-11 22:21:59 -05:00
Dor	529c43b0e6	Fix config auto update.	2016-03-12 05:10:41 +02:00
t00thpick1	376abdf49e	Merge pull request #2799 from DorCoMaNdO/patch-3 ... Use getItemInMainHand()	2016-03-11 22:09:08 -05:00
t00thpick1	11a744a772	Properly calculate potionstage	2016-03-11 22:07:27 -05:00
Dor	47f73ba455	Merge pull request #2 from mcMMO-Dev/master ... Merge master	2016-03-12 05:05:37 +02:00
t00thpick1	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
t00thpick1	089f3a0e71	Does this fix the CI? (reverted from commit af9a3c85c6)	2016-03-11 21:30:11 -05:00
t00thpick1	af9a3c85c6	Does this fix the CI?	2016-03-11 21:28:46 -05:00
t00thpick1	a534f9aac1	Update default Potions.yml to have some of the new format, someone should PR a full update.	2016-03-11 21:15:22 -05:00
t00thpick1	a08016647a	Update to new Potions API, still supports old config options	2016-03-11 21:08:10 -05:00
Dor	a557fc7d3c	Use getItemInMainHand() ... Add 1.9 blocks to be detected for experience rewards. Add experience rewards for the Chorus plant. Add experience rewards for the Shulker mob.	2016-03-11 16:20:23 +02:00
Dor	2d3d11ec2d	Merge pull request #1 from mcMMO-Dev/master ... Merge master	2016-03-11 06:01:08 +02:00
t00thpick1	9bc97c6dd3	I think this fixes the auto update config function when a config file has two similar keys. (reverted from commit 52f1e33052)	2016-03-08 08:09:48 -05:00
t00thpick1	52f1e33052	I think this fixes the auto update config function when a config file has two similar keys.	2016-03-07 18:41:49 -05:00
t00thpick1	272e99d41f	Master volume config option	2016-03-06 16:48:56 -05:00
t00thpick1	77b67d5a79	Merge pull request #2781 from Tslat/patch-1 ... Fix infinite GreenThumb & ShroomThumb usage bug -Not sure if this is the correct way to fix this, but it is A way, and that will due in the meantime.	2016-03-05 23:57:25 -05:00
t00thpick1	8e1f464209	Merge pull request #2783 from Tslat/patch-2 ... Update ability blacklist to include 1.8 fence[gate] types	2016-03-05 23:56:08 -05:00
Tslat	5f960fd80a	Update ability blacklist to include 1.8 fence[gate] types	2016-03-06 14:36:21 +10:00
Tslat	bddca30668	Fix infinite GreenThumb & ShroomThumb usage bug	2016-03-05 20:39:16 +10:00
t00thpick1	28a2b9668d	I think preserve potions backwards compatability and also update documentation.	2016-03-01 17:16:59 -05:00
t00thpick1	f52d9feef8	Update Alchemy for 1.9 Configuration style has changed, but theoretically old version should still work I think.	2016-03-01 17:05:58 -05:00
t00thpick1	f77ae6ee15	Biome needs to be in the enum compatability as well.	2016-03-01 13:25:51 -05:00
t00thpick1	88b99a3835	I *think* this should be backwards compatible, I may be wrong and it could break both.	2016-03-01 13:08:11 -05:00
t00thpick1	8d16af8770	Why is my local compiler missing thigns the CI hits?	2016-03-01 12:42:26 -05:00
t00thpick1	fde9ba86a2	Actually update all sounds	2016-03-01 12:39:05 -05:00
t00thpick1	c9356f9ef5	Update for 1.9 Sound enum changes. Now only compatible with 1.9+	2016-03-01 12:21:00 -05:00
t00thpick1	6a0529f02d	Fully remove metrics.	2016-01-28 15:20:36 -05:00
t00thpick1	760178c061	Give custom perk boost the highest priority.	2016-01-28 13:37:21 -05:00
t00thpick1	0bb2642d24	Remove metrics	2016-01-11 14:12:54 -05:00
Very Evil Olaf	635a4f7265	fixed typo ... smelt = Schmelzung, not Schmelung	2015-12-28 20:18:55 +01:00
Jamie Sinn	0e34202d4d	Curly braces as toothpick requested ... @andrewkm	2015-12-20 23:05:48 -05:00
JamieSinn	3a9c55a9ea	Remove ternary operators and use if/else	2015-12-12 00:04:23 -05:00
JamieSinn	2dd1775d9a	Remove regex replace, does nothing	2015-12-11 23:52:14 -05:00
JamieSinn	a0635eeb08	Remove escape character at EOL	2015-12-11 23:45:17 -05:00
JamieSinn	9677653c54	If sender is console, strip colours for mctop ... Ugly ugly colours.	2015-12-11 23:30:21 -05:00
Very Evil Olaf	6cf7167c09	Fix space and color code	2015-12-10 21:37:42 +01:00
t00thpick1	9718123292	Catchup the changelog	2015-11-12 19:19:57 -05:00
t00thpick1	420559efec	Append to existing lore when crafting Flux Pickaxes. Fixes #2557	2015-11-12 19:13:27 -05:00
t00thpick1	f4b6d7845e	Add config option to auto-truncate player skill levels that exceed the configured max level. Adds #2512 ... Also removes a good bit of magic numbering from FlatFileDatabaseManager	2015-11-12 19:10:30 -05:00
t00thpick1	b966529487	Merge pull request #2709 from JamieSinn/master ... Strip colours from party chat when logging to console.	2015-11-12 17:43:34 -05:00
JamieSinn	9c7b83a52e	Strip colours from party chat when logging to console.	2015-11-12 16:06:43 -05:00
t00thpick1	ac9447d439	This is actually not correct.	2015-11-04 16:31:30 -05:00
t00thpick1	a5bcc3ce58	Correctly identify tree species. Fixes #2667	2015-11-04 16:06:28 -05:00
t00thpick1	a020890244	Remove hardcoded nerf to treefeller. Fixes #2666	2015-11-04 15:53:38 -05:00