Skip to content

Commit cff1363

Browse files
committed
Merge 1.16 into 1.18
2 parents a7e93ad + 02a68f7 commit cff1363

File tree

2 files changed

+32
-1
lines changed

2 files changed

+32
-1
lines changed

.github/workflows/release.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: release-artifacts
2+
3+
on:
4+
release:
5+
types:
6+
- published
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
with:
14+
fetch-depth: 0
15+
- uses: actions/setup-java@v3
16+
with:
17+
distribution: 'temurin'
18+
java-version: '17'
19+
- name: Grant execute permission for gradlew
20+
run: chmod +x gradlew
21+
- name: Build and publish mod to CurseForge & Modrinth
22+
run: ./gradlew forge:publishToModSites fabric:publishToModSites
23+
env:
24+
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
25+
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
26+
- name: Upload assets to GitHub
27+
uses: AButler/[email protected]
28+
with:
29+
files: 'bin/*'
30+
repo-token: ${{ secrets.GITHUB_TOKEN }}

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,8 @@ private Object collectExtraTextures(Stream<Material> instance, Collector<?, ?, ?
255255
"part",
256256
"pipe",
257257
"ropebridge",
258-
"solid_block"
258+
"solid_block",
259+
"spell_projectile"
259260
};
260261
for(String folder : extraFolders) {
261262
Collection<ResourceLocation> textureLocations = this.resourceManager.listResources("textures/" + folder, p -> p.endsWith(".png"));

0 commit comments

Comments
 (0)