Skip to content

Commit

Permalink
upd(java): Lapis variety
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonjgardner committed Aug 1, 2024
1 parent ac20dbd commit fa0314a
Show file tree
Hide file tree
Showing 15 changed files with 52 additions and 0 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/branch-sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Bedrock Branch

on:
push:
branches: [ main ]


permissions: write-all

jobs:
sync:
runs-on: ubuntu-latest
steps:
- name: Checkout main
uses: actions/checkout@v3
with:
ref: main
fetch-depth: 0
- name: Sync main to bedrock
run: |
git checkout bedrock
rsync -av bedrock/pack .
git add ./RP
git merge main
git push origin bedrock
25 changes: 25 additions & 0 deletions .github/workflows/java-sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Java Branch

on:
push:
branches: [ main ]
paths: [ 'java/pack/**' ]

permissions: write-all

jobs:
sync:
runs-on: ubuntu-latest
steps:
- name: Checkout main
uses: actions/checkout@v3
with:
ref: main
fetch-depth: 0
- name: Sync main to java
run: |
git checkout java
rsync -av java/pack ./pack
git add ./pack
git merge main
git push origin java
Binary file added java/pack/assets/ctm/lapis_block/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added java/pack/assets/ctm/lapis_block/1_n.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added java/pack/assets/ctm/lapis_block/1_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added java/pack/assets/ctm/lapis_block/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added java/pack/assets/ctm/lapis_block/2_n.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added java/pack/assets/ctm/lapis_block/2_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added java/pack/assets/ctm/lapis_block/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added java/pack/assets/ctm/lapis_block/3_n.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added java/pack/assets/ctm/lapis_block/3_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added java/pack/assets/ctm/lapis_block/4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added java/pack/assets/ctm/lapis_block/4_n.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added java/pack/assets/ctm/lapis_block/4_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions java/pack/assets/ctm/lapis_block/lapis_block.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
method=random
tiles=1-4

0 comments on commit fa0314a

Please sign in to comment.