Merge origin/main

.gitignore

@@ -1 +1,2 @@
 *.jar
+!static/*.jar

.woodpecker/buildModpack.yml

@@ -9,7 +9,7 @@ pipeline:
       - apk update
       - apk add zip
       - zip -r zsazs.zip mods CustomSkinLoader
-      - zip mods.zip mods/*.jar
+      - cd mods && zip mods.zip *.jar
   release:
     image: plugins/gitea-release
     settings:
@@ -18,7 +18,7 @@ pipeline:
       base_url: https://git.toldi.eu
       files:
       - zsazs.zip
-      - mods.zip
+      - mods/mods.zip
       checksum:
       - md5
       - sha1

index.toml

@@ -1,5 +1,37 @@
 hash-format = "sha256"
 
+[[files]]
+file = ".directory"
+hash = "ee0c5f973a868162ae178681fda5b37aa4f0f4c8e2ef6c92728d9c6cef411bb1"
+
+[[files]]
+file = ".woodpecker/buildModpack.yml"
+hash = "938dd245693cf77b231e325784cd82ef827b5940ad11d3d1bf27c7d415be40ef"
+
+[[files]]
+file = "CustomSkinLoader/.directory"
+hash = "ee0c5f973a868162ae178681fda5b37aa4f0f4c8e2ef6c92728d9c6cef411bb1"
+
+[[files]]
+file = "CustomSkinLoader/CustomSkinAPIPlus-ClientID"
+hash = "c07e95f65485222f43f23fc8b49229130cc2171cf3c9899d07a9a1c86990201a"
+
+[[files]]
+file = "CustomSkinLoader/CustomSkinLoader.json"
+hash = "150c63c03c4b797ac6bd1e871d4e77bcefdeed4804e57171f3d215b720311f9d"
+
+[[files]]
+file = "CustomSkinLoader/CustomSkinLoader.log"
+hash = "035cf5cb32f13af5d36d984370dc6bac3fe6f2bbb231ea0ff7d129182e3698fe"
+
+[[files]]
+file = "CustomSkinLoader/caches/c7ab91bb52047dcd9ef8aeb55f9ed6b33208434a"
+hash = "7c2cb8757300a3c62747d84d9080679f95d0801e8e848c459a11ff41fc419b69"
+
+[[files]]
+file = "CustomSkinLoader/caches/c7ab91bb52047dcd9ef8aeb55f9ed6b33208434a.json"
+hash = "7a5b6835b4eee3d53449bbea4efbb4c3582413be5601d01b3a22acc06b768adf"
+
 [[files]]
 file = "mods/AutoRegLib-1.7-53.jar"
 hash = "41ece668218c074bf2f30be5883cd90ad1a48dad6537a7fefca720230f688140"
@@ -8,6 +40,18 @@ hash = "41ece668218c074bf2f30be5883cd90ad1a48dad6537a7fefca720230f688140"
 file = "mods/CustomSkinLoader_ForgeActive-14.14-SNAPSHOT-323.jar"
 hash = "28d33bec4988a062104adbe3e72e69d0d077d8a3fae60a2240c5cb27f7bd0485"
 
+[[files]]
+file = "mods/Dynmap-3.4-beta-3-forge-1.18.2.jar"
+hash = "30cf5f0cfd47f656b94c974702f01d4a4e67f00c658abb56a23d6d77b3be74c3"
+
+[[files]]
+file = "mods/EasierSleeping-1.18.2-2.1.0.jar"
+hash = "02508b67aa6e0f28728b660f2cdd96fe692e4b67a73b72fcf310b7cf791694bc"
+
+[[files]]
+file = "mods/FallingTree-1.18.2-3.5.0.jar"
+hash = "485ed41db54d25ca7d390a83d7dbd0c5fdbbbe9c7d199bb04875ba28111cdc10"
+
 [[files]]
 file = "mods/FarmersDelight-1.18.2-1.0.4.jar"
 hash = "2a974e104ee1e02264c05cd896b120af69fa9b1edf5e8886352326d3b8e02642"
@@ -20,6 +64,10 @@ hash = "115d3cbb71b67a637e2dcc9bbf819e21823082d4dda3014144431769fa1a663c"
 file = "mods/Mekanism-1.18.2-10.2.0.459.jar"
 hash = "c27ba0debb5dd60ad031c26f34ceb185b83cd4ff078553a35621d7bd0d416b67"
 
+[[files]]
+file = "mods/MekanismGenerators-1.18.2-10.2.0.459.jar"
+hash = "8e9a99c38f53c7b678fd087f9db3a88f36668a1e42756582d916bc152d66c0dd"
+
 [[files]]
 file = "mods/Placebo-1.18.2-6.2.1.jar"
 hash = "3d4b8c63350d2779f86526f5caf0cd2cb07853e2702348774c212c9f77fc5bb0"
@@ -47,8 +95,8 @@ hash = "7b861a0ac4bf19d568b59d6d439169b932c8582fc9a7c4e4d98eb46b6a520c93"
 metafile = true
 
 [[files]]
-file = "mods/appliedenergistics2-11.0.0-alpha.4.jar"
-hash = "0ef846638cb8f32a610f0e8a0fd906ffa3b4fbe687654a3578097e446e97a989"
+file = "mods/appliedenergistics2-11.0.0-alpha.5.jar"
+hash = "b3e4d1b8088fdca43a6f9c29a1f35ef290f719d335348966426d8eea552fc402"
 
 [[files]]
 file = "mods/autoreglib.toml"
@@ -140,8 +188,8 @@ hash = "3e963187c3f080269bc97d3a419ab4b8395bc9fcb86e413f39658cae659b0990"
 metafile = true
 
 [[files]]
-file = "mods/journeymap-1.18.2-5.8.1-forge.jar"
-hash = "fb7b33a4fbe25519f040e0991feea54a50b75e934193bb189e6c5b179e37516d"
+file = "mods/journeymap-1.18.2-5.8.2-forge.jar"
+hash = "5c4270d3b03777a0b0973ce977c850d44d8fcf0a52148867ed796794ec8f264e"
 
 [[files]]
 file = "mods/journeymap.toml"
@@ -166,6 +214,11 @@ hash = "33acdc66abafb4c4cc33d2253ad2a13824e326df4fd05f0a24c7af3f0820402b"
 file = "mods/pamhc2foodextended-1.18.2-1.0.0.jar"
 hash = "2814331a30accf9cfe647ef3fa5ec6c6a46a300cf8ce94b069272da875b199da"
 
+[[files]]
+file = "mods/pams-harvestcraft-2-crops.toml"
+hash = "63b5f870139ffd6cf10e226dceac72160565e78436f6a226e44b304aa9de1e09"
+metafile = true
+
 [[files]]
 file = "mods/pams-harvestcraft-2-food-core.toml"
 hash = "a1e4bee54b25680ff89e6ed91c8bf0148da3ca3a35eab02074bfe9abac38d742"
@@ -191,6 +244,10 @@ file = "mods/toast-control.toml"
 hash = "54ab2e75bcac77bd63b4d8c5e831858252836c561d10ebeef932b1cb3c782e44"
 metafile = true
 
+[[files]]
+file = "mods/waystones-forge-1.18.2-10.0.0.jar"
+hash = "18988d862095ad0ccbcbaa9803c86b45547bb49ce3fa0871c0617d46b59c08c0"
+
 [[files]]
 file = "mods/waystones.toml"
 hash = "b209c7da3afa46bee40dc174aa9cf7a13abf5ef9c987976848e16ce4c199d576"
@@ -202,8 +259,12 @@ hash = "a8fbb24dc604278e97f4688e82d3d91a318b98efc08d5dbfcbcbcab6443d116c"
 
 [[files]]
 file = "packwiz-installer.jar"
-hash = "0d12509a8f8075c6ec70c6968a830d2a407e6190f64f7ee2c0561797e948149f"
+hash = "3583f2627e2e431ceb38c4cb9b21c9788fb5d1e3ecb1442b69fb068e74b15f7a"
 
 [[files]]
 file = "packwiz.json"
-hash = "64504d58595c1f563ded3ead3ecdcb3b345056cb63eaab401648e390191a45f2"
+hash = "2958e1fe7033b55f3f2632bc2fcb9d39df5268a99d254eab046edc374eed0653"
+
+[[files]]
+file = "static/pamhc2crops.jar"
+hash = "ec21cbb094437bec2f2763bf111e6f12fdd6dd53a898974f41f343c95d3cdf79"

mods/pams-harvestcraft-2-crops.toml

@@ -0,0 +1,9 @@
+name = "Pam's HarvestCraft 2 - Crops"
+filename = "pamhc2crops.jar"
+side = "both"
+
+[download]
+url = "https://git.toldi.eu/Bazsalanszky/ZsazsMcModpack/raw/branch/main/static/pamhc2crops.jar"
+hash-format = "sha1"
+hash = "81fad7da66d21dc43aa817b0186b8bfb999c9c89"
+

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "8c8a7e0d2a2adedf63639d689145f1bbc8dc7f25d4ddd2d86d3a51c10f6c2eee"
+hash = "79839f8dcadbae7c0adef1a79561b279c61c1d770d8b416a89b893227a94aab5"
 
 [versions]
 forge = "40.1.0"