forked from GL33P-0R4NG3/oreganized
-
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.20.x' into feature/compat-items
- Loading branch information
Showing
95 changed files
with
1,221 additions
and
678 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| name: Test | ||
| on: | ||
| workflow_dispatch: | ||
| push: | ||
| branches: ["[0-9]+.[0-9]+.x"] | ||
| pull_request: | ||
| types: [opened, synchronize] | ||
|
|
||
| jobs: | ||
| test: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write | ||
| packages: write | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| java-version: 17 | ||
| distribution: temurin | ||
|
|
||
| - name: Validate Gradle wrapper | ||
| uses: gradle/wrapper-validation-action@v3 | ||
|
|
||
| - name: Build and upload | ||
| uses: gradle/gradle-build-action@v3 | ||
| with: | ||
| arguments: build | ||
| env: | ||
| CI: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| // 1.20.1 2024-02-29T16:37:03.2403501 Sound Definitions | ||
| 47254237d13fdbae0fc8e5a730e2c1370f1a0156 assets/oreganized/sounds.json | ||
| // 1.20.1 2024-08-13T20:16:24.7249289 Sound Definitions | ||
| 1c624d0138bd1190491dbcf118dbe3556f4f0713 assets/oreganized/sounds.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
188 changes: 0 additions & 188 deletions
188
src/generated/resources/assets/oreganized/blockstates/exposer.json
This file was deleted.
Oops, something went wrong.
34 changes: 34 additions & 0 deletions
34
src/generated/resources/assets/oreganized/blockstates/gargoyle.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "variants": { | ||
| "attachment=floor,facing=east": { | ||
| "model": "oreganized:block/gargoyle", | ||
| "y": 270 | ||
| }, | ||
| "attachment=floor,facing=north": { | ||
| "model": "oreganized:block/gargoyle", | ||
| "y": 180 | ||
| }, | ||
| "attachment=floor,facing=south": { | ||
| "model": "oreganized:block/gargoyle" | ||
| }, | ||
| "attachment=floor,facing=west": { | ||
| "model": "oreganized:block/gargoyle", | ||
| "y": 90 | ||
| }, | ||
| "attachment=wall,facing=east": { | ||
| "model": "oreganized:block/gargoyle_side", | ||
| "y": 270 | ||
| }, | ||
| "attachment=wall,facing=north": { | ||
| "model": "oreganized:block/gargoyle_side", | ||
| "y": 180 | ||
| }, | ||
| "attachment=wall,facing=south": { | ||
| "model": "oreganized:block/gargoyle_side" | ||
| }, | ||
| "attachment=wall,facing=west": { | ||
| "model": "oreganized:block/gargoyle_side", | ||
| "y": 90 | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.