Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 16:19:53 +01:00
Code Issues Projects Releases Wiki Activity
5,718 Commits 46 Branches 44 Tags 36 MiB
ecac8d00ee
Commit Graph

4721 Commits

Author SHA1 Message Date
nossr50
63e905db6c use a custom collection of serializers instead of the default list 2019-04-24 21:01:33 -07:00
nossr50
e8ea502f77 Add delegates to player level conf and wire up xp formula setting 2019-04-24 19:46:06 -07:00
nossr50
ba8b73ad4d add some missing delegates to xp config 2019-04-24 19:36:46 -07:00
nossr50
df2a52984e add combat default xp values 2019-04-24 19:30:15 -07:00
nossr50
b8ad722e9e Taming default XP values + updated acrobatics XP values 2019-04-24 18:58:29 -07:00
nossr50
7928ababf6 add smelting default xp values 2019-04-24 18:51:52 -07:00
nossr50
0a63e6674a merge prs 2019-04-24 18:24:29 -07:00
Robert A. C
b5930fc35d
Merge pull request #3897 from Zed-I/patch-4 
Added excavation treasure to coarse dirt
 2019-04-24 18:23:29 -07:00
nossr50
7f233b8e77 Tweaking some merge mistakes / bugs 2019-04-24 17:19:04 -07:00
nossr50
17c193f984 Merge branch 'configurable' of https://github.com/mcMMO-dev/mcmmo into configurable 2019-04-24 17:17:26 -07:00
nossr50
176b5db83e 2.1.48 2019-04-24 17:17:14 -07:00
Leomixer17
3329a6c49e
Update locale_it.properties 2019-04-24 23:09:03 +02:00
nossr50
c07a29ba86 mcMMO should work on both 1.13 and 1.14 now 2019-04-23 08:20:00 -07:00
nossr50
b36c4b56c3 first 5 levels in all skills are now much easier to level 2019-04-23 04:21:25 -07:00
nossr50
cee0025147 Bonus XP for early combat levels 2019-04-23 03:52:48 -07:00
nossr50
372ad1fac3 Experience settings for 114 are now under Experience_114 in experience.yml 2019-04-23 03:37:43 -07:00
nossr50
09cba965d3 Switch to GSON since mojang lib does not exist in 1.14 2019-04-23 02:12:22 -07:00
nossr50
d862f7f779 Tool lower task sync 2019-04-23 01:13:21 -07:00
nossr50
0adaa0ba66 PlayerNotification now marked async 2019-04-23 01:10:09 -07:00
nossr50
432a4aa330 1.14 is required for this version of mcMMO 2019-04-23 00:54:49 -07:00
nossr50
1c490cd463 1.14 Compatibility (this build won't run on 1.13 anymore) 2019-04-22 23:54:02 -07:00
nossr50
7506646862 Party NPE fix 2019-04-21 16:56:26 -07:00
Zed-I
570ab49e55
Added excavation treasure to coarse dirt 
Added coarse dirt to all drops that dirt can drop.
Also added grass block to the quartz drop since there is no reason not to.
 2019-04-20 16:35:01 +02:00
nossr50
78fdfc1c35 Made improvements to the Party member list from /party 2019-04-19 17:56:59 -07:00
nossr50
0b26d6c72c Fixed error related to Bleed, fixed missing default XP values for Herbalism and Woodcutting 2019-04-19 14:55:07 -07:00
Zed-I
bbf7ce9c57
Fixed bug where skeleton heads would drop in instead of zombie/creeper heads on successful shake 
Creeper/zombie heads are now their own items and data is no longer used
 2019-04-19 20:35:06 +02:00
Zed-I
4b34299648
Fixed axe salvage bug 
Changes max quantity to 3 from 2 on all axes since they are crafted with 3 resources not 2
 2019-04-19 14:36:29 +02:00
OverCrave
ce92329705 fix it for real now 2019-04-18 22:59:52 +02:00
OverCrave
817b5364cf fix adminchat returning too early if send by console 2019-04-18 22:58:50 +02:00
Robert A. C
9b08f9bc44
Merge pull request #3884 from jstnf/acro-fix 
Check if a player has Absorption when calculating Acrobatics XP gain
 2019-04-17 15:04:28 -07:00
jstnf
3973f9ec43 Check if a player has Absorption when calculating Acrobatics XP gain 2019-04-17 13:51:42 -07:00
nossr50
820c3260c8 2.1.45 - mcMMO will check for outdated software and provide tips 2019-04-17 11:51:13 -07:00
Robert A. C
57bbde552a
Merge pull request #3881 from jstnf/configurable 
Removed more Kraken references - configurable branch
 2019-04-16 11:19:01 -07:00
nossr50
30bc73be7d Repair no longer consumes items with item lore + Fixing logic errors in repair. 2019-04-16 11:17:56 -07:00
Justin
ae35da8e02
Arcane bypass readded 2019-04-16 11:07:46 -07:00
jstnf
3c6b694fb8 Removed more Kraken references - configurable branch 2019-04-16 10:03:37 -07:00
nossr50
bbd43e156a Fixing some mistakes in default values for Repair 2019-04-15 20:14:29 -07:00
nossr50
a9cb28a8f2 Default Repair XP config values 2019-04-15 19:04:20 -07:00
nossr50
3e2f2cd000 Setup default Mining XP config values 2019-04-15 18:44:33 -07:00
nossr50
c69a9fc299 fixing another compile error 2019-04-15 15:51:29 -07:00
nossr50
f09007b60c temporary fix to compile error 2019-04-15 15:49:35 -07:00
nossr50
6e62930b6a Wire up Dodge XP config setting 2019-04-15 15:48:39 -07:00
nossr50
28bf67f154 Add default Herbalism XP values to config, added missing WALL_FAN and DEAD_WALL_FAN blocks 2019-04-15 15:40:41 -07:00
nossr50
5d7d06831b Add default Woodcutting XP values to config, added missing stripped wood values 2019-04-15 12:29:15 -07:00
nossr50
e23aec7294 Add default Excavation XP values to config 2019-04-15 11:59:42 -07:00
nossr50
f90205f1ae Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable 2019-04-15 10:43:26 -07:00
nossr50
7e039321e1 Merge 2.1.44 2019-04-15 10:40:57 -07:00
András Marczinkó
bd0204a09e
Update locale_hu_HU.properties 2019-04-15 10:10:33 +02:00
nossr50
31c1bd52bc 2.1.44 2019-04-14 05:39:23 -07:00
nossr50
0f8c0f97d9 Fixing another NPE for brewing 2019-04-14 05:27:31 -07:00
nossr50
5a56b27ea8 Fix AlchemyBrew NPE 2019-04-14 04:55:37 -07:00
nossr50
138b109ff5 Correct display error when successfully salvaging enchantments 2019-04-13 22:04:35 -07:00
nossr50
d542098f8a New salvage enchant bypass permission node 2019-04-13 13:17:28 -07:00
nossr50
f6e01ea910 UserManager::getPlayer returns null again (oopsie) 2019-04-13 12:58:32 -07:00
nossr50
2a053a0be2 Fixing logic error in mcrank CD msg 2019-04-12 15:34:33 -07:00
nossr50
b5cbfc7f66 Commands.Database.CooldownMS - new locale string 2019-04-12 15:29:37 -07:00
nossr50
8c0076ff80 2.1.41 2019-04-12 15:24:57 -07:00
nossr50
6e3c2fcb76 Fix mcrank cd display 2019-04-12 15:24:01 -07:00
nossr50
33a68daa9c mcMMO now checks in all places for a loaded profile before executing processing on said profile 2019-04-12 15:17:05 -07:00
nossr50
7cf3b4e521 Wire up inspect command settings 2019-04-11 08:05:15 -07:00
nossr50
7e047aed59 Inspect Command Config 2019-04-11 07:39:59 -07:00
nossr50
86f62fba0b Wire up admin chat settings 2019-04-11 07:11:25 -07:00
nossr50
b64b8d0f8f Admin Chat config settings 2019-04-11 07:09:58 -07:00
nossr50
1fe4fef75a Merge master 2.1.40 2019-04-11 04:43:59 -07:00
nossr50
00cc5f0845 Move Fall data to AcrobaticsManager 2019-04-11 04:09:00 -07:00
nossr50
8b0a580505 Fixing Party Chat Bug 2019-04-11 03:49:13 -07:00
nossr50
87bf3a5b40 fixing an oopsie 2019-04-11 00:00:22 -07:00
nossr50
de3e2b79f7 add inner peace to permissions 2019-04-10 06:00:27 -07:00
nossr50
21e1d54ad5 Inner Peace added to /fishing 2019-04-10 05:54:19 -07:00
nossr50
9c1f38ce6d Inner Peace locale strings 2019-04-10 05:46:18 -07:00
nossr50
78aeb0679b new fishing skill Inner Peace 2019-04-10 05:29:35 -07:00
nossr50
c41a650415 Wiring up Fishing config values 2019-04-10 04:56:59 -07:00
nossr50
856e6f0447 Fishing now actually grants XP for caught fish (values in the config did nothing before... lol ) 2019-04-10 04:35:14 -07:00
nossr50
1f734582d4 Add delegates to exploit config 2019-04-10 04:34:27 -07:00
nossr50
75bb3f181d Fishing now always gives fish in addition to treasure (configurable) 
Fixing salvage oopsies
 2019-04-10 04:06:06 -07:00
nossr50
2170c6de24 Setup Fishing XP Methods 2019-04-10 03:32:49 -07:00
nossr50
e156d6d5ef Wire up Alchemy XP config values 2019-04-10 03:01:14 -07:00
nossr50
fb6e5e41ad Wire up Acrobatics XP config + PVP XP 2019-04-10 02:25:47 -07:00
nossr50
8ddbb3aa91 Setup Acrobatics/Alchemy XP methods 2019-04-10 02:03:01 -07:00
nossr50
426b1304e2 Numerous tweaks + failsafes added to Loading/Saving of players 2019-04-10 01:52:34 -07:00
nossr50
ba180ebae3 xp config pt 4 2019-04-09 20:31:26 -07:00
nossr50
aecc90fa33 Correct Alchemy XP values in config defaults 2019-04-09 20:14:42 -07:00
nossr50
4394ac7049 xp config pt 3 + example fully qualified name map serializer 2019-04-09 20:12:52 -07:00
nossr50
a2279a58a5 xp config pt 2 2019-04-09 18:02:07 -07:00
nossr50
2ef10afce3 Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable 
# Conflicts:
#	Changelog.txt
#	pom.xml
#	src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
 2019-04-09 17:49:56 -07:00
nossr50
4433ea7118 hocon exp config pt 1 2019-04-09 17:48:51 -07:00
nossr50
f1204f8a2a 2.1.39 - Added Seagrass/Tall_Seagrass to experience tables 
Salvage should sound a bit different to Repair now
Fixes #3863 #3862
 2019-04-09 16:34:38 -07:00
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
b63280a2aa SkillProperty pt 1 2019-04-08 05:04:12 -07:00
nossr50
8c164749e2 Wire up salvageable serializer 2019-04-08 01:35:25 -07:00
nossr50
3806dcbd5d Salvageable serializer 2019-04-08 01:34:36 -07:00
nossr50
b67bc45e9a Finished default salvageables list for config 2019-04-08 01:04:13 -07:00
nossr50
737b95d538 Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable 2019-04-07 18:31:59 -07:00
FabioZumbi12
974106f983
Update locale_pt_BR.properties 2019-04-07 04:03:08 -03: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
77eba76e13 This class is an abomination 2019-04-06 06:09:33 -07:00
nossr50
d599db2897 2.1.37 - Fixes #3859 2019-04-06 05:14:52 -07:00
András Marczinkó
2fca0963d7
Update locale_hu_HU.properties 
Improve AbilityGateRequirementFail translation.
Translated new translation lines.
Update and fix Guides.Mining.Section.4
 2019-04-05 10:44:01 +02:00