Andrew Steinborn 275685f45f Merge branch 'master' into dev/1.1.0 ...

# Conflicts:
#	build.gradle

2019-06-30 23:52:22 -04:00

..

src

Merge branch 'master' into dev/1.1.0

2019-06-30 23:52:22 -04:00

build.gradle

Include Configurate

2019-06-18 07:45:45 -04:00