Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
This commit is contained in:
Pyritie
commit
6a1c831b14
9 changed files with 117 additions and 22 deletions
|
|
@ -11,6 +11,9 @@
|
|||
- Air Distributors now consume as much gas as they should, instead of significantly more (#1760) @Bumperdo09
|
||||
- Fixed not being able to put igneous intrusive stones into the ore sack (#1893) @Nashy1232
|
||||
- Fixed food processor jam recipes not accepting honey (#1896) @Xaligal
|
||||
- Fixed stainless steel needles being consumed (#1900) @Redeix
|
||||
- Updated boiler minecart models and textures (#1900) @Redeix
|
||||
- Fixed flux dupe using filled sea shells (#1903) @Redeix
|
||||
### Translation updates
|
||||
- Chinese (simplified) @jmecn
|
||||
|
||||
|
|
|
|||
52
kubejs/assets/minecraft/models/block/furnace.json
Normal file
52
kubejs/assets/minecraft/models/block/furnace.json
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{
|
||||
"parent": "minecraft:block/orientable",
|
||||
"textures": {
|
||||
"particle": "gtceu:block/casings/steam/bricked_steel/side",
|
||||
"side": "gtceu:block/casings/steam/bricked_steel/side",
|
||||
"top": "gtceu:block/casings/steam/bricked_steel/top",
|
||||
"bottom": "gtceu:block/casings/steam/bricked_steel/bottom",
|
||||
"overlay": "gtceu:block/generators/boiler/coal/overlay_front",
|
||||
"vent": "gtceu:block/overlay/machine/overlay_steam_vent"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"from": [0, 0, 0],
|
||||
"to": [16, 16, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 16, 16], "texture": "#side"},
|
||||
"east": {"uv": [0, 0, 16, 16], "texture": "#side"},
|
||||
"south": {"uv": [0, 0, 16, 16], "texture": "#side"},
|
||||
"west": {"uv": [0, 0, 16, 16], "texture": "#side"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#top"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "overlay",
|
||||
"from": [0, 0, -0.01],
|
||||
"to": [16, 16, -0.01],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16.1]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay"},
|
||||
"east": {"uv": [0, 0, 0, 16], "texture": "#missing"},
|
||||
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay"},
|
||||
"west": {"uv": [0, 0, 0, 16], "texture": "#missing"},
|
||||
"up": {"uv": [0, 0, 16, 0], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 16, 0], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [0, 16.01, 0],
|
||||
"to": [16, 16.01, 16],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 0]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 16, 0], "texture": "#missing"},
|
||||
"east": {"uv": [0, 0, 16, 0], "texture": "#missing"},
|
||||
"south": {"uv": [0, 0, 16, 0], "texture": "#missing"},
|
||||
"west": {"uv": [0, 0, 16, 0], "texture": "#missing"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#vent"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#vent"}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
52
kubejs/assets/minecraft/models/block/furnace_on.json
Normal file
52
kubejs/assets/minecraft/models/block/furnace_on.json
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{
|
||||
"parent": "minecraft:block/orientable",
|
||||
"textures": {
|
||||
"particle": "gtceu:block/casings/steam/bricked_steel/side",
|
||||
"side": "gtceu:block/casings/steam/bricked_steel/side",
|
||||
"top": "gtceu:block/casings/steam/bricked_steel/top",
|
||||
"bottom": "gtceu:block/casings/steam/bricked_steel/bottom",
|
||||
"overlay": "gtceu:block/generators/boiler/coal/overlay_front_active",
|
||||
"vent": "gtceu:block/overlay/machine/overlay_steam_vent"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"from": [0, 0, 0],
|
||||
"to": [16, 16, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 16, 16], "texture": "#side"},
|
||||
"east": {"uv": [0, 0, 16, 16], "texture": "#side"},
|
||||
"south": {"uv": [0, 0, 16, 16], "texture": "#side"},
|
||||
"west": {"uv": [0, 0, 16, 16], "texture": "#side"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#top"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "overlay",
|
||||
"from": [0, 0, -0.01],
|
||||
"to": [16, 16, -0.01],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16.1]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay"},
|
||||
"east": {"uv": [0, 0, 0, 16], "texture": "#missing"},
|
||||
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay"},
|
||||
"west": {"uv": [0, 0, 0, 16], "texture": "#missing"},
|
||||
"up": {"uv": [0, 0, 16, 0], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 16, 0], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [0, 16.01, 0],
|
||||
"to": [16, 16.01, 16],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 0]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 16, 0], "texture": "#missing"},
|
||||
"east": {"uv": [0, 0, 16, 0], "texture": "#missing"},
|
||||
"south": {"uv": [0, 0, 16, 0], "texture": "#missing"},
|
||||
"west": {"uv": [0, 0, 16, 0], "texture": "#missing"},
|
||||
"up": {"uv": [0, 0, 16, 16], "texture": "#vent"},
|
||||
"down": {"uv": [0, 0, 16, 16], "texture": "#vent"}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
BIN
kubejs/assets/minecraft/textures/item/furnace_minecart.png
Normal file
BIN
kubejs/assets/minecraft/textures/item/furnace_minecart.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 611 B |
|
|
@ -1712,32 +1712,26 @@ const registerCreateRecipes = (event) => {
|
|||
}).id('tfg:create/shaped/cardboard_from_glue')
|
||||
|
||||
event.recipes.gtceu.assembler('tfg:create/cardboard_from_glue')
|
||||
.itemInputs('5x minecraft:paper')
|
||||
.inputFluids(Fluid.of('gtceu:glue', 100))
|
||||
.itemInputs('4x minecraft:paper')
|
||||
.inputFluids(Fluid.of('gtceu:glue', 50))
|
||||
.circuit(5)
|
||||
.itemOutputs('2x create:cardboard')
|
||||
.duration(200)
|
||||
.EUt(7)
|
||||
|
||||
event.shaped('create:packager', [
|
||||
event.shaped('2x create:packager', [
|
||||
'AAA',
|
||||
'BCD',
|
||||
'EFE'
|
||||
], {
|
||||
A: '#forge:rods/wrought_iron',
|
||||
B: '#forge:springs/wrought_iron',
|
||||
C: 'gtceu:ulv_machine_hull',
|
||||
C: 'gtceu:ulv_machine_casing',
|
||||
D: 'create:bound_cardboard_block',
|
||||
E: 'create:electron_tube',
|
||||
F: '#tfg:metal_bars'
|
||||
}).id('tfg:create/shaped/packager')
|
||||
|
||||
event.recipes.gtceu.assembler('tfg:create/packager')
|
||||
.itemInputs('gtceu:ulv_machine_hull', '4x #forge:rods/wrought_iron', '#forge:springs/wrought_iron', '4x create:cardboard', '#forge:string', '#gtceu:circuits/ulv')
|
||||
.itemOutputs('create:packager')
|
||||
.duration(200)
|
||||
.EUt(20)
|
||||
|
||||
event.shaped('create:item_hatch', [
|
||||
'A',
|
||||
'B',
|
||||
|
|
|
|||
|
|
@ -21,25 +21,20 @@ function registerCreateFactoryLogisticsRecipes(event) {
|
|||
.EUt(20)
|
||||
|
||||
|
||||
event.shaped('create_factory_logistics:jar_packager', [
|
||||
event.shaped('2x create_factory_logistics:jar_packager', [
|
||||
'AAA',
|
||||
'BCD',
|
||||
'EFE'
|
||||
], {
|
||||
A: '#forge:rods/copper',
|
||||
B: '#forge:springs/copper',
|
||||
C: 'gtceu:ulv_machine_hull',
|
||||
C: 'gtceu:ulv_machine_casing',
|
||||
D: 'create:fluid_tank',
|
||||
E: 'create:electron_tube',
|
||||
F: '#tfg:metal_bars'
|
||||
}).id('create_factory_logistics:shaped/jar_packager')
|
||||
|
||||
event.recipes.gtceu.assembler('create_factory_logistics:jar_packager')
|
||||
.itemInputs('gtceu:ulv_machine_hull', '4x #forge:rods/copper', '#forge:springs/copper', 'create:fluid_tank', '#gtceu:circuits/ulv')
|
||||
.itemOutputs('create_factory_logistics:jar_packager')
|
||||
.duration(200)
|
||||
.EUt(20)
|
||||
|
||||
|
||||
event.shapeless('create_factory_logistics:factory_fluid_gauge', ['create_factory_logistics:factory_fluid_gauge'])
|
||||
.id('create_factory_logistics:shapeless/factory_fluid_gauge_clear')
|
||||
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@ const registerFirmaLifeItemTags = (event) => {
|
|||
|
||||
event.add('tfc:foods/usable_in_salad', 'firmalife:food/pickled_egg')
|
||||
|
||||
event.add('tfc:fluxstone', 'firmalife:hollow_shell')
|
||||
|
||||
// Удаление тегов у руд
|
||||
event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ function registerTFGBioreactorRecipes(event) {
|
|||
|
||||
event.recipes.gtceu.wiremill('tfg:stainless_steel_needle')
|
||||
.itemInputs(ChemicalHelper.get(TagPrefix.pipeNormalFluid, GTMaterials.StainlessSteel, 1))
|
||||
.itemOutputs('tfg:stainless_steel_needle')
|
||||
.itemOutputs(Item.of('tfg:stainless_steel_needle').withNBT({Unbreakable: 1}))
|
||||
.duration(2*60*20)
|
||||
.circuit(4)
|
||||
.EUt(GTValues.VA[GTValues.MV])
|
||||
|
|
@ -204,7 +204,7 @@ function registerTFGBioreactorRecipes(event) {
|
|||
ChemicalHelper.get(TagPrefix.ring, GTMaterials.StyreneButadieneRubber, 2),
|
||||
ChemicalHelper.get(TagPrefix.pipeNormalFluid, GTMaterials.Polytetrafluoroethylene, 1),
|
||||
ChemicalHelper.get(TagPrefix.rod, GTMaterials.Polytetrafluoroethylene, 1),
|
||||
'tfg:stainless_steel_needle'
|
||||
Item.of('tfg:stainless_steel_needle').weakNBT()
|
||||
)
|
||||
.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 288))
|
||||
.itemOutputs('tfg:empty_dna_syringe')
|
||||
|
|
|
|||
|
|
@ -257,6 +257,7 @@ const registerTFGItems = (event) => {
|
|||
event.create('tfg:stainless_steel_needle')
|
||||
.translationKey('item.tfg.stainless_steel_needle')
|
||||
.unstackable()
|
||||
.maxDamage(9999)
|
||||
|
||||
//Fishing Nets
|
||||
event.create('tfg:fishing_net/wood')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue