Merge 1.16 into 1.18

This commit is contained in:
embeddedt 2023-06-11 20:43:20 -04:00
commit cff1363050
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 32 additions and 1 deletions

30
.github/workflows/release.yml vendored Normal file
View File

@ -0,0 +1,30 @@
name: release-artifacts
on:
release:
types:
- published
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build and publish mod to CurseForge & Modrinth
run: ./gradlew forge:publishToModSites fabric:publishToModSites
env:
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
- name: Upload assets to GitHub
uses: AButler/upload-release-assets@v2.0
with:
files: 'bin/*'
repo-token: ${{ secrets.GITHUB_TOKEN }}

View File

@ -255,7 +255,8 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
"part",
"pipe",
"ropebridge",
"solid_block"
"solid_block",
"spell_projectile"
};
for(String folder : extraFolders) {
Collection<ResourceLocation> textureLocations = this.resourceManager.listResources("textures/" + folder, p -> p.endsWith(".png"));