aboutsummaryrefslogtreecommitdiff
path: root/.editorconfig
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2021-02-02 15:32:02 +0800
committershedaniel <daniel@shedaniel.me>2021-02-02 15:32:02 +0800
commit6b8188e688a556e0950458a59ab16d7b4e58236f (patch)
treeb9da971f36b7ac6032d3acd8c1f1cf7f14f6149d /.editorconfig
parent3f0c51324fb12d8b4dcd705a5bac14e406fa9f02 (diff)
parent5b3222e9b91d7f69187268e87527950e7b89aacb (diff)
downloadarchitectury-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