diff options
author | shedaniel <daniel@shedaniel.me> | 2021-11-29 01:49:31 +0800 |
---|---|---|
committer | shedaniel <daniel@shedaniel.me> | 2021-11-29 01:49:31 +0800 |
commit | d51b44cdaa130389fb2054f43ed20a33a5ef8389 (patch) | |
tree | e312adfb52fe3f5341544b5ee93becd496174489 /src/test/resources/projects/forge/aw2At/settings.gradle | |
parent | 4765504fc1785b3e3adad452b59db61a3d69c50a (diff) | |
parent | 4b45783a5460c6cbd63cdc89b32fcaeb584a95e3 (diff) | |
download | architectury-loom-d51b44cdaa130389fb2054f43ed20a33a5ef8389.tar.gz architectury-loom-d51b44cdaa130389fb2054f43ed20a33a5ef8389.tar.bz2 architectury-loom-d51b44cdaa130389fb2054f43ed20a33a5ef8389.zip |
Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0
# Conflicts:
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilderImpl.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingLayer.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpec.java
# src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
Diffstat (limited to 'src/test/resources/projects/forge/aw2At/settings.gradle')
0 files changed, 0 insertions, 0 deletions