Skip to content

Commit

Permalink
Merge branch 'master' into 1.21.4-pre1
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander01998 committed Nov 22, 2024
2 parents accfad7 + a9e7550 commit dd338ab
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 6 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
name: Java CI with Gradle
run-name: |
${{ github.event_name == 'pull_request'
&& format('Test changes in PR #{0}: {1}', github.event.pull_request.number, github.event.pull_request.title)
|| format('Test changes in {0}: {1}', github.ref_name, github.event.head_commit.message) }}
on:
push:
Expand Down
21 changes: 16 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
name: Publish Release
run-name: "Publish release from ${{ github.ref_name }} branch"

permissions:
# Needed to push the tag.
contents: write

on:
workflow_dispatch:
Expand Down Expand Up @@ -37,9 +42,13 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

steps:
- uses: actions/checkout@v4

- name: Checkout repository
uses: actions/checkout@v4
with:
# Include all tags in case the new tag already exists.
fetch-tags: true

- name: Set up Java 21
uses: actions/setup-java@v4
Expand All @@ -58,11 +67,11 @@ jobs:

- name: Create and push tag
run: |
MOD_VERSION=$(grep "mod_version" gradle.properties | cut -d'=' -f2 | tr -d ' ')
MOD_VERSION=$(grep "mod_version" gradle.properties | cut -d'=' -f2 | tr -d ' \r')
git config --global user.name "Wurst-Bot"
git config --global user.email "contact.wurstimperium@gmail.com"
git tag v$MOD_VERSION
git push origin v$MOD_VERSION
git tag "v$MOD_VERSION"
git push origin "v$MOD_VERSION"
- name: Close milestone
if: ${{ inputs.close_milestone }}
Expand All @@ -85,3 +94,5 @@ jobs:
- name: Publish to Modrinth
if: ${{ inputs.publish_modrinth }}
run: ./gradlew publishModrinth --stacktrace

# TODO: Trigger website update
3 changes: 2 additions & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/stale@v9
- name: Run stale bot
uses: actions/stale@v9
with:
stale-issue-message: |
This issue has been open for a while with no recent activity. If this issue is still important to you, please add a comment within the next 7 days to keep it open. Otherwise, the issue will be automatically closed to free up time for other tasks.
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,14 @@ That's a lot of effort just to add two new blocks to the game - and a lot of opp
psGlassVanilla = (pvGlass + pvBlocks) * f * pvGlass = (1 + 1) * 6 * 1 = 12 
</details>

## What about connected textures mods?

So far, all connected textures mods that I've seen only seem to work on full blocks. They don't generate connected textures for stairs or slabs, which makes using them with Mo Glass impossible.

It's not that Mo Glass doesn't have support for connected textures, it's that connected textures mods don't have support for Mo Glass (or any other mod that adds stairs/slabs).

This might change one day as people make new mods all the time, so do let me know if there is a connected texture mod that supports stairs now. I'd be happy to add the extra texture files needed (if any) to make that work with Mo Glass.

## Crafting Recipes

<details>
Expand Down

0 comments on commit dd338ab

Please sign in to comment.