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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
QSX}sd0QJvVd@2b40e^>b4FCWD

delta 5634
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
E0j`9-+W-In