diff --git a/.github/workflows/branch-sync.yml b/.github/workflows/branch-sync.yml new file mode 100644 index 00000000..ff4d7d08 --- /dev/null +++ b/.github/workflows/branch-sync.yml @@ -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 diff --git a/.github/workflows/java-sync.yml b/.github/workflows/java-sync.yml new file mode 100644 index 00000000..799ccedc --- /dev/null +++ b/.github/workflows/java-sync.yml @@ -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 diff --git a/java/pack/assets/ctm/lapis_block/1.png b/java/pack/assets/ctm/lapis_block/1.png new file mode 100644 index 00000000..b8a0e7a6 Binary files /dev/null and b/java/pack/assets/ctm/lapis_block/1.png differ diff --git a/java/pack/assets/ctm/lapis_block/1_n.png b/java/pack/assets/ctm/lapis_block/1_n.png new file mode 100644 index 00000000..b86fedf5 Binary files /dev/null and b/java/pack/assets/ctm/lapis_block/1_n.png differ diff --git a/java/pack/assets/ctm/lapis_block/1_s.png b/java/pack/assets/ctm/lapis_block/1_s.png new file mode 100644 index 00000000..5aafb5f4 Binary files /dev/null and b/java/pack/assets/ctm/lapis_block/1_s.png differ diff --git a/java/pack/assets/ctm/lapis_block/2.png b/java/pack/assets/ctm/lapis_block/2.png new file mode 100644 index 00000000..3623099d Binary files /dev/null and b/java/pack/assets/ctm/lapis_block/2.png differ diff --git a/java/pack/assets/ctm/lapis_block/2_n.png b/java/pack/assets/ctm/lapis_block/2_n.png new file mode 100644 index 00000000..b86fedf5 Binary files /dev/null and b/java/pack/assets/ctm/lapis_block/2_n.png differ diff --git a/java/pack/assets/ctm/lapis_block/2_s.png b/java/pack/assets/ctm/lapis_block/2_s.png new file mode 100644 index 00000000..1e5d01f5 Binary files /dev/null and b/java/pack/assets/ctm/lapis_block/2_s.png differ diff --git a/java/pack/assets/ctm/lapis_block/3.png b/java/pack/assets/ctm/lapis_block/3.png new file mode 100644 index 00000000..a66497b7 Binary files /dev/null and b/java/pack/assets/ctm/lapis_block/3.png differ diff --git a/java/pack/assets/ctm/lapis_block/3_n.png b/java/pack/assets/ctm/lapis_block/3_n.png new file mode 100644 index 00000000..b86fedf5 Binary files /dev/null and b/java/pack/assets/ctm/lapis_block/3_n.png differ diff --git a/java/pack/assets/ctm/lapis_block/3_s.png b/java/pack/assets/ctm/lapis_block/3_s.png new file mode 100644 index 00000000..80239b22 Binary files /dev/null and b/java/pack/assets/ctm/lapis_block/3_s.png differ diff --git a/java/pack/assets/ctm/lapis_block/4.png b/java/pack/assets/ctm/lapis_block/4.png new file mode 100644 index 00000000..5e2fda00 Binary files /dev/null and b/java/pack/assets/ctm/lapis_block/4.png differ diff --git a/java/pack/assets/ctm/lapis_block/4_n.png b/java/pack/assets/ctm/lapis_block/4_n.png new file mode 100644 index 00000000..b86fedf5 Binary files /dev/null and b/java/pack/assets/ctm/lapis_block/4_n.png differ diff --git a/java/pack/assets/ctm/lapis_block/4_s.png b/java/pack/assets/ctm/lapis_block/4_s.png new file mode 100644 index 00000000..4e9c31c1 Binary files /dev/null and b/java/pack/assets/ctm/lapis_block/4_s.png differ diff --git a/java/pack/assets/ctm/lapis_block/lapis_block.properties b/java/pack/assets/ctm/lapis_block/lapis_block.properties new file mode 100644 index 00000000..c1d241a0 --- /dev/null +++ b/java/pack/assets/ctm/lapis_block/lapis_block.properties @@ -0,0 +1,2 @@ +method=random +tiles=1-4 \ No newline at end of file