gnembon 8fe3508fdd Merge branch 'master' into 1.16 ...

# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java

2020-06-04 02:35:05 -03:00

..

commands

Merge branch 'master' into 1.16

2020-05-31 02:54:14 -03:00

fakes

mappings

2020-05-31 03:18:40 -03:00

helpers

mappings

2020-06-02 12:23:52 -03:00

logging

mappings

2020-06-02 12:23:52 -03:00

mixins

Merge branch '1.16' of https://github.com/gnembon/fabric-carpet into 1.16

2020-06-03 03:51:24 -03:00

network

Merge branch 'master' into 1.16

2020-06-03 03:47:55 -03:00

patches

20w22a

2020-05-29 12:15:51 -03:00

script

Merge branch 'master' into 1.16

2020-06-04 02:35:05 -03:00

settings

changes in 1.16 require to re-register commands after datapack reload. May affect extensions with custom CMs - doubt there is any.

2020-06-02 21:05:44 -03:00

utils

mappings

2020-06-02 12:23:52 -03:00

CarpetExtension.java

added translation support for extensions

2020-05-22 01:19:08 -03:00

CarpetServer.java

changes in 1.16 require to re-register commands after datapack reload. May affect extensions with custom CMs - doubt there is any.

2020-06-02 21:05:44 -03:00

CarpetSettings.java

Merge branch 'master' into 1.16

2020-06-03 03:47:55 -03:00