nossr50 a654762f4d Yikes that was a lot of merge conflicts.

2019-06-12 05:26:45 -07:00

..

api

Yikes that was a lot of merge conflicts.

2019-06-12 05:26:45 -07:00

chat

Update code style

2019-04-24 22:52:53 -07:00

commands

Yikes that was a lot of merge conflicts.

2019-06-12 05:26:45 -07:00

config

Add minimum quantity back to the repair config

2019-06-11 03:50:13 -07:00

core

Yikes that was a lot of merge conflicts.

2019-06-12 05:26:45 -07:00

database

Using doubles in most places again to avoid precision loss

2019-06-04 21:12:10 -07:00

datatypes

Yikes that was a lot of merge conflicts.

2019-06-12 05:26:45 -07:00

dumpster

Yikes that was a lot of merge conflicts.

2019-06-12 05:26:45 -07:00

events

Using doubles in most places again to avoid precision loss

2019-06-04 21:12:10 -07:00

listeners

Yikes that was a lot of merge conflicts.

2019-06-12 05:26:45 -07:00

locale

Encapsulate admin notifications + add prefix

2019-05-18 08:12:32 -07:00

party

Using doubles in most places again to avoid precision loss

2019-06-04 21:12:10 -07:00

runnables

Wire up PVP/PVE settings

2019-06-06 06:07:05 -07:00

skills

Yikes that was a lot of merge conflicts.

2019-06-12 05:26:45 -07:00

util

Yikes that was a lot of merge conflicts.

2019-06-12 05:26:45 -07:00

worldguard

Update code style

2019-04-24 22:52:53 -07:00

mcMMO.java

Yikes that was a lot of merge conflicts.

2019-06-12 05:26:45 -07:00