nossr50
29835a3316
Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable
2019-05-03 03:46:28 -07:00
nossr50
f61917e8fe
2.1.52
2019-05-03 01:08:29 -07:00
Robert A. C
661564df36
Merge pull request #3914 from snake0053/master
...
Update locale_ja_JP.properties
2019-05-01 14:39:56 -07:00
SNAKE0053
0a7c852d89
Update locale_ja_JP.properties
2019-05-01 16:57:58 +09:00
nossr50
c1379f7ac6
2.1.51 - mikroskeem patch
2019-04-30 17:26:14 -07:00
nossr50
22ef134c84
Update changelog
2019-04-30 17:20:23 -07:00
nossr50
9157a08a3b
Stashing changes.. oh wait
2019-04-30 17:02:08 -07:00
nossr50
3997a44fce
Merge 2.1.51
2019-04-30 17:01:45 -07:00
Robert A. C
7f95956a01
Merge pull request #3911 from mikroskeem/feature/locale-reload-command
...
Add a command to reload locale
2019-04-30 11:33:08 -07:00
Mark Vainomaa
40ea101bf6
Add a command to reload locale
2019-04-30 21:19:55 +03:00
Robert A. C
0c8b001d05
Merge pull request #3910 from mikroskeem/feature/locales-in-plugin-data-folder
...
Try to load locale from plugin data folder first
2019-04-30 10:33:28 -07:00
Mark Vainomaa
5dc9c3f732
Note user that locale is loaded from locales directory
2019-04-30 20:14:42 +03:00
Mark Vainomaa
ec574a6b63
Cache raw messages from resource bundles
...
Should speed things up a bit as next message lookups are from single
hashmap instead
2019-04-30 17:58:37 +03:00
Mark Vainomaa
1ca48051ad
Dedicated directory for locales
2019-04-30 14:08:43 +03:00
nossr50
4d8e4d0e70
Wire up Mining/Excavation/Herbalism/Woodcutting XP values
2019-04-30 02:08:11 -07:00
nossr50
2efa64ae17
wire up taming XP
2019-04-30 01:46:59 -07:00
nossr50
e5441f2a96
Taming XP values are now converted to an enum mpa and managed by ExperienceMapManager
2019-04-30 01:39:06 -07:00
nossr50
06016f4ada
Wire up special combat XP multipliers
2019-04-30 00:57:50 -07:00
nossr50
6932abc9d8
Create fully qualified name : integer maps from user configs, wiring up some global xp settings
2019-04-30 00:42:09 -07:00
Mark Vainomaa
0f2e1ea740
Fall back to locale loaded from JAR when filesystem one doesn't have requested key
2019-04-30 09:29:04 +03:00
Mark Vainomaa
c2d4aeaf85
Try to load locale from plugin data folder first
2019-04-30 09:29:04 +03:00
nossr50
faed690602
Add mcMMO reload command "/mcmmoreload"
2019-04-29 22:55:39 -07:00
nossr50
7b3f69aee6
Add config reload
2019-04-29 22:37:46 -07:00
nossr50
6e173c0d4e
Add per-skill global multiplier default values
2019-04-29 22:09:38 -07:00
nossr50
d0259d73c5
Gloabl XP multiplier is now tracked by the ExperienceMapManager
...
Added method to grab original value to ExperienceMapManager
Moved skill xp values/mults into their own section
2019-04-29 21:59:01 -07:00
nossr50
7f64fe11b8
Put special combat xp multipliers in their own section
2019-04-29 21:34:29 -07:00
nossr50
a496b1fd71
Dev mode
2019-04-29 18:54:00 -07:00
nossr50
ff8baecb54
Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable
2019-04-28 06:56:22 -07:00
nossr50
ac8042f5d8
update gitignore
2019-04-28 06:52:16 -07:00
nossr50
437bac1324
Revert "Add missing XP tables to 2.2"
...
This reverts commit d1085aa8f8
2019-04-28 06:15:08 -07:00
nossr50
7c4481f099
removing unused classes
2019-04-28 06:08:15 -07:00
nossr50
d1085aa8f8
Add missing XP tables to 2.2
2019-04-28 06:05:39 -07:00
nossr50
986162803b
Merge 2.1.50
2019-04-28 05:46:49 -07:00
nossr50
f7eb06e80b
2.1.50
2019-04-27 06:39:06 -07:00
nossr50
f4214e2031
changelog update
2019-04-27 00:00:52 -07:00
Robert A. C
fd8712ee61
Merge pull request #3905 from Zed-I/patch-6
...
Added some missing blocks to Herbalism/Mining
2019-04-26 23:50:43 -07:00
BuildTools
f904ac7019
Fixing 1.13.2 bamboo material errors
2019-04-26 23:26:00 -07:00
Robert A. C
3c08af363f
Merge pull request #3904 from OverCrave/master
...
Minor German Locale Update
2019-04-26 14:17:54 -07:00
Robert A. C
8295355a5d
Merge pull request #3906 from Zed-I/patch-7
...
Added bamboo to the non-2 high plant blocks
2019-04-26 14:17:36 -07:00
Zed-I
aee81f87f5
Added bamboo to the non-2 high plant blocks
2019-04-26 18:16:42 +02:00
Zed-I
43d08ec21d
Added some missing blocks to Herbalism/Mining
...
Added some missing entries to herbalism mining and one to combat.
Reasoning for each xp below:
bamboo - 10 Cant grow nearly as tall as kelp
cornflower - 150 same as the other 1 high tall flowers (excluding poppy, dandelion and allium)
lily_of_the_valley - 150 same as the other 1 high tall flowers (excluding poppy, dandelion and allium)
wither_rose - 500. Quite hard to harvest. You need a wither to kill a mob and have the block not get destroyed by the wither blast. If the block where to get destroyed the flower just drops instead and you dont get any xp.
The whole stone brick family get the same xp as nether brick, 50
stone_bricks
cracked_stone_bricks
mossy_stone_bricks
chiseled_stone_bricks
The rest of the prismarine family continue with the same xp as their main block, 70
prismarine_bricks
dark_prismarine
sea_lantern
wandering_trader - 1.0 same as normal villagers
2019-04-26 18:08:12 +02:00
OverCrave
15e3ad8876
add missing translations
2019-04-26 17:58:23 +02:00
OverCrave
a583f557d7
remove unused translations
2019-04-26 17:49:35 +02:00
nossr50
0949931a61
2.1.49
2019-04-25 18:56:49 -07:00
nossr50
8efee39f7e
Add sweet berrys to Herbalism XP tables (update configs)
2019-04-25 18:54:41 -07:00
Robert A. C
307b807b38
Merge pull request #3788 from LogGits/patch-5
...
Herbalism compatibility with PlayerAnimationEvent
2019-04-25 18:50:27 -07:00
nossr50
be8a2a4b07
Fixes #3902 - NPE in Inventory Listener
2019-04-25 18:49:18 -07:00
nossr50
30df57fa35
Fix async tool lower
2019-04-25 18:46:49 -07:00
nossr50
467025888c
Fixed #3858 - Falling blocks in water not getting tracked
2019-04-25 18:28:24 -07:00
nossr50
02a69cbb05
Update code style
2019-04-24 22:52:53 -07:00
