Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
This commit is contained in:
commit
7ca647b763
8
.github/workflows/gradle.yml
vendored
8
.github/workflows/gradle.yml
vendored
|
|
@ -22,9 +22,5 @@ jobs:
|
|||
run: ./gradlew --no-daemon build
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Forge
|
||||
path: forge/build/libs
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Fabric
|
||||
path: fabric/build/libs
|
||||
name: Package
|
||||
path: bin
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -77,7 +77,6 @@ fabric.properties
|
|||
### Eclipse ###
|
||||
*.pydevproject
|
||||
.metadata
|
||||
bin/
|
||||
tmp/
|
||||
*.tmp
|
||||
*.bak
|
||||
|
|
|
|||
1
bin/.gitignore
vendored
Normal file
1
bin/.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
*.jar
|
||||
|
|
@ -157,6 +157,7 @@ public class ModernFixEarlyConfig {
|
|||
this.configFile = file;
|
||||
|
||||
this.scanForAndBuildMixinOptions();
|
||||
mixinOptions.addAll(DEFAULT_SETTING_OVERRIDES.keySet());
|
||||
for(String optionName : mixinOptions) {
|
||||
boolean defaultEnabled = DEFAULT_SETTING_OVERRIDES.getOrDefault(optionName, true);
|
||||
this.options.putIfAbsent(optionName, new Option(optionName, defaultEnabled, false));
|
||||
|
|
|
|||
|
|
@ -61,6 +61,13 @@ remapJar {
|
|||
classifier null
|
||||
}
|
||||
|
||||
task copyJarToBin(type: Copy) {
|
||||
from remapJar // shortcut for createJar.outputs.files
|
||||
into rootProject.file("bin")
|
||||
}
|
||||
|
||||
tasks.build.dependsOn(copyJarToBin)
|
||||
|
||||
jar {
|
||||
classifier "dev"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,6 +79,13 @@ remapJar {
|
|||
classifier null
|
||||
}
|
||||
|
||||
task copyJarToBin(type: Copy) {
|
||||
from remapJar // shortcut for createJar.outputs.files
|
||||
into rootProject.file("bin")
|
||||
}
|
||||
|
||||
tasks.build.dependsOn(copyJarToBin)
|
||||
|
||||
jar {
|
||||
classifier "dev"
|
||||
manifest {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user