modmuss50 be0444d261 Merge branch 'dev/0.7' into future/dev ... # Conflicts: # src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy		2021-05-04 18:29:00 +01:00
..
java/net/fabricmc/loom	Merge branch 'dev/0.7' into future/dev	2021-05-04 18:29:00 +01:00
resources	Constant unpicking (#328)	2021-03-25 19:03:35 +00:00