From 0bd9cd457c238d19c1afae3b8eb23ffc004b4fd5 Mon Sep 17 00:00:00 2001
From: Xikaro <os.valerievich@ya.ru>
Date: Thu, 17 Jul 2025 03:55:49 +0500
Subject: [PATCH] fix: ae2 & advancedperipherals & almanac

---
 pakku-lock.json   | 138 +++++++++++++++++++++++++++++++++++++++-------
 tacz/ULV_guns.zip | Bin 115305 -> 114255 bytes
 2 files changed, 118 insertions(+), 20 deletions(-)

diff --git a/pakku-lock.json b/pakku-lock.json
index 86b4638bc..30274d224 100644
--- a/pakku-lock.json
+++ b/pakku-lock.json
@@ -9,6 +9,9 @@
     "projects": [
         {
             "pakku_id": "v1XVLzfV3EJPc5ke",
+            "pakku_links": [
+                "mYY02F5XR0fB6HXF"
+            ],
             "type": "MOD",
             "side": "BOTH",
             "slug": {
@@ -82,7 +85,8 @@
                 "FnKweRrkUQZW32bO",
                 "0IQGejKaqyQTLzbL",
                 "EbImyRnmgUybUFzA",
-                "OX3oijTxjmeoXyM3"
+                "OX3oijTxjmeoXyM3",
+                "mYY02F5XR0fB6HXF"
             ],
             "type": "MOD",
             "slug": {
@@ -425,16 +429,23 @@
             ]
         },
         {
-            "pakku_id": "TRLGFfgmWd0ze7GV",
+            "pakku_id": "F5HxgTY5cUnKQx1S",
+            "pakku_links": [
+                "SA19Vecc1QTF7Kih"
+            ],
             "type": "MOD",
+            "side": "BOTH",
             "slug": {
-                "curseforge": "advanced-peripherals"
+                "curseforge": "advanced-peripherals",
+                "modrinth": "advancedperipherals"
             },
             "name": {
-                "curseforge": "Advanced Peripherals"
+                "curseforge": "Advanced Peripherals",
+                "modrinth": "Advanced Peripherals"
             },
             "id": {
-                "curseforge": "431725"
+                "curseforge": "431725",
+                "modrinth": "SOw6jD6x"
             },
             "files": [
                 {
@@ -460,6 +471,30 @@
                     ],
                     "size": 885693,
                     "date_published": "2025-06-06T22:01:06.353Z"
+                },
+                {
+                    "type": "modrinth",
+                    "file_name": "AdvancedPeripherals-1.20.1-0.7.44r.jar",
+                    "mc_versions": [
+                        "1.20.1"
+                    ],
+                    "loaders": [
+                        "forge",
+                        "neoforge"
+                    ],
+                    "release_type": "release",
+                    "url": "https://cdn.modrinth.com/data/SOw6jD6x/versions/toqbt6Np/AdvancedPeripherals-1.20.1-0.7.44r.jar",
+                    "id": "toqbt6Np",
+                    "parent_id": "SOw6jD6x",
+                    "hashes": {
+                        "sha512": "79c5ef416fbda79fbf8cda44fc3ae5515e6096c975d5c17c99407ea4e69a4b9523f853d7bb5f3677c697c8b0838ccc790d86afb722af6f0adc01e539d1eb71dc",
+                        "sha1": "35c59c04958f068724ae2b7e6b799556b3fdeb84"
+                    },
+                    "required_dependencies": [
+                        "gu7yAYhd"
+                    ],
+                    "size": 885692,
+                    "date_published": "2025-06-06T22:00:33.668272Z"
                 }
             ]
         },
@@ -500,16 +535,20 @@
             ]
         },
         {
-            "pakku_id": "Odyk7EVsuYynAJeZ",
+            "pakku_id": "QDZyqZ3QAXN6Vk9L",
             "type": "MOD",
+            "side": "SERVER",
             "slug": {
-                "curseforge": "almanac-lib"
+                "curseforge": "almanac-lib",
+                "modrinth": "almanac"
             },
             "name": {
-                "curseforge": "Almanac Lib"
+                "curseforge": "Almanac Lib",
+                "modrinth": "Almanac"
             },
             "id": {
-                "curseforge": "1115285"
+                "curseforge": "1115285",
+                "modrinth": "Gi02250Z"
             },
             "files": [
                 {
@@ -535,6 +574,30 @@
                     "required_dependencies": [],
                     "size": 15906,
                     "date_published": "2024-10-11T18:08:14.653Z"
+                },
+                {
+                    "type": "modrinth",
+                    "file_name": "almanac-1.20.x-forge-1.0.2.jar",
+                    "mc_versions": [
+                        "1.20.1",
+                        "1.20.2",
+                        "1.20.3",
+                        "1.20.4"
+                    ],
+                    "loaders": [
+                        "forge"
+                    ],
+                    "release_type": "beta",
+                    "url": "https://cdn.modrinth.com/data/Gi02250Z/versions/DnzrwvfD/almanac-1.20.x-forge-1.0.2.jar",
+                    "id": "DnzrwvfD",
+                    "parent_id": "Gi02250Z",
+                    "hashes": {
+                        "sha512": "58c4dea50fcb17593e2c97a23ce101c62b5b32e2fd71d4bbf323f2778d4474c991caba7234ecf4d06f1e246ccb9ad7f67f2fa73f023cd80ef55333e2ed952f43",
+                        "sha1": "f0b711df59cd589b088e536ca4134c5e6e73fd58"
+                    },
+                    "required_dependencies": [],
+                    "size": 15906,
+                    "date_published": "2024-10-11T18:13:58.947870Z"
                 }
             ]
         },
