Merge remote-tracking branch 'origin/main'

# Conflicts: # gradle.properties # src/main/java/dev/rdh/createunlimited/asm/mixin/glue/SuperGlueSelectionHelperMixin.java
rhysdh540 · Jul 18, 2024 · e7476cb · e7476cb
2 parents a76a28e + 5a6e98f
commit e7476cb
Show file tree

Hide file tree

Showing 57 changed files with 929 additions and 663 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,13 +21,12 @@ jobs:
                     cache-read-only: false
 
             -   name: do the build
-                run: ./gradlew assemble squishJar
+                run: ./gradlew assemble
                 continue-on-error: true
 
             -   name: upload artifacts
                 uses: actions/upload-artifact@v4
                 with:
                     name: unlimited-artifacts-v${{ github.run_number }}
                     path: |
-                        build/libs/merged/*.jar
                         */build/libs/*.jar