diff options
| author | Juuxel <6596629+Juuxel@users.noreply.github.com> | 2020-12-21 20:59:28 +0200 |
|---|---|---|
| committer | Juuxel <6596629+Juuxel@users.noreply.github.com> | 2020-12-21 20:59:28 +0200 |
| commit | 47b811748a6cb1253c34f0b29bb1eb30ae523273 (patch) | |
| tree | d51c507a63239df442e68456006457313c687f0e /gradle.properties | |
| parent | 866c869187dbd7759637f8009686d560032a54b6 (diff) | |
| parent | 110a4db9f8c0530b8778e7290962b453e03b0bc1 (diff) | |
| download | LibGui-47b811748a6cb1253c34f0b29bb1eb30ae523273.tar.gz LibGui-47b811748a6cb1253c34f0b29bb1eb30ae523273.tar.bz2 LibGui-47b811748a6cb1253c34f0b29bb1eb30ae523273.zip | |
Merge branch 'master' into unstable/4.0
# Conflicts:
# gradle.properties
# src/main/java/io/github/cottonmc/cotton/gui/client/BackgroundPainter.java
Diffstat (limited to 'gradle.properties')
0 files changed, 0 insertions, 0 deletions