Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 08:09:39 +01:00
Code Issues Projects Releases Wiki Activity
6,391 Commits 46 Branches 44 Tags 36 MiB
a74f33c96d
Commit Graph

6391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane Freeder
8951c1fd21
Back in dev 2019-08-26 05:28:21 +01:00
nossr50
1f7f71e8b5 2.1.104 2019-08-25 12:06:07 -06:00
Robert A. C
88b056c38f
Merge pull request #4035 from andris155/patch-2 
Update locale_hu_HU.properties
 2019-08-25 12:03:34 -06:00
Robert A. C
d408782acf
Merge pull request #4037 from ethernetcat/master 
Update locale_ja_JP.properties
 2019-08-25 12:03:24 -06:00
Mixpa
dfeab6b558 simply if code 2019-08-25 21:51:19 +08:00
SNAKE
f4fe25009d Convert to UTF16 2019-08-25 05:37:58 +09:00
SNAKE
905010aacd Update locale_ja_JP.properties 2019-08-25 04:01:17 +09:00
Shane Freeder
5ea2c493e8
Don't process mcmmo damage for invuln (#4028) 2019-08-24 17:40:46 +01:00
András Marczinkó
734c6f9c62
Update locale_hu_HU.properties 2019-08-24 10:23:10 +02:00
nossr50
44a3238c79 Dev mode 2019-08-23 21:14:23 -06:00
nossr50
139975958f 2.1.103 2019-08-23 21:00:50 -06:00
nossr50
52f9273fa8 Fishing drops are no longer random amounts 2019-08-23 20:51:32 -06:00
nossr50
77ffee2515 Fixed a bug where Tree Feller only rewarded 1 XP per block 2019-08-23 13:08:04 -06:00
nossr50
40118d570c Update notes 2019-08-23 12:19:52 -06:00
Robert A. C
8109ecb0e0
Merge pull request #4032 from Leomixer17/patch-1 
Update locale_it.properties
 2019-08-22 19:17:28 -06:00
Leomixer17
1147dff4c3
Update locale_it.properties 2019-08-23 03:02:15 +02:00
Leomixer17
c274b21af1
Update locale_it.properties 2019-08-23 02:51:20 +02:00
nossr50
2b72e8e69f Making Limit Break code clearer to understand 2019-08-22 14:54:47 -06:00
Robert A. C
ca511ca0f5
Merge pull request #4029 from QuantumToasted/master 
Fix spelling error in Guilds.Salvage.Section.0
 2019-08-22 14:20:56 -06:00
Daniel Jarski
cafacc05ab
Fix spelling error in Guilds.Salvage.Section.0 
"...use an gold block" -> "...use a gold block"
 2019-08-22 13:05:54 -05:00
Shane Freeder
2974ed0993
correct item salvage level check 2019-08-22 00:38:29 +01:00
Robert A. C
861552bcd8
Merge pull request #4027 from QuantumToasted/master 
Add additional info about horse speed in Beast Lore
 2019-08-21 14:06:15 -07:00
nossr50
7095ddb611 Dev mode 2019-08-21 14:17:27 -06:00
Daniel Jarski
f70f2321f2 Add additional info about horse speed in Beast Lore 
An additional string containing info about the horse's movement speed (in blocks per second) is now concat'd to the end of the Beast Lore info. Also, added a Combat.BeastLoreHorseSpeed locale string to service this info.
 2019-08-21 13:10:43 -05:00
nossr50
4bb8e20b59 2.1.102 2019-08-21 04:57:02 -07:00
Shane Freeder
e8165321e1
Fix bleed tasks invoking ruptures 
Also, made the mcmmo custom damage checks handle nested calls
 2019-08-21 01:05:01 +01:00
nossr50
9428ea395d Partially finished merge 2019-08-20 11:24:47 -04:00
nossr50
4f6706b664 Test 2019-08-19 15:01:45 -07:00
Robert Chapton
665a31fc85 Players moving to a blacklisted world will have scoreboards removed 2019-08-19 14:49:21 -07:00
nossr50
1221069854 Dev mode 2019-08-11 23:58:13 -04:00
Robert A. C
054f8ffe0a
Merge pull request #4021 from ethernetcat/master 
Update locale_ja_JP.properties
 2019-08-11 23:57:22 -04:00
Shane Freeder
dbecd289b2
Check configuration for fishing spam prevention (#4010) 2019-08-12 03:54:45 +01:00
Shane Freeder
bb7989449e
Do not allow additions of timer tasks while iterating 
Follow up on:
e4d980b135
Should help debug #4019 (and let us know when this actually occurs)
 2019-08-12 02:31:51 +01:00
SNAKE0053
296c2e99f7 Update locale_ja_JP.properties 2019-08-12 02:35:23 +09:00
nossr50
4246f59d44 2.1.101 2019-08-09 17:18:26 -04:00
nossr50
87ff69d5c4 Add fix to changelog 2019-08-07 15:30:48 -07:00
Shane Freeder
84cb40521b
Don't unmark herbalism blocks early (Fixes #4015) 2019-08-06 00:52:23 +01:00
nossr50
dda894dd9a dev mode 2019-08-05 10:46:26 -04:00
nossr50
7853efc63d 2.1.100 2019-08-05 10:43:05 -04:00
nossr50
11409c07c0 Fixed a bug with herbalism double drops 2019-08-05 10:39:33 -04:00
Robert A. C
7c17126ffb
Merge pull request #4012 from myfbone/master 
Another portion of Russian translation
 2019-08-04 19:19:59 -07:00
myfbone
05e19b2122 Small correction of xp desc 2019-08-03 08:25:57 +03:00
myfbone
3b8fee5134 Some color corrections and added missing translation 2019-08-03 08:10:31 +03:00
Shane Freeder
4735b2ff8f
Use the full GPLv3 license file 2019-08-02 16:02:07 +01:00
Shane Freeder
ac29c51d6e
Fixed an NPE that may occur with random chances on a player without loaded data 
Also correct changelog version
 2019-08-02 03:34:26 +01:00
myfbone
ad9fa2dd9f Add some missing translations 2019-08-01 14:51:14 +03:00
Robert A. C
1e2f11f4f9
Merge pull request #4009 from myfbone/master 
some russian translation corrections
 2019-07-31 06:26:34 -07:00
myfbone
3a1f297618 new available version message now points to spigot instead of bukkit 2019-07-30 02:37:58 +03:00
myfbone
8af3f41f12 Стрельба (shooting) was renamed to Луки (bows) to reflect that this skill is about bows, but not about tridens and crossbows 2019-07-30 02:36:01 +03:00
Shane Freeder
e4d980b135
Fixed some concurrency concerns around BleedTasks 2019-07-29 17:41:57 +01:00