gnembon 65447f09ad Merge branch 'master' into 1.17 ...

# Conflicts:
#	src/main/java/carpet/helpers/FeatureGenerator.java

2021-05-13 01:52:08 -03:00

..

api

Merge branch 'master' into 1.17

2021-05-12 12:13:15 -03:00

language

Update Overview.md (#855)

2021-05-12 09:17:05 -03:00

resources

script compile time optimizations.

2021-05-05 00:25:31 -03:00

Documentation.md

slash fixes #339

2020-06-21 23:06:41 -03:00

Full.md

Merge docs for 'Carpet Mod 1.4.36 for Minecraft 1.16.5 and Minecraft 21w19a'

2021-05-12 23:44:35 +00:00