EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-24 22:26:46 +01:00
Code Issues Projects Releases Wiki Activity
6,194 Commits 48 Branches 45 Tags 34 MiB
843e3ace99
Commit Graph

6194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nossr50
3a035e234a Scoreboards fixes 2020-08-08 15:56:53 -07:00
nossr50
0f1bfc4141 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-07 11:52:39 -07:00
nossr50
771ed9a8b4 oopsie 2020-08-07 11:50:44 -07:00
nossr50
d6ff1348eb Polish locale woodcutting rename 2020-08-07 11:49:12 -07:00
nossr50
ae5ee8957c Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-08-06 19:02:18 -07:00
nossr50
8df15a4e55 dev mode 2020-08-06 19:01:36 -07:00
nossr50
4a4fd9fb75 2.1.139 2020-08-06 18:50:24 -07:00
emanondev
38017cabe7
fixed /mmoinfo roll (#4088) 
* acrobatics roll mmoinfo fixes

LocaleLoader#getString() accepts Object arrays no need to call getStats twice

Max skill level is now configurable and so halfMaxSkillValue is now a variable which should be used on locale too instead of "50"

* Updated locale_it

Acrobatics.SubSkill.Roll.Mechanics supports half level variable instead of static level 50

* Updated locale_en_US

Acrobatics.SubSkill.Roll.Mechanics supports half level variable instead of static level 50

* Updated Locale it

fixed value
 2020-08-06 18:46:12 -07:00
Flannery Lue Moore
375292c0b3
PR for gilded blackstone and nether gold ore to the mining skill, and nether gold ore to the smelting skill. (#4253) 
* Added gilded blackstone and nether gold ore.

* Added nether gold ore to smelting xp.
 2020-08-06 15:22:48 -07:00
t00thpick1
01f111f78d Switch to countdown latch so we don't need to bother with synchronization blocks. Fixes #4248 2020-08-02 12:56:27 -04:00
nossr50
d80c275abb Part 1 of reworking ability tools 2020-08-01 14:42:38 -07:00
nossr50
d1b7e88b7e Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2020-07-31 20:47:01 -07:00
nossr50
c85ca2e2ca Dev mode 2020-07-31 20:46:52 -07:00
Robert Alan Chapton
7828437414
Merge pull request #4235 from kn-km/patch-1 
Fix McMMOPlayerSalvageCheckEvent Handling
 2020-07-31 20:43:44 -07:00
Robert Alan Chapton
0dba450b5a
Merge pull request #4236 from kn-km/patch-2 
Fix McMMOPlayerRepairCheckEvent Handling
 2020-07-31 20:43:01 -07:00
nossr50
916a747f88 More work on new super abilities 2020-07-31 19:41:28 -07:00
nossr50
ea2e2bdc9a More cleanup on ability activation handling 2020-07-31 17:41:43 -07:00
nossr50
03f1733387 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-30 19:24:20 -07:00
nossr50
df7c9e0b1c SuperAbilityManager will handle super ability stuff 2020-07-30 19:23:10 -07:00
nossr50
d490f4fd60 2.1.138 2020-07-30 16:28:47 -07:00
nossr50
a05c015732 Fix Netherite not working for certain skills (like Skull Splitter) 2020-07-30 16:12:50 -07:00
nossr50
2020fdd4ea Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-30 13:18:20 -07:00
nossr50
9f9518eea0 2.1.137 - avoid npe on armor iterating 2020-07-30 13:05:19 -07:00
nossr50
9266a54fce debug tweaks 2020-07-30 11:17:08 -07:00
nossr50
2c64eadafa command tweaks for xbow 2020-07-29 10:42:38 -07:00
nossr50
93eba8da2b more work on new skill commands 2020-07-29 10:25:16 -07:00
nossr50
a82b899eb6 Add some missing things for new skill commands 2020-07-29 10:22:18 -07:00
nossr50
8112973dbe Renamed Cone of Death to Super Shotgun 2020-07-29 10:05:12 -07:00
nossr50
f390e6a78a Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-29 08:20:08 -07:00
nossr50
270298c265 2.1.136 2020-07-29 07:41:47 -07:00
nossr50
38122d8f17 Furnace ownership tweaks 2020-07-28 21:56:51 -07:00
nossr50
3ca06f2518 More work on xbows 2020-07-28 18:17:57 -07:00
nossr50
515d58f04f Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-27 21:53:12 -07:00
nossr50
274a41f530 update changelog 2020-07-27 21:39:26 -07:00
nossr50
8e3d203594 only cleanup furnaces without a job 2020-07-27 21:34:47 -07:00
nossr50
4169dceca8 debug tweak for furnaces 2020-07-27 21:20:03 -07:00
nossr50
567a5461e1 Add some more mmodebug related to furnaces 2020-07-27 21:19:25 -07:00
nossr50
9eade9abc7 placeholder xbow code 2020-07-27 21:11:07 -07:00
Robert Alan Chapton
70c934fa69
Merge pull request #4233 from SrBedrock/patch-1 
Update CommandRegistrationManager.java
 2020-07-27 20:26:26 -07:00
kn-km
ed9521d4a0
Fix #4234 2020-07-27 23:18:55 +08:00
kn-km
5d294d6dc3
Fix #4234 2020-07-27 22:55:44 +08:00
srbedrock
2eb924d433
Update CommandRegistrationManager.java 2020-07-26 22:04:43 -03:00
srbedrock
c97dc4181d
Update CommandRegistrationManager.java 2020-07-26 22:01:30 -03:00
nossr50
e0cf66c421 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-07-26 05:08:49 -07:00
nossr50
a28d1cd537 2.1.135 2020-07-25 14:27:31 -07:00
Robert Alan Chapton
65a95addb9
Merge pull request #4230 from Ineusia/AbilityNotificatioons 
Add option to disable other-player ability notifications
 2020-07-25 14:26:08 -07:00
Robert Alan Chapton
81b31e49b8
Merge pull request #4231 from Ineusia/issue-4221 
Use localized names for SuperAbility names
 2020-07-25 14:25:36 -07:00
Ineusia
353fb80957 Use localized names for SuperAbility names 2020-07-25 12:13:54 -05:00
Ineusia
5298472c90 Add option to disable other-player ability notifications 2020-07-25 11:10:01 -05:00
nossr50
36af6d2478 update changes 2020-07-25 08:40:20 -07:00