nossr50 8991c2bf2c Fixing merge conflicts

2019-04-03 17:25:18 -07:00

..

api

Don't load the players profile just to get their name

2019-04-01 16:10:49 -07:00

chat

Wire up party config pt 4

2019-03-29 00:00:24 -07:00

commands

Code cleanup part 1

2019-04-02 23:28:12 -07:00

config

Fixing merge conflicts

2019-04-03 17:25:18 -07:00

database

wire up creatures config

2019-03-29 00:01:38 -07:00

datatypes

Fixing merge conflicts

2019-04-03 17:25:18 -07:00

events

Scoreboard config part 1

2019-03-28 23:57:20 -07:00

listeners

Fixing merge conflicts

2019-04-03 17:25:18 -07:00

locale

Wire up Language config

2019-03-29 00:01:36 -07:00

party

Custom Serializer Attempt #2

2019-03-29 00:01:39 -07:00

runnables

minor cleanup

2019-04-03 16:11:35 -07:00

skills

Fixing merge conflicts

2019-04-03 17:25:18 -07:00

util

Fixing merge conflicts

2019-04-03 17:25:18 -07:00

worldguard

Fixes #3832 - Resolved issue with double drops & herbalism, similar fixes coming to woodcutting/mining soon. Reminder to update config.yml, read changelog for instructions.

2019-03-23 16:21:25 -07:00

mcMMO.java

Fixing merge conflicts

2019-04-03 17:25:18 -07:00