illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Gustavo 2025-08-09 08:30:29 +10:00
commit ec64419623
3 changed files with 105 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/ftbquests/quests/data.snbt
View file

@ -18,7 +18,7 @@
passive: 4000
}
pause_game: true
progression_mode: "flexible"
progression_mode: "linear"
show_lock_icons: true
title: "TerraFirmaGreg"
version: 13

2
kubejs/server_scripts/tfg/recipes.miscellaneous.js
View file

@ -662,7 +662,7 @@ function registerTFGMiscellaneousRecipes(event) {
.EUt(GTValues.VA[GTValues.HV])
event.recipes.gtceu.pyrolyse_oven('vitrified_ender_dust')
.itemInputs('#forge:ender_pearls', '2x tfc:powder/kaolinite', '4x #forge:insulation_t1')
.itemInputs('minecraft:ender_pearl', '2x tfc:powder/kaolinite', '4x #forge:insulation_t1')
.inputFluids(Fluid.of('gtceu:nitrogen', 100))
.itemOutputs('tfg:vitrified_pearl')
.chancedOutput('gtceu:ash_dust', 2500, 0)

206
pakku-lock.json
View file

@ -4129,33 +4129,9 @@
"modrinth": "ZzjhlDgM"
},
"files": [
{
"type": "curseforge",
"file_name": "Steam_Rails-1.6.11-alpha+forge-mc1.20.1.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "alpha",
"url": "https://edge.forgecdn.net/files/6688/860/Steam_Rails-1.6.11-alpha+forge-mc1.20.1.jar",
"id": "6688860",
"parent_id": "688231",
"hashes": {
"sha1": "22744c2e0c9b7f6b238de7b8cbd90fe1ed6be559",
"md5": "10a30be6956c72fa4769d41580527e84"
},
"required_dependencies": [
"328085"
],
"size": 10111314,
"date_published": "2025-06-23T21:54:57.917Z"
},
{
"type": "modrinth",
"file_name": "Steam_Rails-1.6.11-alpha+forge-mc1.20.1.jar",
"file_name": "Steam_Rails-1.6.12-alpha+forge-mc1.20.1.jar",
"mc_versions": [
"1.20.1"
],
@ -4164,18 +4140,42 @@
"neoforge"
],
"release_type": "alpha",
"url": "https://cdn.modrinth.com/data/ZzjhlDgM/versions/miLFDQNQ/Steam_Rails-1.6.11-alpha+forge-mc1.20.1.jar",
"id": "miLFDQNQ",
"url": "https://cdn.modrinth.com/data/ZzjhlDgM/versions/nWkRaqjI/Steam_Rails-1.6.12-alpha+forge-mc1.20.1.jar",
"id": "nWkRaqjI",
"parent_id": "ZzjhlDgM",
"hashes": {
"sha512": "5352b3be7dc800be4727f84bbc75050d4a81b1f220637188b0e9f411ad9ecd01ea3d9392165ec55574700d8c9fb8cfc930e9e3e6f87cc3d65022734a776da239",
"sha1": "22744c2e0c9b7f6b238de7b8cbd90fe1ed6be559"
"sha512": "3db572293c8c040977348192604051f283fc86eda42ded49154a5becb08a0ca24fee3dda51119793831a4651de2bc293e8862081cd0b05e8d87912c148f49c72",
"sha1": "7808134eba7bcb56353b4929ee08eb8c0db64feb"
},
"required_dependencies": [
"LNytGWDc"
],
"size": 10111314,
"date_published": "2025-06-23T21:55:01.203935Z"
"size": 10035863,
"date_published": "2025-08-08T01:48:20.201329Z"
},
{
"type": "curseforge",
"file_name": "Steam_Rails-1.6.12-alpha+forge-mc1.20.1.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "alpha",
"url": "https://edge.forgecdn.net/files/6861/688/Steam_Rails-1.6.12-alpha+forge-mc1.20.1.jar",
"id": "6861688",
"parent_id": "688231",
"hashes": {
"sha1": "7808134eba7bcb56353b4929ee08eb8c0db64feb",
"md5": "7dffe5962bd95ba9d05ff848e351afdf"
},
"required_dependencies": [
"328085"
],
"size": 10035863,
"date_published": "2025-08-08T01:48:16.753Z"
}
]
},
@ -6968,34 +6968,9 @@
"modrinth": "8wDcQuht"
},
"files": [
{
"type": "curseforge",
"file_name": "greate-0.0.48.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "alpha",
"url": "https://edge.forgecdn.net/files/6801/78/greate-0.0.48.jar",
"id": "6801078",
"parent_id": "901996",
"hashes": {
"sha1": "4a76bcbed081397312c837b24f818da497410d30",
"md5": "74b6f2135b9bd16d04c4d60bcaa846eb"
},
"required_dependencies": [
"890405",
"328085"
],
"size": 1504296,
"date_published": "2025-07-23T00:01:38.180Z"
},
{
"type": "modrinth",
"file_name": "greate-0.0.48.jar",
"file_name": "greate-0.0.50.jar",
"mc_versions": [
"1.20.1"
],
@ -7004,19 +6979,44 @@
"neoforge"
],
"release_type": "alpha",
"url": "https://cdn.modrinth.com/data/8wDcQuht/versions/cWoAmFlf/greate-0.0.48.jar",
"id": "cWoAmFlf",
"url": "https://cdn.modrinth.com/data/8wDcQuht/versions/WqPWraSr/greate-0.0.50.jar",
"id": "WqPWraSr",
"parent_id": "8wDcQuht",
"hashes": {
"sha512": "c38a2bd9546f6b1a0fc1d500aea9ff1884d080bb42f803a19abba26438c22bed83051871a311cab1f56eee09df59426243df2bb0f495d8c61cab268edc3df2bc",
"sha1": "4a76bcbed081397312c837b24f818da497410d30"
"sha512": "57ffbe121c93eb64b95ce66294c3a87e7df37a12c72d9496105690241479273dacc3efe3ee28fd825542156cd5226301021fab2fcdf4a28675cfafb77f4365ce",
"sha1": "c3fbad31a098c0e589260e2714724ec456de3f64"
},
"required_dependencies": [
"7tG215v7",
"LNytGWDc"
"LNytGWDc",
"7tG215v7"
],
"size": 1504296,
"date_published": "2025-07-23T00:01:40.637121Z"
"size": 1500510,
"date_published": "2025-08-07T22:26:24.676945Z"
},
{
"type": "curseforge",
"file_name": "greate-0.0.50.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "alpha",
"url": "https://edge.forgecdn.net/files/6861/250/greate-0.0.50.jar",
"id": "6861250",
"parent_id": "901996",
"hashes": {
"sha1": "c3fbad31a098c0e589260e2714724ec456de3f64",
"md5": "99d378e8b1082de0378f283345cb1799"
},
"required_dependencies": [
"890405",
"328085"
],
"size": 1500510,
"date_published": "2025-08-07T22:26:22.413Z"
}
]
},
@ -7039,7 +7039,7 @@
"files": [
{
"type": "modrinth",
"file_name": "gtceu-1.20.1-7.1.3.jar",
"file_name": "gtceu-1.20.1-7.1.4.jar",
"mc_versions": [
"1.20.1"
],
@ -7047,20 +7047,20 @@
"forge"
],
"release_type": "beta",
"url": "https://cdn.modrinth.com/data/7tG215v7/versions/RtMgHfD2/gtceu-1.20.1-7.1.3.jar",
"id": "RtMgHfD2",
"url": "https://cdn.modrinth.com/data/7tG215v7/versions/Ilo1KJeO/gtceu-1.20.1-7.1.4.jar",
"id": "Ilo1KJeO",
"parent_id": "7tG215v7",
"hashes": {
"sha512": "2a53d770edf27394066b91a8c5f8c7a6247610a1db3f74b45be8130ffc5481939b5b7ae09a65b5aa482f25a7baaed130a4616553d35d0c3624d7cd0a5d9cb166",
"sha1": "85e4bcc56100bd07c6922ccc078e35cad92b5b7c"
"sha512": "95524c09f4e74ad02b5f71fdf348c71c3fa698fa26cf7f457d1c8b833ddf5bbe8b1af37e589b957e19c877ada99afb0ee5a0d79df8c9b99a08b8f586a4472796",
"sha1": "3592865e7174fd2d2305ccd043439c39936e67f8"
},
"required_dependencies": [],
"size": 17816975,
"date_published": "2025-08-07T03:01:41.635889Z"
"size": 17817033,
"date_published": "2025-08-08T04:42:15.054096Z"
},
{
"type": "curseforge",
"file_name": "gtceu-1.20.1-7.1.3.jar",
"file_name": "gtceu-1.20.1-7.1.4.jar",
"mc_versions": [
"1.20.1"
],
@ -7068,16 +7068,16 @@
"forge"
],
"release_type": "beta",
"url": "https://edge.forgecdn.net/files/6857/937/gtceu-1.20.1-7.1.3.jar",
"id": "6857937",
"url": "https://edge.forgecdn.net/files/6862/94/gtceu-1.20.1-7.1.4.jar",
"id": "6862094",
"parent_id": "890405",
"hashes": {
"sha1": "85e4bcc56100bd07c6922ccc078e35cad92b5b7c",
"md5": "b4ff56cd48111359577f4c55c575331d"
"sha1": "3592865e7174fd2d2305ccd043439c39936e67f8",
"md5": "114eefcc835095af33dd2f1e700f9475"
},
"required_dependencies": [],
"size": 17816975,
"date_published": "2025-08-07T03:01:36.343Z"
"size": 17817033,
"date_published": "2025-08-08T04:42:24.830Z"
}
]
},
@ -12575,30 +12575,6 @@
"modrinth": "GJoZTKwF"
},
"files": [
{
"type": "curseforge",
"file_name": "tfclunchbox-1.20.1-1.0.0.24.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "beta",
"url": "https://edge.forgecdn.net/files/6834/785/tfclunchbox-1.20.1-1.0.0.24.jar",
"id": "6834785",
"parent_id": "1283445",
"hashes": {
"sha1": "2b08da39c36d2590f0855e8ca5294f385b68f5ba",
"md5": "c610a18a425acb35f95afcda0fb31d90"
},
"required_dependencies": [
"302973"
],
"size": 148531,
"date_published": "2025-08-01T03:57:27.717Z"
},
{
"type": "modrinth",
"file_name": "tfclunchbox-1.20.1-1.0.0.24.jar",
@ -12622,6 +12598,30 @@
],
"size": 148531,
"date_published": "2025-08-01T04:08:36.783768Z"
},
{
"type": "curseforge",
"file_name": "tfclunchbox-1.20.1-1.0.0.25.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "beta",
"url": "https://edge.forgecdn.net/files/6861/955/tfclunchbox-1.20.1-1.0.0.25.jar",
"id": "6861955",
"parent_id": "1283445",
"hashes": {
"sha1": "1065ea7140958b3e7263cb4c345e9c26448f8f77",
"md5": "9dcf11f898db58376569522a757b0f4f"
},
"required_dependencies": [
"302973"
],
"size": 148507,
"date_published": "2025-08-08T04:01:47.173Z"
}
]
},