1
0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2026-02-17 17:32:36 +01:00
Commit Graph

466 Commits

Author SHA1 Message Date
nossr50
256dbc14e2 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2021-04-20 14:35:31 -07:00
nossr50
16f79b9fbc Locale override now uses a specific file instead of weird name matching 2021-04-16 13:50:41 -07:00
nossr50
c29f311f1e More proper fix 2021-04-16 12:24:02 -07:00
nossr50
04459f1ea7 Fix leaderboards & fix override locale bug
Fixes #4493 Fixes #4492
2021-04-16 09:55:44 -07:00
nossr50
d9e195f63a Add a newUser test 2021-04-13 15:22:21 -07:00
nossr50
834ccc946a FlatFileDatabaseManager refactor + adding tests part 1 2021-04-09 16:45:58 -07:00
nossr50
56f9341f8e Add mcMMO_Region_System.Enabled to persistent_data.yml (removed from hidden config) 2021-04-09 07:54:34 -07:00
nossr50
74d0d2c3f9 Comment these out for now 2021-04-08 13:22:46 -07:00
nossr50
eec5feb2bf PrimarySkillType refactor and other refactors 2021-04-08 13:21:34 -07:00
nossr50
5080d86e44 Refactoring code part 1 to prep for adding a bunch of unit tests 2021-04-08 10:39:07 -07:00
nossr50
29ee91ddfc Merge branches 'tridentsxbows' and 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2021-04-07 16:21:02 -07:00
nossr50
44c820089c remove UP warning 2021-04-06 14:48:53 -07:00
nossr50
4c237b2e9c Tweak UP msg, remove debug msg about unused keys 2021-04-05 13:50:27 -07:00
nossr50
db55635f0d Tweak UP warning 2021-04-04 18:23:13 -07:00
nossr50
a2ee4be86a Fix some bugs with Rupture and fix a small memory leak 2021-04-02 20:31:19 -07:00
nossr50
48bf79055a Rupture has been reworked 2021-04-02 11:00:11 -07:00
nossr50
a2ba406fe5 Removed April Fools event 2021-03-31 15:14:00 -07:00
nossr50
d21368f3e6 Merge branch 'master' of https://github.com/mcMMO-Dev/mcMMO into tridentsxbows 2021-03-31 14:01:32 -07:00
nossr50
fdefea3235 treasures.yml now has specific entries for Standard/Retro 2021-03-30 15:37:01 -07:00
nossr50
eea922c31f TODO: Look into double drops for berry bushes 2021-03-25 14:08:22 -07:00
nossr50
062665ded4 Add back some missing commands 2021-03-19 13:40:38 -07:00
nossr50
d33c214266 Rollback UserManager to being static again 2021-03-19 12:44:03 -07:00
nossr50
3bda73de2e Merge branches 'tridentsxbows' and 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2021-03-19 12:35:34 -07:00
nossr50
49f1154e65 NPE fix for McMMOPlayerExperienceEvent 2021-03-18 15:15:43 -07:00
nossr50
4f08c69557 Add UltraPermission warning to mcMMO 2021-03-18 13:18:30 -07:00
nossr50
667b9a2226 Remove ChatControlRed warning pending further proof of bug 2021-03-17 09:59:18 -07:00
nossr50
dc2c099231 Add warning about the plugin conflict between mcMMO and ChatControlRed 2021-03-16 16:36:16 -07:00
nossr50
a6276bded8 Gutting out new Skill API and putting it on hold 2021-03-16 14:43:31 -07:00
nossr50
31904ef181 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2021-03-16 14:18:09 -07:00
nossr50
49d4e97930 Some safety redundancy 2021-03-16 14:05:33 -07:00
nossr50
7c270feacb Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2021-03-03 16:36:24 -08:00
TheBusyBiscuit
06e38c991a Updated dependencies (also fixes #4404) (#4440) 2021-02-24 18:03:07 -08:00
TheBusyBiscuit
db2c0e89e7 Fixed #4438 and also normalized some stuff (#4439) 2021-02-23 12:28:45 -08:00
nossr50
2bad0a67a6 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2021-02-05 15:51:51 -08:00
nossr50
a85fd024b2 Have correct bStats data point to a new id 2021-01-21 15:00:42 -08:00
nossr50
6c5eb72ab4 Fixed an error in bstats where Retro Mode was reported as Standard mode and vice versa
I might be the most dyslexic person ever
2021-01-21 14:56:45 -08:00
TheBusyBiscuit
67f29d52b3 Updated bStats (#4384)
Thank you
2021-01-21 14:54:51 -08:00
nossr50
602d47698a Start to migrate Party API -> mcMMO-API 2021-01-06 15:31:02 -08:00
nossr50
4e8262d818 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2021-01-02 16:07:17 -08:00
t00thpick1
5b41b04777 Use @NotNull in methods rather than @Nullable
Separate safe external methods from internal only methods
Remove unnecessary methods
2021-01-02 17:29:15 -05:00
nossr50
fbecbc167a Optimizations and potentially fixing a ConcurrentModificationException involving the TransientEntityTracker
Fixes #4368
2021-01-01 14:04:36 -08:00
nossr50
2664ae4bd6 Optimize ChunkUnloadEvent & Partial rewrite to COTW entity tracking + some tweaks to COTW entity removal 2020-12-31 15:25:21 -08:00
nossr50
5b898049a3 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-12-30 15:49:16 -08:00
nossr50
01f31e76f5 new chunkstore
Co-authored-by: t00thpick1 <t00thpick1dirko@gmail.com>
2020-12-30 15:24:21 -08:00
nossr50
652a9519c1 Move fishing treasues to new file fishing_treasures.yml, replace Records rarity with Mythic, and allow for Enchanted_Book in the treasures list with new optional whitelist/blacklist parameters
read the changelog for information about this
2020-12-28 16:42:00 -08:00
nossr50
9b9ffbb982 More work on migrating commands to new API 2020-12-23 15:29:39 -08:00
nossr50
abcf6413f5 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows 2020-12-17 15:10:53 -08:00
nossr50
2de52c7955 register new chunk listener 2020-12-16 16:30:05 -08:00
nossr50
306b8cfac4 more work on migrating the API 2020-12-15 16:24:11 -08:00
nossr50
64e1d1a9d7 more refactoring/rewrites for player data loading stuff 2020-12-10 17:15:14 -08:00