Skip to content

Commit

Permalink
restructure + hooks + actions
Browse files Browse the repository at this point in the history
  • Loading branch information
sisby-folk committed Aug 5, 2024
1 parent a138b57 commit 861358a
Show file tree
Hide file tree
Showing 493 changed files with 108 additions and 54 deletions.
6 changes: 3 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Disable Git line ending conversion, to prevent packwiz index hashes changing when committing from Windows
* -text
bc23-world.zip filter=lfs diff=lfs merge=lfs -text
# Disable Git line ending conversion in the pack directory
# This prevents packwiz index hashes changing when committing from Windows
pack/** -text
28 changes: 10 additions & 18 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages
name: Deploy packwiz pack to github pages

on:
# Runs on pushes targeting the default branch
push:
branches: ["trunk", "server"]
branches: ["main"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -29,22 +28,15 @@ jobs:
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: import trunk
- name: import main
uses: actions/checkout@v3
with:
ref: trunk
path: cdn/trunk
clean: false
- name: import trunk - clean
run: rm -rf cdn/trunk/.git
- name: import server
uses: actions/checkout@v3
with:
ref: server
path: cdn/server
clean: false
- name: import server - clean
run: rm -rf cdn/server/.git
ref: main
path: main
sparse-checkout: 'pack'
sparse-checkout-cone-mode: false
- name: import main - clean
run: rm -rf cdn/main/.git
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Upload artifact
Expand All @@ -54,4 +46,4 @@ jobs:
path: '.'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v2
11 changes: 2 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
# Exclude exported CurseForge zip files
./*.zip
.idea/
.DS_Store

# Exclude exported Modrinth modpacks
*.mrpack

# Exclude jetbrains IDE files
.idea

# Exclude Mac metadata files
.DS_Store
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 ModFest

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
13 changes: 2 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,2 @@
# BlanketCon 23 Pack

Be sure to check the status repo (link in discord org channels)

Color code:
- White: untested
- Green: up-to-date and not crashing
- Yellow: not up-to-date
- Red: crashing
- Orange: blocked by another mod
- Blue: modpack or otherwise not present in pack
# blanketcon-23
The official BlanketCon '23 modpack!
Empty file modified enable_hooks.sh
100755 → 100644
Empty file.
1 change: 1 addition & 0 deletions git/hooks/pre-commit
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

. git-sh-setup
echo "Refreshing Packwiz Index"
cd pack
packwiz refresh
git add index.toml
git add pack.toml
Empty file modified git/hooks/pre-merge-commit
100755 → 100644
Empty file.
7 changes: 0 additions & 7 deletions mods/controlify.pw.toml

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
73 changes: 68 additions & 5 deletions index.toml → pack/index.toml
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,10 @@ file = "mods/8187.pw.toml"
hash = "8422e436810d33c4c1adcfec7dc9974f3d687670418682d3aea61c08b09e3ad6"
metafile = true

[[files]]
file = "mods/Controlify-1.6.01.20-bc23fix.jar"
hash = "385b3fc6cf9e7ceacedf60d3278c6aac70c37915db36c732605d12e26c2e2194"

[[files]]
file = "mods/advanced-networking.pw.toml"
hash = "50fcbe10eac3abf0b80b9a4bab9c43cee1890e796328e807c3daa5bf0b2f3e50"
Expand Down Expand Up @@ -463,11 +467,6 @@ file = "mods/consistencyplus.pw.toml"
hash = "1163602dac7aea2e98a45827d8527d7e596d9f9d72e1aa6c8aebfef39d6d73c9"
metafile = true

[[files]]
file = "mods/controlify.pw.toml"
hash = "32070a7ec1a9c95fb8bf692e33899e7dd4bcada13be79aa1aaa859bde9689e40"
metafile = true

[[files]]
file = "mods/convenient-mobgriefing.pw.toml"
hash = "318590afc60d90c39271890d5f958ffdd06a20f300353b98f064774ff1f9c042"
Expand Down Expand Up @@ -1547,6 +1546,14 @@ hash = "1049d913989f6c3c1c610caa7caf1c12ff517b26729fb7385d1efabce7b0297d"
file = "resources/datapacks/atlaslisbon-ended-data.zip"
hash = "6a056c39b6f4a3069f31c932ea09b3cdedb2a16f0817a72b650e0740a025805a"

[[files]]
file = "resources/datapacks/bc23-shards/data/bc23/shard_type/bc23_types.json"
hash = "7829c589ea0285e86ae9822307714ec30311c956eb5833e3f7249704fac64257"

[[files]]
file = "resources/datapacks/bc23-shards/pack.mcmeta"
hash = "42ef53755badcfc7c802dafa51d642f0bd64aeeb87be4a95d8ee74edb7bf678d"

[[files]]
file = "resources/datapacks/bovinesandbuttercups_bc23/data/bovinesandbuttercups_bc23/bovinesandbuttercups/configured_cow_type/cyberpunk_mooshroom.json"
hash = "0c43e889f48bde99fe7e04e74c355f3190344ebd8e59d434cdf4669dbc2b348f"
Expand Down Expand Up @@ -1907,6 +1914,62 @@ hash = "74ce153773b8ffd0dc4414d2be095e5c032ea49b32269bb85893ab877a317851"
file = "resources/resourcepacks/atlaslisbon-ended-lang.zip"
hash = "dcaf7cc14b66ecce8980698cfa6d7b3cc5097d36dd0cc96cd9c57d1fff001802"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/lang/en_us.json"
hash = "78cc1d278b3910af97ec3223475bc8c3632c28e530ac1831a0f52f86d761fe35"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/textures/gui/shards/challenge_backing.png"
hash = "7dbd4adb44f8d7cda51bed74f7a93e292f77f130a6850b5ee9e6807aa72de396"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/textures/gui/shards/challenge_front.png"
hash = "718ce6536fa231a73e6f557dcf3e7b016e4952e6f4a393f38d9408da5d653a66"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/textures/gui/shards/challenge_mini_backing.png"
hash = "f19538f56f1829591884c04b26e0d251e56636198c358687502da6fd88b441fc"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/textures/gui/shards/challenge_mini_front.png"
hash = "bb70b63fadf01e9b377c06cf142b74a6fad3a249d6e0dfe4940fb60e9b3baefb"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/textures/gui/shards/secret_backing.png"
hash = "3a8a3b13ec1858fa1e8c5a2ac136c32b8e53a8c6541456a94c8006c57151940f"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/textures/gui/shards/secret_front.png"
hash = "bd64d6be0ecf86fd2587f7d0c8f12c5b8922d859d4c5f7396ff42daf701105ea"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/textures/gui/shards/secret_mini_backing.png"
hash = "f45de9ac371a2a1de59d92488478b619826eae72054e2215576519074b189318"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/textures/gui/shards/secret_mini_front.png"
hash = "50e34efaec1f221f1003d5bd888cee73606ea14fda48d98a60364cecb4134dd4"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/textures/gui/shards/visitor_backing.png"
hash = "31cf806f45c93c47d1e663889551142eedc4e49808f2fa0fd35461b5d2f30598"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/textures/gui/shards/visitor_front.png"
hash = "3da2c149cd7b3abc3d18415ebb2f5c2eb930c37a48c92d1a5f4b2d4c6563ed5b"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/textures/gui/shards/visitor_mini_backing.png"
hash = "47badc0322c56e36ce01d0494640ddba1c453adbc62cd8a57c676063efd71d86"

[[files]]
file = "resources/resourcepacks/bc23-shards/assets/bc23/textures/gui/shards/visitor_mini_front.png"
hash = "0aa145cb808d233a5ceca62e69cbe3505d4e21684e0bb8196bcade3edd55797f"

[[files]]
file = "resources/resourcepacks/bc23-shards/pack.mcmeta"
hash = "f47dc89c8f51b810e4c478174da6e437bafff86047ff9724cd5f4b541ddf1751"

[[files]]
file = "resources/resourcepacks/betterdiscs.pw.toml"
hash = "8f5ca59ad9e624af1923f2388d3f53edada3d30785729fa169ed9790045dea98"
Expand Down
File renamed without changes.
File renamed without changes.
Binary file added pack/mods/Controlify-1.6.01.20-bc23fix.jar
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 861358a

Please sign in to comment.