fix pakku and changelog merge

This commit is contained in:
Pyritie 2025-09-30 12:53:28 +01:00
parent a02390b89d
commit ba1da0faa3
2 changed files with 119 additions and 117 deletions

View file

@ -28,7 +28,6 @@
- Fixed stainless steel needles being consumed in sewing-type crafts (#1900) @Redeix
- Updated boiler minecart models and textures (#1900) @Redeix
- Fixed flux dupe using filled sea shells (#1903) @Redeix
- Fixed rare crash caused by rock spikes in the beneath having the wrong fluid block property (#1906) @Pyritie
### Translation updates
- Chinese (simplified) @jmecn

View file

@ -70,70 +70,6 @@
}
]
},
{
"pakku_id": "xYgkxAJKwHb9tvUM",
"type": "MOD",
"side": "BOTH",
"slug": {
"curseforge": "autopack-director",
"modrinth": "autopack-director"
},
"name": {
"curseforge": "AutoPack-Director",
"modrinth": "AutoPack-Director"
},
"id": {
"curseforge": "1182657",
"modrinth": "Fqqapnbs"
},
"files": [
{
"type": "modrinth",
"file_name": "AutoPack-Director-1.3.0.jar",
"mc_versions": [
"1.12.2",
"1.20.1"
],
"loaders": [
"forge",
"neoforge"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/Fqqapnbs/versions/gLhrG1om/AutoPack-Director-1.3.0.jar",
"id": "gLhrG1om",
"parent_id": "Fqqapnbs",
"hashes": {
"sha512": "75fd0ba47fd41c3984e941cff9f21630a506db7c21e5a0213baf5fb5b24bf784a7171a6f7d41f5f65b165cbb0aa61176e5637c138a9c5f61e775e3ffeb5efb4c",
"sha1": "1b9683932e33d479152858841c1d202d535dcfe9"
},
"required_dependencies": [],
"size": 3458905,
"date_published": "2025-09-12T17:57:12.375823Z"
},
{
"type": "curseforge",
"file_name": "AutoPack-Director-1.3.0.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "release",
"url": "https://edge.forgecdn.net/files/6990/27/AutoPack-Director-1.3.0.jar",
"id": "6990027",
"parent_id": "1182657",
"hashes": {
"sha1": "1b9683932e33d479152858841c1d202d535dcfe9",
"md5": "996c53f4be78f06a04d6dcee5e8730fa"
},
"required_dependencies": [],
"size": 3458905,
"date_published": "2025-09-12T17:54:26.640Z"
}
]
},
{
"pakku_id": "v1XVLzfV3EJPc5ke",
"type": "MOD",
@ -1551,6 +1487,70 @@
}
]
},
{
"pakku_id": "xYgkxAJKwHb9tvUM",
"type": "MOD",
"side": "BOTH",
"slug": {
"curseforge": "autopack-director",
"modrinth": "autopack-director"
},
"name": {
"curseforge": "AutoPack-Director",
"modrinth": "AutoPack-Director"
},
"id": {
"curseforge": "1182657",
"modrinth": "Fqqapnbs"
},
"files": [
{
"type": "modrinth",
"file_name": "AutoPack-Director-1.3.0.jar",
"mc_versions": [
"1.12.2",
"1.20.1"
],
"loaders": [
"forge",
"neoforge"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/Fqqapnbs/versions/gLhrG1om/AutoPack-Director-1.3.0.jar",
"id": "gLhrG1om",
"parent_id": "Fqqapnbs",
"hashes": {
"sha512": "75fd0ba47fd41c3984e941cff9f21630a506db7c21e5a0213baf5fb5b24bf784a7171a6f7d41f5f65b165cbb0aa61176e5637c138a9c5f61e775e3ffeb5efb4c",
"sha1": "1b9683932e33d479152858841c1d202d535dcfe9"
},
"required_dependencies": [],
"size": 3458905,
"date_published": "2025-09-12T17:57:12.375823Z"
},
{
"type": "curseforge",
"file_name": "AutoPack-Director-1.3.0.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "release",
"url": "https://edge.forgecdn.net/files/6990/27/AutoPack-Director-1.3.0.jar",
"id": "6990027",
"parent_id": "1182657",
"hashes": {
"sha1": "1b9683932e33d479152858841c1d202d535dcfe9",
"md5": "996c53f4be78f06a04d6dcee5e8730fa"
},
"required_dependencies": [],
"size": 3458905,
"date_published": "2025-09-12T17:54:26.640Z"
}
]
},
{
"pakku_id": "tcGlxrXYONei6sfG",
"type": "MOD",
@ -2861,29 +2861,7 @@
"files": [
{
"type": "modrinth",
"file_name": "Waves-1.20.1-1.5.1.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"forge",
"neoforge"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/2ygdYUcf/versions/X5VAOq7P/Waves-1.20.1-1.5.1.jar",
"id": "X5VAOq7P",
"parent_id": "2ygdYUcf",
"hashes": {
"sha512": "6eac3cee76b7543ff0d565752ab2272db36d8f4af6646b3c4434955e8527aec5b509aac79dd218227c2b739e390b3c9432fa0690eb2ccb88202fe0ae0d25fd56",
"sha1": "dbbc8dfa855b3af469a48eb55687eb7363246263"
},
"required_dependencies": [],
"size": 1278005,
"date_published": "2025-03-27T02:37:13.337751Z"
},
{
"type": "curseforge",
"file_name": "Waves-1.20.1-1.6.jar",
"file_name": "Waves-1.20.1-1.6a.jar",
"mc_versions": [
"1.20.1"
],
@ -2896,12 +2874,34 @@
"id": "W02aROo3",
"parent_id": "2ygdYUcf",
"hashes": {
"sha1": "9329336b2915096244ba566b26d6f2bf84b8f380",
"md5": "46104b7d6d4dc9ae92437003ba54de24"
"sha512": "2aabdc5e6269bcc8d4d3f45525d77a24e3a79aa48582a0de92754f672147002d1df1c410e4aed89d1244771c47671d1c46317625bde9df1c150b5f59937c47e9",
"sha1": "cd2242b9102cebbdb117591be1b7c0b3465e3122"
},
"required_dependencies": [],
"size": 1337674,
"date_published": "2025-09-25T16:32:39.317Z"
"size": 1337728,
"date_published": "2025-09-29T19:03:24.210194Z"
},
{
"type": "curseforge",
"file_name": "Waves-1.20.1-1.6a.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "release",
"url": "https://edge.forgecdn.net/files/7046/424/Waves-1.20.1-1.6a.jar",
"id": "7046424",
"parent_id": "1155936",
"hashes": {
"sha1": "cd2242b9102cebbdb117591be1b7c0b3465e3122",
"md5": "b510f00117054c6c06a0369edb44d4e0"
},
"required_dependencies": [],
"size": 1337728,
"date_published": "2025-09-29T18:42:51.277Z"
}
]
},
@ -12781,43 +12781,25 @@
]
},
{
"pakku_id": "ViGiIGRKwYjLGy3r",
"pakku_id": "LflWIJPuCczYgYtt",
"pakku_links": [
"64uacGcEw697jVGs"
],
"type": "MOD",
"side": "BOTH",
"slug": {
"curseforge": "tfc-grooming-station"
"curseforge": "tfc-grooming-station",
"modrinth": "tfc-grooming-station"
},
"name": {
"curseforge": "TFC Grooming Station"
"curseforge": "TFC Grooming Station",
"modrinth": "TFC Grooming Station"
},
"id": {
"curseforge": "1003785"
"curseforge": "1003785",
"modrinth": "2yZ8ZSeO"
},
"files": [
{
"type": "modrinth",
"file_name": "tfcgroomer-1.20.1-0.2.3.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"forge"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/2yZ8ZSeO/versions/Dj9vDrkz/tfcgroomer-1.20.1-0.2.3.jar",
"id": "Dj9vDrkz",
"parent_id": "2yZ8ZSeO",
"hashes": {
"sha512": "e32645ffd4b5ffe576b73bbab9cea1fcd1452c04c785580ae487d154ddb6b939f84057e4ed63c42976c55c70c10e1a39f3cfc091ef71163abe1cff01c6537ac0",
"sha1": "d528d3f837e7d1e93e1154b007a5493fca034a4c"
},
"required_dependencies": [],
"size": 153640,
"date_published": "2025-09-29T10:29:24.391640Z"
},
{
"type": "curseforge",
"file_name": "tfcgroomer-1.20.1-0.2.3.jar",
@ -12840,6 +12822,27 @@
],
"size": 153640,
"date_published": "2025-09-29T07:44:29.643Z"
},
{
"type": "modrinth",
"file_name": "tfcgroomer-1.20.1-0.2.3.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"forge"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/2yZ8ZSeO/versions/Dj9vDrkz/tfcgroomer-1.20.1-0.2.3.jar",
"id": "Dj9vDrkz",
"parent_id": "2yZ8ZSeO",
"hashes": {
"sha512": "e32645ffd4b5ffe576b73bbab9cea1fcd1452c04c785580ae487d154ddb6b939f84057e4ed63c42976c55c70c10e1a39f3cfc091ef71163abe1cff01c6537ac0",
"sha1": "d528d3f837e7d1e93e1154b007a5493fca034a4c"
},
"required_dependencies": [],
"size": 153640,
"date_published": "2025-09-29T10:29:24.391640Z"
}
]
},