shedaniel
158185d374
Merge branch '0.11.0-interf' into dev/0.11.0
...
# Conflicts:
# .github/workflows/test.yml
# build.gradle
# src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
# src/main/java/net/fabricmc/loom/build/JarRemapper.java
# src/main/java/net/fabricmc/loom/build/MixinRefmapHelper.java
# src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
# src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java
# src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
# src/main/java/net/fabricmc/loom/configuration/ide/SetupIntelijRunConfigs.java
# src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java
# src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
# src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java
# src/main/java/net/fabricmc/loom/task/LoomTasks.java
# src/main/java/net/fabricmc/loom/task/RemapJarTask.java
# src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java
# src/main/java/net/fabricmc/loom/util/Constants.java
# src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
2022-01-06 15:28:38 +08:00
shedaniel
67bc46a6b3
Merge remote-tracking branch 'FabricMC/exp/0.11' into dev/0.11.0
...
# Conflicts:
# .github/workflows/publish.yml
# .github/workflows/test.yml
# bootstrap/test-project/build.gradle
# build.gradle
# src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
# src/main/java/net/fabricmc/loom/extension/MinecraftGradleExtension.java
# src/main/java/net/fabricmc/loom/util/Constants.java
2021-12-08 22:06:34 +08:00
shedaniel
4d170687f4
Fix test.yml version again
...
Signed-off-by: shedaniel <daniel@shedaniel.me >
2021-10-14 21:02:08 +08:00
shedaniel
73f95f9962
Fix test.yml version
...
Signed-off-by: shedaniel <daniel@shedaniel.me >
2021-10-14 17:13:24 +08:00
shedaniel
72295a8196
Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0
...
Signed-off-by: shedaniel <daniel@shedaniel.me >
# Conflicts:
# .github/workflows/test.yml
# src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
# src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
# src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
# src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
# src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
# src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
# src/main/java/net/fabricmc/loom/util/SourceRemapper.java
# src/test/resources/projects/parchment/build.gradle
2021-10-13 15:13:02 +08:00
shedaniel
83de8bbc9a
Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9
...
# Conflicts:
# build.gradle
# src/main/java/net/fabricmc/loom/LoomGradleExtension.java
# src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
# src/main/java/net/fabricmc/loom/build/JarRemapper.java
# src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/GradleMappingContext.java
# src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
# src/main/java/net/fabricmc/loom/task/AbstractLoomTask.java
# src/main/java/net/fabricmc/loom/task/AbstractRunTask.java
# src/main/java/net/fabricmc/loom/task/LoomTasks.java
# src/main/java/net/fabricmc/loom/util/Constants.java
# src/main/java/net/fabricmc/loom/util/SourceRemapper.java
# src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
# src/test/resources/projects/kotlin/build.gradle.kts
2021-08-14 02:31:16 +08:00
shedaniel
489946a841
Run tests on actions
...
- Change LayeredMappingSpecBuilderTest with new hashes, we inject our custom license options, that changes the hash.
Signed-off-by: shedaniel <daniel@shedaniel.me >
2021-07-13 22:32:03 +08:00
