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:
Pyritie 2025-06-25 22:59:52 +01:00
commit 1d8f9e0c2d
6 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -31,6 +31,7 @@
- Removed gems tag from flint @Pyritie - Removed gems tag from flint @Pyritie
- Updated texture for aqueous accumulator (#1168) @Redeix - Updated texture for aqueous accumulator (#1168) @Redeix
- Kaolin Klayzes now also drop blood lilies @Pyritie - Kaolin Klayzes now also drop blood lilies @Pyritie
- Crushing wheels need a machine hull to craft now @Pyritie
### Bug fixes ### Bug fixes
- Fixed a mud hut structure that had deprecated zinc ingots @Pyritie - Fixed a mud hut structure that had deprecated zinc ingots @Pyritie
- The electric greenhouse now also allows loose rocks and plants inside, since TFC spawns them on any grass block @Pyritie - The electric greenhouse now also allows loose rocks and plants inside, since TFC spawns them on any grass block @Pyritie
@ -40,6 +41,8 @@
- Fixed some other steel/colored steel items being extractable in LV (#1212) @Pyritie - Fixed some other steel/colored steel items being extractable in LV (#1212) @Pyritie
- Fixed polished/cut migmatite recipe conflict (#1153) @JeanRdSz - Fixed polished/cut migmatite recipe conflict (#1153) @JeanRdSz
- Fixed some bugs with the lunchbox (#1200) @Thomasx0 - Fixed some bugs with the lunchbox (#1200) @Thomasx0
- Greate millstones/crushing wheels now give the correct amount of byproducts
- Greate bulk washing now correctly works on depots and belts
## [0.9.11] - 13.06.2025 ## [0.9.11] - 13.06.2025
### New features ### New features

2
kubejs/data/ad_astra/planets/mars_orbit.json
View file

@ -5,5 +5,5 @@
"solar_power": 64, "solar_power": 64,
"solar_system": "ad_astra:solar_system", "solar_system": "ad_astra:solar_system",
"temperature": -270, "temperature": -270,
"tier": 2 "tier": 10
} }

2
kubejs/data/ad_astra/planets/moon_orbit.json
View file

@ -5,5 +5,5 @@
"solar_power": 128, "solar_power": 128,
"solar_system": "ad_astra:solar_system", "solar_system": "ad_astra:solar_system",
"temperature": -270, "temperature": -270,
"tier": 1 "tier": 10
} }

8
kubejs/data/ad_astra/planets/venus_orbit.json
View file

@ -1,9 +1,9 @@
{ {
"dimension": "ad_astra:venus_orbit", "dimension": "ad_astra:glacio_orbit",
"gravity": 0.0, "gravity": 0.0,
"oxygen": false, "oxygen": false,
"solar_power": 88, "solar_power": 128,
"solar_system": "ad_astra:solar_system", "solar_system": "ad_astra:solar_system",
"temperature": -108, "temperature": -270,
"tier": 3 "tier": 10
} }

8
kubejs/server_scripts/greate/recipes.js
View file

