gnembon 4616bf4333 Merge branch 'master' into 1.17 ...

# Conflicts:
#	src/main/java/carpet/script/bundled/FileModule.java

2021-03-21 02:35:43 -03:00

..

api

Merge branch 'master' into 1.17

2021-03-21 02:35:43 -03:00

language

refactored file IO and zupport for sips

2021-03-20 06:22:23 -03:00

resources

Optimizing scoreboard API with scoreboard_property (#753)

2021-03-14 03:12:29 -03:00

Documentation.md

slash fixes #339

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

Full.md

Merge docs for 'Carpet Mod 1.4.29 for Minecraft 1.16.5 and Minecraft 21w10a'

2021-03-10 23:30:06 +00:00