diff options
author | shedaniel <daniel@shedaniel.me> | 2021-02-02 15:32:02 +0800 |
---|---|---|
committer | shedaniel <daniel@shedaniel.me> | 2021-02-02 15:32:02 +0800 |
commit | 6b8188e688a556e0950458a59ab16d7b4e58236f (patch) | |
tree | b9da971f36b7ac6032d3acd8c1f1cf7f14f6149d /.editorconfig | |
parent | 3f0c51324fb12d8b4dcd705a5bac14e406fa9f02 (diff) | |
parent | 5b3222e9b91d7f69187268e87527950e7b89aacb (diff) | |
download | architectury-loom-6b8188e688a556e0950458a59ab16d7b4e58236f.tar.gz architectury-loom-6b8188e688a556e0950458a59ab16d7b4e58236f.tar.bz2 architectury-loom-6b8188e688a556e0950458a59ab16d7b4e58236f.zip |
Merge remote-tracking branch 'FabricMC/dev/0.6' into 0.6-merge
# Conflicts:
# src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
# src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java
# src/main/java/net/fabricmc/loom/task/LoomTasks.java
Diffstat (limited to '.editorconfig')
0 files changed, 0 insertions, 0 deletions