gnembon f23312c0fc Merge branch 'master' into 1.16 ...

# Conflicts:
#	gradle.properties

2020-06-21 23:19:49 -03:00

..

api

explanation of biome changes, fixes #334

2020-06-20 20:54:43 -03:00

language

unix_time and convert_date (#332)

2020-06-17 11:10:59 -03:00

resources

marking final 1.7 scarpet API content

2020-06-21 23:17:49 -03:00

Documentation.md

slash fixes #339

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

Full.md

Merge branch 'master' into 1.16

2020-06-17 17:00:04 -03:00