diff options
| author | Juuz <6596629+Juuxel@users.noreply.github.com> | 2023-06-11 13:48:58 +0300 |
|---|---|---|
| committer | Juuz <6596629+Juuxel@users.noreply.github.com> | 2023-06-11 13:48:58 +0300 |
| commit | 50de295b5c106f4a50c82b4446240f0dcbb3f526 (patch) | |
| tree | eab45da6bbf52ce1c03a11cbb465d1e2f165506d /src/main/resources/assets/libgui/lang/en_us.json | |
| parent | 6f41969c6c85be5d0f7ad0cf2537071f3befde66 (diff) | |
| parent | 6b14e2b3afa122744d3ae209703fc44b041b4e80 (diff) | |
| download | LibGui-50de295b5c106f4a50c82b4446240f0dcbb3f526.tar.gz LibGui-50de295b5c106f4a50c82b4446240f0dcbb3f526.tar.bz2 LibGui-50de295b5c106f4a50c82b4446240f0dcbb3f526.zip | |
Merge branch 'unstable/8.0'
# Conflicts:
# gradle.properties
# src/main/java/io/github/cottonmc/cotton/gui/client/CottonClientScreen.java
# src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java
Diffstat (limited to 'src/main/resources/assets/libgui/lang/en_us.json')
0 files changed, 0 insertions, 0 deletions