Commit Graph

1043 Commits

Author SHA1 Message Date
nossr50
5facd8d412 Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable
# Conflicts:
#	Changelog.txt
#	pom.xml
#	src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
2019-04-09 14:38:49 -07:00
nossr50
e5de240eb4 Reduced Roll XP CD from 60s - > 10s 2019-04-08 17:58:06 -07:00
nossr50
ee90780d7b Multiple items can be specified as a detonator 2019-04-06 06:28:56 -07:00
nossr50
abda53641f Merging 2019-04-06 06:10:52 -07:00
nossr50
d599db2897 2.1.37 - Fixes #3859 2019-04-06 05:14:52 -07:00
nossr50
4068d61246 Merge master 2019-04-04 19:20:24 -07:00
nossr50
af744fa088 Villagers give XP now 2019-04-04 18:55:25 -07:00
nossr50
8538ac4e50 mcnotify will now squelch notifications from mcMMO & players who are squelched will be reminded of their squelch status at least once an hour (you can disable this in advanced.yml) 2019-04-04 17:27:17 -07:00
nossr50
f1d9f787f4 2.1.35 2019-04-04 00:39:00 -07:00
nossr50
6cad982969 Merge conflicts 2019-04-04 00:24:34 -07:00
nossr50
b8b0be71b1 2.1.34 2019-04-03 22:01:45 -07:00
nossr50
ac10261803 Blast Mining uses Pickaxe + Missing Taming XP entries 2019-04-03 21:54:49 -07:00
nossr50
43037f8c13 Code Cleanup Pt 2 2019-04-03 19:25:14 -07:00
nossr50
8991c2bf2c Fixing merge conflicts 2019-04-03 17:25:18 -07:00
nossr50
f3837265db 2.1.33 2019-04-02 23:03:48 -07:00
nossr50
eb43dc4460 Refactoring Salvageables/Repairables, removing Simple from the naming schemes 2019-04-02 17:42:35 -07:00
nossr50
09c91f3b4b 2.1.32 2019-04-01 16:22:43 -07:00
nossr50
dcd40d3ced 2.1.31 2019-04-01 16:17:40 -07:00
nossr50
456e64456d Fixing an issue with mmoedit triggering notifications for skills already unlocked 2019-04-01 16:15:53 -07:00
nossr50
f1ecef310c Fixed a bug involving SubSkill notifications
Fixes #3808, also fixed the notification timer
2019-04-01 16:15:52 -07:00
nossr50
0d3551c84b Adding missing Double Drop entries for Woodcutting 2019-04-01 16:06:16 -07:00
nossr50
dc4401ffb0 Add missing Herbalism entries to config 2019-04-01 16:04:30 -07:00
nossr50
9568c0f85c Fixing Mining Double Drops (update configs) 2019-04-01 16:04:29 -07:00
nossr50
ae551e17cd 2.1.32 2019-04-01 10:16:43 -07:00
nossr50
68e34d682c 2.1.31 2019-03-30 17:45:03 -07:00
nossr50
b125600dac Fixing an issue with mmoedit triggering notifications for skills already unlocked 2019-03-30 17:44:06 -07:00
nossr50
7757e187be Fixed a bug involving SubSkill notifications
Fixes #3808, also fixed the notification timer
2019-03-30 16:56:00 -07:00
nossr50
b7d33f0227 Adding missing Double Drop entries for Woodcutting 2019-03-29 18:11:32 -07:00
nossr50
28c7fdd4e2 Add missing Herbalism entries to config 2019-03-29 17:57:48 -07:00
nossr50
53534e0f1d Fixing Mining Double Drops (update configs) 2019-03-29 17:44:54 -07:00
nossr50
74908cdcf5 2.1.29 - Double Drop Fix 2019-03-29 11:27:49 -07:00
nossr50
e232bb3699 finished default repairables, diamond armor gives less xp by default 2019-03-29 00:03:50 -07:00
nossr50
968636b8d4 Repairables can now specify multiple items that can be used for repairs 2019-03-29 00:03:50 -07:00
nossr50
121c54b802 Repair Config Pt 2 2019-03-29 00:03:09 -07:00
nossr50
2cdb0395ee wire up alerting admins to over-fishing repeated abuse 2019-03-29 00:03:08 -07:00
nossr50
c01b8e4ad4 Update changelog 2019-03-29 00:01:39 -07:00
nossr50
ac04ca5c27 Exploit Config Tweaks 2019-03-29 00:01:38 -07:00
nossr50
956b01a28e wire up creatures config 2019-03-29 00:01:38 -07:00
nossr50
bd0a4c75c0 Wire up backup config 2019-03-29 00:01:38 -07:00
nossr50
7d2e76e464 Super Ability config pt 2 2019-03-29 00:00:26 -07:00
nossr50
3a21a913c6 Added toggle to disable party system 2019-03-29 00:00:26 -07:00
nossr50
652291fee1 Tweaking changelog 2019-03-29 00:00:25 -07:00
nossr50
82dec38e5c Wire up Party Config pt 2 2019-03-29 00:00:23 -07:00
nossr50
f96c4bc063 Party Config pt 3 2019-03-29 00:00:22 -07:00
nossr50
a812ca42f7 Party config pt 2 2019-03-29 00:00:22 -07:00
nossr50
96b781ab0a Add super ability config 2019-03-29 00:00:22 -07:00
nossr50
e57bf35e5e new settings for showing patreon, paypal 2019-03-29 00:00:19 -07:00
nossr50
efdd56684b Add options for Fishing exploit prevention 2019-03-29 00:00:18 -07:00
nossr50
0d8b4c5f5f Add Acrobatics exploit prevention config settings 2019-03-29 00:00:18 -07:00
nossr50
04fdd3270a MOTD Config 2019-03-29 00:00:18 -07:00