1183 Commits

Author	SHA1	Message	Date
nossr50	a654762f4d	Yikes that was a lot of merge conflicts.	2019-06-12 05:26:45 -07:00
nossr50	e1dcb65888	Add back in the comment about min quantity	2019-06-11 03:52:45 -07:00
nossr50	46dee3c9b6	Numerous tweaks to salvage + fixing repair bugs	2019-06-10 22:37:20 -07:00
89009332	77bde61f4b	Update locale_zh_CN.properties	2019-06-10 09:17:07 +08:00
nossr50	a132172507	You can no longer repair/salvage item stacks with more than one item	2019-06-08 10:20:22 -07:00
nossr50	e05078b280	Some misc cleanup, including removing some leftover April Fools stuff	2019-06-03 02:36:29 -07:00
nossr50	fc7455354f	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable	2019-06-02 23:04:52 -07:00
SNAKE0053	3832ef3547	Update locale_ja_JP.properties	2019-06-02 05:50:26 +09:00
nossr50	8b4cea5dab	Chimaera Wing should not be disabled by default	2019-06-01 12:26:11 -07:00
nossr50	5af60e2fe1	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable	2019-06-01 01:58:21 -07:00
nossr50	9111590dc2	2.1.67	2019-05-31 19:46:14 -07:00
nossr50	01bffc6670	Fixing a typo of sorts	2019-05-30 16:17:02 -07:00
nossr50	1532791c3f	Still some work to do, but now the convert XP command is less clunky	2019-05-30 16:12:32 -07:00
nossr50	b27d46f0cc	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable	2019-05-29 14:06:55 -07:00
Robert A. C	d7b2a98723	Merge pull request #3934 from andris155/patch-6 ... Update locale_hu_HU.properties	2019-05-21 13:27:34 -07:00
nossr50	bfb48ccea3	Buffed Impact durability damage and fixed it	2019-05-21 13:13:17 -07:00
András Marczinkó	8cd39301a3	Update locale_hu_HU.properties	2019-05-21 19:11:28 +02:00
nossr50	9c5ec234d9	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable	2019-05-18 13:21:36 -07:00
SNAKE0053	d46fae2d1a	Update locale_ja_JP.properties	2019-05-19 03:46:48 +09:00
nossr50	66425ba48d	Add UUID to admin notifications	2019-05-18 10:59:52 -07:00
nossr50	2433ef5db7	Move admin notification toggle check	2019-05-18 10:47:37 -07:00
nossr50	663757352a	Tweak xp rate admin notification messages	2019-05-18 10:45:50 -07:00
nossr50	1ced5d8ffc	Confirmation messages for admin commands are now moved into the ... convenience methods in NotificationManager	2019-05-18 10:40:06 -07:00
nossr50	04c6bd8750	Admin notifications convenience methods handled by NotificationManager	2019-05-18 10:09:45 -07:00
nossr50	b0dc41b4d9	Encapsulate admin notifications + add prefix	2019-05-18 08:12:32 -07:00
nossr50	2a471e409c	Fix mistake in new admin notification locale	2019-05-18 08:02:16 -07:00
nossr50	08223bd320	Hotfix for repairing diamond, nerf guardian xp rate	2019-05-18 08:01:15 -07:00
nossr50	90480ca626	Add missing Magma_Block xp value	2019-05-17 15:45:07 -07:00
Robert A. C	56b031b99d	Merge pull request #3930 from andris155/patch-1 ... Update locale_hu_HU.properties	2019-05-17 04:28:15 -07:00
nossr50	f3cbd450d0	Admin chat now sends useful information to admins/adminchat permissible ... players	2019-05-17 04:27:27 -07:00
András Marczinkó	b176fd9bca	Update locale_hu_HU.properties	2019-05-17 13:08:49 +02:00
nossr50	1c130aad42	2.1.61 - Some fixes + Exploit prevention	2019-05-16 13:30:43 -07:00
nossr50	734dfcdec5	Add toggle to disable event information on player join	2019-05-16 11:40:47 -07:00
nossr50	c8a32b8b38	Add toggle for event broadcasts - General.EventBroadcasts	2019-05-16 11:34:26 -07:00
nossr50	88d8d0e6bb	Fix the Double Drop string in the mining command	2019-05-16 11:20:51 -07:00
nossr50	b532b42db3	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable	2019-05-15 16:39:49 -07:00
Robert A. C	a763f7f025	Merge pull request #3928 from snake0053/translate ... Update locale_ja_JP.properties	2019-05-15 09:52:54 -07:00
SNAKE0053	357e9cc08f	Update locale_ja_JP.properties	2019-05-16 01:11:25 +09:00
nossr50	f0d6f7077b	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable	2019-05-14 23:01:05 -07:00
nossr50	34869914c4	Wolfs no longer kill themselves + tamed mob heart death message bug	2019-05-14 15:14:30 -07:00
nossr50	a53505ee0b	Raised overfishing limit + improved tips	2019-05-13 08:53:22 -07:00
nossr50	7ad0a61c53	Fix casting, remove unused mod configs	2019-05-10 11:20:16 -07:00
nossr50	40598a0e96	Unlimited custom xp perks Part 1	2019-05-08 06:44:19 -07:00
nossr50	8033bc577c	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable	2019-05-06 19:46:58 -07:00
89009332	31ccf2ca02	Update locale_zh_CN.properties	2019-05-06 15:25:41 +08:00
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	3997a44fce	Merge 2.1.51	2019-04-30 17:01:45 -07:00