Merge remote-tracking branch 'origin/main' into 1.18

.github/workflows/gradle.yml

@@ -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

.gitignore

@@ -77,7 +77,6 @@ fabric.properties
 ### Eclipse ###
 *.pydevproject
 .metadata
-bin/
 tmp/
 *.tmp
 *.bak

bin/.gitignore

@@ -0,0 +1 @@
+*.jar

common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java

@@ -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));

fabric/build.gradle

@@ -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"
 }

forge/build.gradle

@@ -77,6 +77,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 {