diff options
| author | Keuin <[email protected]> | 2023-01-13 03:14:43 +0800 |
|---|---|---|
| committer | Keuin <[email protected]> | 2023-01-13 03:14:43 +0800 |
| commit | 068e34023d28ce03bf7a9f59ac3e23e73a183db2 (patch) | |
| tree | ea3cfd45cc6b8fa4349778f05b50063fda453504 /src/main/resources/modid.common.json | |
| parent | 97e028f605d1aa060e4a4640a3dd683e51eaef3a (diff) | |
| parent | e9f273cd996c67272741bedbba3400a5b0e85a41 (diff) | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# build.gradle
# gradle.properties
Diffstat (limited to 'src/main/resources/modid.common.json')
0 files changed, 0 insertions, 0 deletions