Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
# Conflicts:
# src/main/resources/fabric.mod.json
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
The build has to use Java 17 because of the Loom version.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Update zh_cn.json
* Update zh_cn.json
|
|
|
|
|