@@ -609,20 +672,23 @@
             ]
         },
         {
-            "pakku_id": "0IQGejKaqyQTLzbL",
+            "pakku_id": "mYY02F5XR0fB6HXF",
             "pakku_links": [
-                "dR8ZIMOQFxDrUtOO",
                 "E7ASIvLUKD1YJURv"
             ],
             "type": "MOD",
+            "side": "BOTH",
             "slug": {
-                "curseforge": "applied-energistics-2"
+                "curseforge": "applied-energistics-2",
+                "modrinth": "ae2"
             },
             "name": {
-                "curseforge": "Applied Energistics 2"
+                "curseforge": "Applied Energistics 2",
+                "modrinth": "Applied Energistics 2"
             },
             "id": {
-                "curseforge": "223794"
+                "curseforge": "223794",
+                "modrinth": "XxWD5pD3"
             },
             "files": [
                 {
@@ -647,6 +713,29 @@
                     ],
                     "size": 8423678,
                     "date_published": "2025-07-13T11:29:51.753Z"
+                },
+                {
+                    "type": "modrinth",
+                    "file_name": "appliedenergistics2-forge-15.4.6.jar",
+                    "mc_versions": [
+                        "1.20.1"
+                    ],
+                    "loaders": [
+                        "forge"
+                    ],
+                    "release_type": "release",
+                    "url": "https://cdn.modrinth.com/data/XxWD5pD3/versions/lqOU9Ohx/appliedenergistics2-forge-15.4.6.jar",
+                    "id": "lqOU9Ohx",
+                    "parent_id": "XxWD5pD3",
+                    "hashes": {
+                        "sha512": "5d1a172f28e1fe2deada9a69af4e07242535d72ce3d9eefaebebd863732c7d9a9f671c712cd599570ee613daa461a85bc895932666dc4f6acbed0421b650f881",
+                        "sha1": "773c809c67ef75979476a1c7062a754b497d9260"
+                    },
+                    "required_dependencies": [
+                        "Ck4E7v7R"
+                    ],
+                    "size": 8423678,
+                    "date_published": "2025-07-13T11:29:51.019917Z"
                 }
             ]
         },
@@ -655,7 +744,8 @@
             "pakku_links": [
                 "x1EwQZ6H2kVKR3U3",
                 "3QJUyVc5jxbc7OFC",
-                "0DMPJ1AWW6qfYubI"
+                "0DMPJ1AWW6qfYubI",
+                "mYY02F5XR0fB6HXF"
             ],
             "type": "MOD",
             "side": "BOTH",
@@ -1377,7 +1467,8 @@
         {
             "pakku_id": "vtaYhgPcR8nFk17t",
             "pakku_links": [
-                "oC0unMVGatUQIsDP"
+                "oC0unMVGatUQIsDP",
+                "mYY02F5XR0fB6HXF"
             ],
             "type": "MOD",
             "side": "BOTH",
@@ -4847,7 +4938,8 @@
                 "0IQGejKaqyQTLzbL",
                 "EbImyRnmgUybUFzA",
                 "OX3oijTxjmeoXyM3",
-                "E7ASIvLUKD1YJURv"
+                "E7ASIvLUKD1YJURv",
+                "mYY02F5XR0fB6HXF"
             ],
             "type": "MOD",
             "slug": {
@@ -7949,7 +8041,8 @@
         {
             "pakku_id": "ZsCm3zPdnqqiRP9E",
             "pakku_links": [
-                "Odyk7EVsuYynAJeZ"
+                "Odyk7EVsuYynAJeZ",
+                "QDZyqZ3QAXN6Vk9L"
             ],
             "type": "MOD",
             "slug": {
@@ -8187,6 +8280,9 @@
         },
         {
             "pakku_id": "lLYosSs7SJzBZgZP",
+            "pakku_links": [
+                "mYY02F5XR0fB6HXF"
+            ],
             "type": "MOD",
             "side": "BOTH",
             "slug": {
@@ -8257,7 +8353,8 @@
             "pakku_links": [
                 "0IQGejKaqyQTLzbL",
                 "chnSa7MrxlvxvEWU",
-                "3QJUyVc5jxbc7OFC"
+                "3QJUyVc5jxbc7OFC",
+                "mYY02F5XR0fB6HXF"
             ],
             "type": "MOD",
             "slug": {
@@ -10163,7 +10260,8 @@
         {
             "pakku_id": "sbXThweS7VFdgVMJ",
             "pakku_links": [
-                "rbYKnXWzT4megBI6"
+                "rbYKnXWzT4megBI6",
+                "mYY02F5XR0fB6HXF"
             ],
             "type": "MOD",
             "side": "BOTH",
diff --git a/tacz/ULV_guns.zip b/tacz/ULV_guns.zip
index 2ec89bee2837379bc7cfb260b0a581cc35788d8a..1ff9449b228aa9c364231d90cd0fdcf02e23c7e4 100644
GIT binary patch
delta 4675
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
Tx)FmBLx%_h!^V}23=9kae}{4n

delta 5634
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
X$_5G<V+Lb}nPLnKyH+zYFfafBu7thY