@ -252,7 +252,7 @@ function registerGreateRecipes(event) {
], { ], {
A: '#forge:plates/tin_alloy', A: '#forge:plates/tin_alloy',
B: '#forge:storage_blocks/wrought_iron', B: '#forge:storage_blocks/wrought_iron',
C: 'greate:steel_shaft', C: 'gtceu:lv_machine_hull',
}).id('greate:mechanical_crafting/steel_crushing_wheel') }).id('greate:mechanical_crafting/steel_crushing_wheel')
event.recipes.createMechanicalCrafting('2x greate:aluminium_crushing_wheel', [ event.recipes.createMechanicalCrafting('2x greate:aluminium_crushing_wheel', [
@ -264,7 +264,7 @@ function registerGreateRecipes(event) {
], { ], {
A: '#forge:plates/vanadium_steel', A: '#forge:plates/vanadium_steel',
B: '#forge:storage_blocks/steel', B: '#forge:storage_blocks/steel',
C: 'greate:aluminium_shaft', C: 'gtceu:mv_machine_hull',
}).id('greate:mechanical_crafting/aluminium_crushing_wheel') }).id('greate:mechanical_crafting/aluminium_crushing_wheel')
event.recipes.createMechanicalCrafting('2x greate:stainless_steel_crushing_wheel', [ event.recipes.createMechanicalCrafting('2x greate:stainless_steel_crushing_wheel', [
@ -276,7 +276,7 @@ function registerGreateRecipes(event) {
], { ], {
A: '#forge:plates/blue_alloy', A: '#forge:plates/blue_alloy',
B: '#forge:storage_blocks/aluminium', B: '#forge:storage_blocks/aluminium',
C: 'greate:stainless_steel_shaft', C: 'gtceu:hv_machine_hull',
}).id('greate:mechanical_crafting/stainless_steel_crushing_wheel') }).id('greate:mechanical_crafting/stainless_steel_crushing_wheel')
event.recipes.createMechanicalCrafting('2x greate:titanium_crushing_wheel', [ event.recipes.createMechanicalCrafting('2x greate:titanium_crushing_wheel', [
@ -288,7 +288,7 @@ function registerGreateRecipes(event) {
], { ], {
A: '#forge:plates/ultimet', A: '#forge:plates/ultimet',
B: '#forge:storage_blocks/stainless_steel', B: '#forge:storage_blocks/stainless_steel',
C: 'greate:titanium_shaft', C: 'gtceu:ev_machine_hull',
}).id('greate:mechanical_crafting/titanium_crushing_wheel') }).id('greate:mechanical_crafting/titanium_crushing_wheel')
// #endregion // #endregion

32
kubejs/server_scripts/greate/recipes.recycling.js
View file

@ -196,8 +196,8 @@ function registerGreateRecyclingRecipes(event) {
.itemOutputs( .itemOutputs(
ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 18), ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 18),
ChemicalHelper.get(TagPrefix.dust, GTMaterials.TinAlloy, 8), ChemicalHelper.get(TagPrefix.dust, GTMaterials.TinAlloy, 8),
ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Steel, 1)) ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 4))
.duration(GTMaterials.TinAlloy.getMass() * 26) .duration(GTMaterials.TinAlloy.getMass() * 34)
.category(GTRecipeCategories.MACERATOR_RECYCLING) .category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(GTValues.VA[GTValues.ULV])
@ -206,8 +206,8 @@ function registerGreateRecyclingRecipes(event) {
.itemOutputs( .itemOutputs(
ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 18), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 18),
ChemicalHelper.get(TagPrefix.ingot, GTMaterials.TinAlloy, 8), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.TinAlloy, 8),
ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Steel, 1)) ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 4))
.duration(GTMaterials.TinAlloy.getMass() * 26) .duration(GTMaterials.TinAlloy.getMass() * 34)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.LV]) .EUt(GTValues.VA[GTValues.LV])
@ -216,8 +216,8 @@ function registerGreateRecyclingRecipes(event) {
.itemOutputs( .itemOutputs(
ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 18), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 18),
ChemicalHelper.get(TagPrefix.dust, GTMaterials.VanadiumSteel, 8), ChemicalHelper.get(TagPrefix.dust, GTMaterials.VanadiumSteel, 8),
ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Aluminium, 1)) ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 4))
.duration(GTMaterials.VanadiumSteel.getMass() * 26) .duration(GTMaterials.VanadiumSteel.getMass() * 34)
.category(GTRecipeCategories.MACERATOR_RECYCLING) .category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(GTValues.VA[GTValues.ULV])
@ -226,8 +226,8 @@ function registerGreateRecyclingRecipes(event) {
.itemOutputs( .itemOutputs(
ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 18), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 18),
ChemicalHelper.get(TagPrefix.ingot, GTMaterials.VanadiumSteel, 8), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.VanadiumSteel, 8),
ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Aluminium, 1)) ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 4))
.duration(GTMaterials.VanadiumSteel.getMass() * 26) .duration(GTMaterials.VanadiumSteel.getMass() * 34)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.LV]) .EUt(GTValues.VA[GTValues.LV])
@ -236,8 +236,8 @@ function registerGreateRecyclingRecipes(event) {
.itemOutputs( .itemOutputs(
ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 18), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 18),
ChemicalHelper.get(TagPrefix.dust, GTMaterials.BlueAlloy, 8), ChemicalHelper.get(TagPrefix.dust, GTMaterials.BlueAlloy, 8),
ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.StainlessSteel, 1)) ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 4))
.duration(GTMaterials.BlueAlloy.getMass() * 26) .duration(GTMaterials.BlueAlloy.getMass() * 34)
.category(GTRecipeCategories.MACERATOR_RECYCLING) .category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(GTValues.VA[GTValues.ULV])
@ -246,8 +246,8 @@ function registerGreateRecyclingRecipes(event) {
.itemOutputs( .itemOutputs(
ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 18), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 18),
ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlueAlloy, 8), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlueAlloy, 8),
ChemicalHelper.get(TagPrefix.nugget, GTMaterials.StainlessSteel, 1)) ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 4))
.duration(GTMaterials.BlueAlloy.getMass() * 26) .duration(GTMaterials.BlueAlloy.getMass() * 34)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.LV]) .EUt(GTValues.VA[GTValues.LV])
@ -256,8 +256,8 @@ function registerGreateRecyclingRecipes(event) {
.itemOutputs( .itemOutputs(
ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 18), ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 18),
ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ultimet, 8), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ultimet, 8),
ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Titanium, 1)) ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 4))
.duration(GTMaterials.Ultimet.getMass() * 26) .duration(GTMaterials.Ultimet.getMass() * 34)
.category(GTRecipeCategories.MACERATOR_RECYCLING) .category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(GTValues.VA[GTValues.ULV])
@ -266,8 +266,8 @@ function registerGreateRecyclingRecipes(event) {
.itemOutputs( .itemOutputs(
ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 18), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 18),
ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ultimet, 8), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ultimet, 8),
ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Titanium, 1)) ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 4))
.duration(GTMaterials.Ultimet.getMass() * 26) .duration(GTMaterials.Ultimet.getMass() * 34)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.LV]) .EUt(GTValues.VA[GTValues.LV])