gnembon 43c9a8a886 Merge branch 'master' into 1.15

2019-12-28 20:41:39 -04:00

..

commands

Merge branch 'master' into 1.15

2019-12-10 23:14:04 -04:00

fakes

WOOL

2019-12-28 18:00:28 -04:00

helpers

Merge branch 'master' into 1.15

2019-12-28 20:41:39 -04:00

logging

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

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

mixins

WOOL

2019-12-28 18:00:28 -04:00

patches

1.15 pre4

2019-12-03 16:57:01 -04:00

script

Merge branch 'master' into 1.15

2019-12-28 16:10:01 -04:00

settings

Merge branch 'master' into 1.15

2019-12-10 23:14:04 -04:00

utils

WOOL

2019-12-28 16:42:45 -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

extremeBehaviours

2019-12-11 00:30:46 -04:00

CarpetSettings.java

Merge branch 'master' into 1.15

2019-12-27 22:45:48 -04:00