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
6,121 Commits 46 Branches 44 Tags 36 MiB
43d60b6a7d
Commit Graph

6121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nossr50
f6ad530660 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2019-06-23 11:56:41 -07:00
SNAKE0053
046daa43fa Update locale_ja_JP.properties 2019-06-24 00:11:24 +09:00
Robert A. C
cc1c5239dc
Merge pull request #3967 from EvilOlaf/patch-5 
Update locale_de.properties
 2019-06-23 01:26:09 -07:00
Werner
4fafb5731e
Update locale_de.properties 2019-06-23 10:00:07 +02:00
nossr50
9ab4d59cca mcMMO will ignore damage triggers for events with a value of zero 2019-06-22 22:35:25 -07:00
nossr50
89e988660d Tweaks 2019-06-22 20:18:14 -07:00
nossr50
121f881d59 More work on the new repair system 2019-06-22 19:21:57 -07:00
nossr50
68864dae2d 2.1.87 2019-06-22 15:06:24 -07:00
nossr50
ae6d377abb Fixing a mistake when grabbing level cap 2019-06-22 15:03:51 -07:00
nossr50
b479d45f14 Level Cap bugfixes and tweaks 2019-06-22 14:48:16 -07:00
nossr50
e17afe31a5 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO 2019-06-22 13:05:58 -07:00
nossr50
5c31bdbd49 Lets generify some of this stuff 2019-06-22 13:05:28 -07:00
Robert A. C
5f115d5e4a
Merge pull request #3966 from EvilOlaf/patch-1 
Update locale_de.properties
 2019-06-22 08:28:33 -07:00
Werner
1984131874
Update locale_de.properties 2019-06-22 13:33:03 +02:00
nossr50
d843108164 More work on the repair rewrite, fleshing out more serializers 2019-06-21 18:26:02 -07:00
nossr50
d782d64750 Simplify the design of Repairable 2019-06-21 15:10:43 -07:00
nossr50
0b4e2b48c9 Dev mode 2019-06-21 12:45:31 -07:00
nossr50
0050a73be8 NBT WIP 2019-06-21 10:46:27 -07:00
nossr50
099dfcb0e5 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-06-21 09:19:03 -07:00
nossr50
6aa53823f1 Small changelog edits 2019-06-21 09:10:53 -07:00
nossr50
7f567585e2 2.1.86 2019-06-21 08:12:00 -07:00
nossr50
c6d604bbbc Inspect, Salvage, and Locale fixes 2019-06-21 08:05:57 -07:00
nossr50
c7fadf02e6 Repair rewrite continues 2019-06-21 05:50:37 -07:00
nossr50
55609249ed Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-06-20 00:09:50 -07:00
nossr50
5698d8282c 2.1.85 2019-06-20 00:02:48 -07:00
nossr50
b41a30fa26 Repair rewrite continues 2019-06-19 23:28:11 -07:00
nossr50
458e198fdb More work on new repair datatypes 2019-06-18 23:08:14 -07:00
nossr50
1e338e6aec Flesh out RepairCost some more 2019-06-18 23:02:20 -07:00
nossr50
8f04b83954 RepairableBuilder, ItemStackSerializer WIP 2019-06-18 22:14:32 -07:00
nossr50
c0685bd1eb PermissionWrapper WIP 2019-06-18 18:07:06 -07:00
nossr50
29670cd66f Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-06-18 15:46:20 -07:00
nossr50
83636644b1 2.1.84 2019-06-18 15:28:56 -07:00
nossr50
fa6995b9fd You can no longer set fire to party members 2019-06-18 14:04:42 -07:00
nossr50
c83d38b5c2 Arrow Retrieval will no longer work with piercing enchant 2019-06-18 13:06:26 -07:00
nossr50
27d25ad321 Taming config WIP 2019-06-18 09:33:31 -07:00
Robert A. C
31e9abd8eb
Merge pull request #3960 from andris155/patch-1 
Update locale_hu_HU.properties
 2019-06-18 09:00:34 -07:00
András Marczinkó
43b7abafe7
Update locale_hu_HU.properties 2019-06-18 16:29:06 +02:00
András Marczinkó
483134df10
Update locale_hu_HU.properties 2019-06-18 16:22:48 +02:00
nossr50
a6a734befe Repair rewrite pt 2 WIP 2019-06-17 16:36:37 -07:00
nossr50
18fd9bbf9b Repair rewrite pt 1 - WIP 2019-06-17 14:01:44 -07:00
nossr50
bca1298918 Wire up swords config 2019-06-17 11:03:40 -07:00
nossr50
87f0171969 Add swords config values 2019-06-17 10:54:53 -07:00
nossr50
8b2d1eb1d8 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable 2019-06-17 10:37:57 -07:00
nossr50
b612a599de 2.1.82 2019-06-17 08:26:21 -07:00
nossr50
2cecc91026 WG Hardcore penalty flag 'mcmmo-hardcore' 2019-06-17 08:25:37 -07:00
nossr50
38bc60ba86 Inspecting offline players no longer requires permissions + fixing 
errors when using mcrank on an offline player
 2019-06-17 08:19:15 -07:00
nossr50
4e4d798b1d Add proper error handling to file loading 2019-06-17 07:38:30 -07:00
nossr50
218b2a1a75 Double check that a Player is not an NPC when loading profiles 2019-06-17 07:00:39 -07:00
nossr50
12964a816d RepairWildcard wip 2019-06-16 12:41:14 -07:00
nossr50
3a89ba2139 Wire up salvage config options 2019-06-16 09:12:42 -07:00