diff options
author | shedaniel <daniel@shedaniel.me> | 2021-04-04 19:19:57 +0800 |
---|---|---|
committer | shedaniel <daniel@shedaniel.me> | 2021-04-04 19:21:23 +0800 |
commit | 8bf5870c7f2d2cae6efe79ea46230e633db1e9c3 (patch) | |
tree | 2c8adc94ed1f28595abbae8d98b0667838623a3c /src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | |
parent | 848c0e553e4bc9cef01b9de373aad891b2686622 (diff) | |
parent | 8a5467cdcaa2ad8760e1c4ceb55ade5e800872d8 (diff) | |
download | architectury-loom-8bf5870c7f2d2cae6efe79ea46230e633db1e9c3.tar.gz architectury-loom-8bf5870c7f2d2cae6efe79ea46230e633db1e9c3.tar.bz2 architectury-loom-8bf5870c7f2d2cae6efe79ea46230e633db1e9c3.zip |
Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java')
0 files changed, 0 insertions, 0 deletions