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

merge

Browse source
This commit is contained in:
Pyritie 2025-06-19 12:12:57 +01:00
commit 1519fc82db
3 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -3,13 +3,16 @@
## [Unreleased] ## [Unreleased]
### New features ### New features
### Bug fixes ### Bug fixes
- Fixed double ingots not having a temperature (#1165) @Pyritie
- Removed a few recipes that had unobtainable create-related materials @Pyritie
- Fixed the color of placed zinc ingots and plated blocks to match the material @Pyritie
- Fixed some other steel/colored steel items being extractable in LV @Pyritie
### Changes ### Changes
- Changed pineapple yarn recipe from assembler to wiremill & coiling machine, like the other strings (#1162) @Pyritie - Changed pineapple yarn recipe from assembler to wiremill & coiling machine, like the other strings (#1162) @Pyritie
- Lowered durability of wooden tongs @Pyritie - Lowered durability of wooden tongs @Pyritie
- Streamlined the Metallurgy Age quest chapter a bit @Pyritie - Streamlined the Metallurgy Age quest chapter a bit @Pyritie
- Mushroom blocks now drop way less mushroom @Pyritie - Mushroom blocks now drop way less mushroom @Pyritie
## [0.9.11] - 13.06.2025 ## [0.9.11] - 13.06.2025
### New features ### New features
- Added back the vanilla stonecutter @Pyritie - Added back the vanilla stonecutter @Pyritie

18
kubejs/server_scripts/create/tags.js
View file

@ -46,10 +46,18 @@ const registerCreateItemTags = (event) => {
event.add('create:blaze_burner_fuel/special', "gtceu:flawless_coal_gem") event.add('create:blaze_burner_fuel/special', "gtceu:flawless_coal_gem")
event.add('create:blaze_burner_fuel/special', "gtceu:exquisite_coal_gem") event.add('create:blaze_burner_fuel/special', "gtceu:exquisite_coal_gem")
event.add('create:blaze_burner_fuel/special', "gtceu:coke_gem") event.add('create:blaze_burner_fuel/special', "gtceu:coke_gem")
event.add('create:blaze_burner_fuel/special', "beneath:cursecoal")
// Lets the basin be put on top of a charcoal forge
event.add('tfc:forge_invisible_whitelist', 'create:basin') event.add('tfc:forge_invisible_whitelist', 'create:basin')
// Allows automation with the 3x3 Hellforge
event.add('tfc:forge_invisible_whitelist', 'tfcchannelcasting:channel')
event.add('tfc:forge_invisible_whitelist', 'tfcchannelcasting:mold_table')
event.add('tfc:forge_invisible_whitelist', 'greate:steel_mechanical_pump')
event.add('tfc:forge_invisible_whitelist', 'greate:aluminum_mechanical_pump')
event.add('tfc:forge_invisible_whitelist', 'greate:stainless_steel_mechanical_pump')
event.add('tfc:forge_invisible_whitelist', 'greate:titanium_mechanical_pump')
event.add('create:non_movable', 'gtceu:wood_crate') event.add('create:non_movable', 'gtceu:wood_crate')
event.add('create:non_movable', 'gtceu:bronze_crate') event.add('create:non_movable', 'gtceu:bronze_crate')
event.add('create:non_movable', 'gtceu:steel_crate') event.add('create:non_movable', 'gtceu:steel_crate')
@ -88,6 +96,14 @@ const registerCreateBlockTags = (event) => {
// Lets the basin be put on top of a charcoal forge // Lets the basin be put on top of a charcoal forge
event.add('tfc:forge_invisible_whitelist', 'create:basin') event.add('tfc:forge_invisible_whitelist', 'create:basin')
// Allows automation with the 3x3 Hellforge
event.add('tfc:forge_invisible_whitelist', 'tfcchannelcasting:channel')
event.add('tfc:forge_invisible_whitelist', 'tfcchannelcasting:mold_table')
event.add('tfc:forge_invisible_whitelist', 'greate:steel_mechanical_pump')
event.add('tfc:forge_invisible_whitelist', 'greate:aluminum_mechanical_pump')
event.add('tfc:forge_invisible_whitelist', 'greate:stainless_steel_mechanical_pump')
event.add('tfc:forge_invisible_whitelist', 'greate:titanium_mechanical_pump')
} }

10
kubejs/server_scripts/gregtech/recipes.materials.js
View file

@ -79,7 +79,7 @@ function registerGTCEUMetalRecipes(event) {
.outputFluids(Fluid.of(material.getFluid(), 144)) .outputFluids(Fluid.of(material.getFluid(), 144))
.duration(material.getMass() * 6) .duration(material.getMass() * 6)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING) .category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
} }
} else if (material.hasProperty(PropertyKey.GEM)) { } else if (material.hasProperty(PropertyKey.GEM)) {
@ -600,7 +600,7 @@ function registerGTCEUMetalRecipes(event) {
.outputFluids(Fluid.of(material.getFluid(), 14 * 144)) .outputFluids(Fluid.of(material.getFluid(), 14 * 144))
.duration(material.getMass() * 32) .duration(material.getMass() * 32)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING) .category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_anvil`) event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_anvil`)
.itemInputs(ChemicalHelper.get(TagPrefix.ingot, material, 14)) .itemInputs(ChemicalHelper.get(TagPrefix.ingot, material, 14))
@ -676,7 +676,7 @@ function registerGTCEUMetalRecipes(event) {
.outputFluids(Fluid.of(material.getFluid(), 144)) .outputFluids(Fluid.of(material.getFluid(), 144))
.duration(material.getMass() * 8) .duration(material.getMass() * 8)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING) .category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_unfinished_lamp`) event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_unfinished_lamp`)
.itemInputs(materialIngotStack) .itemInputs(materialIngotStack)
@ -721,7 +721,7 @@ function registerGTCEUMetalRecipes(event) {
.outputFluids(Fluid.of(material.getFluid(), 144)) .outputFluids(Fluid.of(material.getFluid(), 144))
.duration(material.getMass() * 7) .duration(material.getMass() * 7)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING) .category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_trapdoor`) event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_trapdoor`)
.itemInputs(materialIngotStack) .itemInputs(materialIngotStack)
@ -769,7 +769,7 @@ function registerGTCEUMetalRecipes(event) {
.outputFluids(Fluid.of(material.getFluid(), 9)) .outputFluids(Fluid.of(material.getFluid(), 9))
.duration(material.getMass() * 3) .duration(material.getMass() * 3)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING) .category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_chain`) event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_chain`)
.itemInputs(materialIngotStack) .itemInputs(materialIngotStack)