gnembon 7c7c4733fc Merge branch 'master' into 1.15

2020-01-14 14:26:14 -04:00

..

commands

Merge branch 'master' into 1.15

2020-01-10 21:50:20 -04:00

fakes

Merge branch 'master' into 1.15

2020-01-06 21:28:07 -04:00

helpers

Merge branch 'master' into 1.15

2020-01-10 21:50:20 -04:00

logging

moved CarpetSettings up from settings manager, should be easier to find later.

2019-12-10 23:08:40 -04:00

mixins

Merge branch 'master' into 1.15

2020-01-10 21:50:20 -04:00

patches

Merge branch 'master' into 1.15

2020-01-06 21:28:07 -04:00

script

Merge branch 'master' into 1.15

2020-01-14 14:26:14 -04:00

settings

Merge branch 'master' into 1.15

2020-01-06 21:28:07 -04:00

utils

Merge branch 'master' into 1.15

2020-01-06 21:28:07 -04:00

CarpetExtension.java

fixed missed command registration for extension, 1.3.0, added optional version.

2019-12-10 23:01:30 -04:00

CarpetServer.java

remove a few warnings

2020-01-06 21:26:44 -04:00

CarpetSettings.java

Merge branch 'master' into 1.15

2020-01-14 14:26:14 -04:00