gnembon 838211edba Merge branch 'master' into 1.16 ...

# Conflicts:
#	src/main/java/carpet/utils/BlockInfo.java

2020-05-20 10:41:04 -03:00

..

commands

fix

2020-05-18 23:02:49 -03:00

fakes

Merge branch 'master' into 1.16

2020-05-20 02:13:37 -03:00

helpers

20w20b

2020-05-14 12:51:46 -03:00

logging

Merge branch 'master' into 1.16

2020-04-15 12:35:37 -03:00

mixins

mappings

2020-05-20 10:31:06 -03:00

patches

added player type

2020-02-07 11:14:25 -04:00

script

Merge branch 'master' into 1.16

2020-05-20 02:13:37 -03:00

settings

Merge branch 'master' into 1.16

2020-05-15 20:00:55 -03:00

utils

Merge branch 'master' into 1.16

2020-05-20 10:41:04 -03:00

CarpetExtension.java

fixed logger issues #156 and #155

2020-02-23 02:25:51 -04:00

CarpetServer.java

reset tick rate when changing worlds in SP

2020-04-27 18:05:08 -03:00

CarpetSettings.java

Merge branch 'master' into 1.16

2020-05-15 20:00:55 -03:00