EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-23 05:36:46 +01:00
Code Issues Projects Releases Wiki Activity
6,325 Commits 48 Branches 45 Tags 34 MiB
c526208da4
Commit Graph

6325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane Freeder
b7dd491c01
Prevent nesting of bleed damage 
This commit prevents the nesting of damage event processing in general in
regards to bleed, health related stuff will need a further glance over down
the line, however; This will fix a major problematic area
 2019-11-13 19:53:02 +00:00
nossr50
3ce0d7b972 dev mode 2019-11-10 19:51:47 -08:00
Robert Alan Chapton
9dcbccb010
Merge pull request #4078 from Ineusia/master 
Missing Section Error Messages (Repair & Salvage Config)
 2019-11-10 18:18:12 -08:00
Ineusia
c5cbab39b6
Update RepairConfig.java 
Removed accidental whitespace
 2019-11-10 11:56:32 -06:00
Ineusia
ca1906fbc5 Added error message for missing Salvageables section (rather than throw NPE) 2019-11-08 01:15:32 -06:00
Ineusia
7eab20ef56 Added error message for missing Repairables section (rather than throw NPE) 2019-11-08 01:11:29 -06:00
nossr50
188b0f9813 2.1.110 2019-10-18 15:48:53 -07:00
nossr50
e6c9cc6fdd Actually fixed BlockCracker + One more type of block can be cracked 2019-10-18 15:48:12 -07:00
nossr50
76ca7cc88f Additional dupe failsafes 2019-10-18 15:37:36 -07:00
nossr50
335d708848 Bump version 2019-10-18 15:24:46 -07:00
nossr50
b4179cb9a6 Fixed a dupe bug 2019-10-18 15:23:15 -07:00
Robert Alan Chapton
8bbf95e9da
Merge pull request #4065 from Vyciokazz/master 
locale_lt_LT.properties
 2019-10-18 01:10:09 -07:00
nossr50
dc805825de 2.1.109 2019-10-17 20:16:01 -07:00
Robert Alan Chapton
871ca744d9
Merge pull request #4070 from Fabrimat/patch-4 
Update locale_it.properties
 2019-10-17 10:01:26 -07:00
Fabrizio La Rosa
1b091bdbd5
Update locale_it.properties 
Fixed definetly /mctop and fixed special characters.
 2019-10-17 13:37:00 +02:00
Robert Alan Chapton
110d9a633b
Update FUNDING.yml 2019-10-02 13:26:34 -07:00
Robert Alan Chapton
584859318b
Create FUNDING.yml 2019-10-02 13:06:56 -07:00
Robert A. C
1eb2c7b2d7
Merge pull request #4068 from ethernetcat/master 
Update locale_ja_JP.properties
 2019-10-01 14:37:21 -04:00
SNAKE
3310a12a95 Update locale_ja_JP.properties 2019-10-02 01:43:51 +09:00
Shane Freeder
6125b3fbd2
Don't spam incompatible WG error 2019-09-27 18:57:25 +01:00
Robert A. C
0d6b5e2530
Merge pull request #4064 from Fabrimat/patch-3 
Update locale_it.properties
 2019-09-23 10:46:29 -07:00
Fabrizio La Rosa
d679101cfb
Update locale_it.properties 
Spaces doesn't work in commands like "/mctop Tiro con l'arco"
 2019-09-23 18:40:56 +02:00
Shane Freeder
122c8b0faa
Added missing 1.14 blocks to ability/tool activation blacklists (Fixes #4050) 2019-09-22 04:30:24 +01:00
nossr50
08d1ad4f6c Dev mode 2019-09-19 18:45:09 -07:00
nossr50
8e19e1de15 2.1.108 2019-09-19 18:33:33 -07:00
nossr50
101b0671fe compatibility with FAWE ( :| ) 2019-09-19 18:31:18 -07:00
nossr50
e14c53d3ca Load after worlds 2019-09-19 18:02:23 -07:00
nossr50
28c0215a93 Catch more exceptions when doing WG reflection checks 2019-09-19 17:21:25 -07:00
nossr50
51a373db4f Fixing an Acrobatics exploit 2019-09-17 18:59:44 -07:00
Vyciokazz
1b889b8177
locale_lt_LT.properties 
I translated in Lithuanian language manny required info for player and player skils, in time i update this translation.
 2019-09-18 00:14:14 +03:00
nossr50
4a4124d09f 2.1.107 2019-09-14 16:08:20 -07:00
nossr50
ceaf3d46cb Update changelog 2019-09-14 16:06:14 -07:00
Robert A. C
260d0f9b4a
Merge pull request #4051 from Shrek5InTheatres2019/master 
McMMOPlayerProfileLoadEvent for the api
 2019-09-14 16:05:26 -07:00
Shane Freeder
d3a7ff8e8c
Correctly encode Russian translation file (#4058) 2019-09-14 23:58:46 +01:00
nossr50
9154b3f083 Fixes #4056 2019-09-14 15:44:58 -07:00
Shrek5InTheatres2019
c3548be380 deleting one character variables for good 2019-09-09 17:56:06 -07:00
Shrek5InTheatres2019
67bfb40dd5 fixing the things 2019-09-09 16:50:05 -07:00
Robert A. C
777a9d4185
Merge pull request #4052 from andris155/patch-1 
Update locale_hu_HU.properties
 2019-09-09 15:06:02 -06:00
András Marczinkó
fcd45f3bc1
Update locale_hu_HU.properties 2019-09-07 13:24:05 +02:00
Shrek5InTheatres2019
478d542981 removing this task that i once thought i needed and now realize that it is completely unnecessary 2019-09-06 16:46:38 -07:00
Shrek5InTheatres2019
c6c1c39a98 player profile load event from issue request #4045 2019-09-06 16:44:58 -07:00
nossr50
0d6165c0f4 dev mode 2019-09-06 15:37:54 -06:00
nossr50
f45983949a 2.1.106 2019-09-06 15:21:13 -06:00
nossr50
cca0524441 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2019-09-05 18:59:08 -06:00
nossr50
e84e9a7dc8 more blacklisted blocks 2019-09-05 18:58:50 -06:00
Robert A. C
a3600e11a9
Merge pull request #4048 from ethernetcat/master 
Update locale_ja_JP.properties
 2019-09-03 14:10:50 -06:00
Robert A. C
483579503a
Merge pull request #4047 from 89009332/patch-10 
Update locale_zh_CN.properties
 2019-09-03 14:10:37 -06:00
SNAKE
d89ff8b238 Update locale_ja_JP.properties 2019-09-04 01:05:33 +09:00
89009332
582ff48b6f
Update locale_zh_CN.properties 2019-09-03 19:50:02 +08:00
nossr50
d6e14ca431 Dev mode 2019-09-02 17:10:40 -06:00