Commit Graph

779 Commits

Author SHA1 Message Date
shedaniel
2b78a0971f Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
#	build.gradle
2022-07-03 17:50:40 +08:00
modmuss50
8e11e4a385 Actually handle gzip encoded connections when downloading. 2022-07-02 15:57:10 +01:00
shedaniel
45279bf408 Add warning message for outdated loom
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-12-02 02:14:03 +08:00
modmuss50
6695e2b5d1 Use a fat mercury build with the correct versions of JDT included. (#429) 2021-07-17 21:57:17 +01:00
shedaniel
c307394912 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge 2021-05-14 06:58:43 +08:00
modmuss50
b90ce217ab Improve merge jars error handling 2021-05-12 20:29:33 +01:00
shedaniel
3364e7ae64 Add detection for "architectury.common.marker" to remap
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-10 23:12:54 +08:00
shedaniel
162a903423 Change MavenConfiguration's forge maven 2021-04-29 20:13:31 +08:00
Username404-59
4d10953278 Fix displayed forge version when using prefix-ranges in dev environments and fix the forge repo url too (#16)
* Fix displayed forge version when using prefix-ranges in dev environments

* Fix the forge repo url
2021-04-29 20:12:32 +08:00
shedaniel
9aa807d05a Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge 2021-04-27 20:58:01 +08:00
modmuss50
91d7cc8952 Revert "Add loom development dependencies to test runtime classpath (#387)" (#388)
This reverts commit e1ef90496f.
2021-04-19 18:00:59 +01:00
ByMartrixX
e1ef90496f Add loom development dependencies to test runtime classpath (#387) 2021-04-19 18:00:28 +01:00
shedaniel
8f6de9af84 Add more logging to JarRemapper 2021-04-14 09:39:06 +08:00
shedaniel
ee847ba61b Add "loom.forge.include" for include configuration on forge 2021-04-14 08:40:11 +08:00
shedaniel
003574b9e8 Fix refmap remapping 2021-04-14 08:38:39 +08:00
shedaniel
361c84cf00 Simplify RemapJarTask remapRefmap 2021-04-13 16:27:14 +08:00
shedaniel
61f724c76e Fix RemapSourcesJarTask defaulting to intermediary 2021-04-13 16:12:02 +08:00
shedaniel
f5c00d186b Merge remote-tracking branch 'architectury/dev/0.6-forge' into dev/0.6-forge 2021-04-13 16:05:34 +08:00
shedaniel
635fd8a55d Allow remapping to other namespaces 2021-04-13 16:05:26 +08:00
shedaniel
5eadada719 Merge pull request #13 from Devan-Kerman/dev/0.6-forge
allow mcp without params.csv to be used
2021-04-09 09:52:16 +08:00
Devan-Kerman
d333ad16d2 fix maybe 2021-04-08 17:07:30 -05:00
shedaniel
f45f47b1b0 Remove relocate 2021-04-04 21:54:47 +08:00
shedaniel
cd1d19afa7 Update tiny remapper 2021-04-04 21:54:07 +08:00
shedaniel
8bf5870c7f 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
2021-04-04 19:21:23 +08:00
shedaniel
848c0e553e Rename log message to be less confusing 2021-04-04 19:17:34 +08:00
Octavia Togami
8a5467cdca Fix name comparision in GroovyXmlUtil (#373)
Nodes can also have groovy.xml.QNames, which need to be compared using
their matches(Object) method.
2021-03-29 12:45:38 +01:00
modmuss50
8e424f3f50 Try to cleanup files when failing better, should hopefully increase the changes of things working on a subsequent run.
Also improve the error message a little.
2021-03-18 22:00:06 +00:00
modmuss50
c033246a9f Add a strict mode when download files, will be a bit slower but should help solve some issues. 2021-03-18 14:38:29 +00:00
modmuss50
b4f6874613 Fix race condition in asset downloading 2021-03-15 18:07:54 +00:00
shedaniel
f7ac507d67 Publish snapshot builds for wildcard 2021-03-09 20:43:40 +08:00
shedaniel
bcb55fe62f Fix @Shadow remap 2021-03-08 01:13:13 +08:00
shedaniel
bfcd0aa8c1 Use refmap-remapper to remap refmap to prevent double remapping 2021-03-08 00:59:47 +08:00
shedaniel
76e5b7131e Fix /inject/injection.jar not existing 2021-03-07 21:25:44 +08:00
shedaniel
11a39428c3 Fix build script 2021-03-07 20:59:13 +08:00
shedaniel
f66548f7fb Update tiny remapper 2021-03-05 16:25:17 +08:00
shedaniel
ace2a412f2 Migrate to architectury tiny-remapper 2021-03-05 02:20:31 +08:00
shedaniel
11a665ed2e Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge 2021-03-01 00:45:34 +08:00
modmuss50
b1edf7a737 Fix inherit not copying ideConfigGenerated 2021-02-27 19:32:31 +00:00
shedaniel
8c0e612720 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
2021-02-27 17:43:24 +08:00
Shadowfacts
4540b3af33 Add log4jConfigs to Loom extension (#356)
Allows mod build scripts to specify custom Log4j config files that will
be combined together when running Minecraft in the dev-env. For example:

    loom {
        log4jConfigs.from "MyCustomConfig.xml"
    }

See: https://logging.apache.org/log4j/2.x/manual/configuration.html#CompositeConfiguration
2021-02-26 21:19:26 +00:00
shedaniel
dc73e7baa5 Add way to add new launch arguments, because this can change without regenerating the run configs. 2021-02-22 00:18:00 +08:00
shedaniel
2e2554d9cf Add debug logging to publication modification, remove log spam in asset downloading. 2021-02-21 21:58:11 +08:00
shedaniel
ce4a1cb2a3 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
#	.github/workflows/test-push.yml
#	build.gradle
#	src/main/java/net/fabricmc/loom/util/Constants.java
2021-02-20 18:29:31 +08:00
modmuss50
57c9a8f320 Add loom dev deps to runtimeClasspath instead of runtimeOnly 2021-02-14 14:23:04 +00:00
modmuss50
46957df360 Run tests against gradle 7 and fail on deprecation. Fix gradle 8 support again. 2021-02-14 13:56:22 +00:00
shedaniel
e8800ec6ac Fix merge conflicts 2021-02-14 15:45:55 +08:00
shedaniel
021773f263 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/processors/MinecraftProcessedProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftNativesProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
#	src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
2021-02-14 15:42:50 +08:00
modmuss50
2070aeb94a Disable log4j jansi support when compiling, removes a warning about it. 2021-02-13 18:04:16 +00:00
Juuxel
dd440acb8e Add dev runtime dependencies to runtimeClasspath instead of runtimeOnly (#350)
This stops them from incorrectly showing up in Gradle module metadata
when a software component is used.
2021-02-13 16:53:44 +00:00
Juuxel
737c6cbd4f RunConfigSettings.generateIDEConfig -> ideConfigGenerated + normal getter/setter (#349) 2021-02-12 18:43:05 +00:00