Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
This commit is contained in:
commit
c4dce6bb99
3 changed files with 31 additions and 8 deletions
|
|
@ -1,7 +1,9 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
### Changes
|
### Changes
|
||||||
|
|
||||||
|
## [0.10.1] - 19.07.2025
|
||||||
|
### Changes
|
||||||
- Added harvest baskets to pick fruit from fruit trees and berry bushes (#1338) @Redeix
|
- Added harvest baskets to pick fruit from fruit trees and berry bushes (#1338) @Redeix
|
||||||
- Added ice soup @Pyritie
|
- Added ice soup @Pyritie
|
||||||
- Gave plants tag to bushes so they can be used for other things (#1338) @Redeix
|
- Gave plants tag to bushes so they can be used for other things (#1338) @Redeix
|
||||||
|
|
@ -43,6 +45,8 @@
|
||||||
- Fixed flintlock not being craftable before LV (#1353) @Redeix
|
- Fixed flintlock not being craftable before LV (#1353) @Redeix
|
||||||
- Fixed the field guide not working for chinese players (#1356) @Pyritie
|
- Fixed the field guide not working for chinese players (#1356) @Pyritie
|
||||||
- Fixed glass blocks dropping with gem saw (#1367) @BlueBoat29
|
- Fixed glass blocks dropping with gem saw (#1367) @BlueBoat29
|
||||||
|
- Fixed Hv Quest TNT #1373 @TomPlop
|
||||||
|
- Fixed Smooth Stone #1380 @TomPlop
|
||||||
|
|
||||||
## [0.10.0] - 13.07.2025
|
## [0.10.0] - 13.07.2025
|
||||||
- [!WARNING] If you're upgrading your world from 0.9 to 0.10, please read the upgrade guide [here](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/wiki/%5BEN%5D-Upgrading-from-0.9-to-0.10). We do not recommend using Alpha versions for progression, but if you do, please make frequent backups!
|
- [!WARNING] If you're upgrading your world from 0.9 to 0.10, please read the upgrade guide [here](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/wiki/%5BEN%5D-Upgrading-from-0.9-to-0.10). We do not recommend using Alpha versions for progression, but if you do, please make frequent backups!
|
||||||
|
|
|
||||||
|
|
@ -620,24 +620,31 @@
|
||||||
"{quests.high_voltage.tnt.desc.1}"
|
"{quests.high_voltage.tnt.desc.1}"
|
||||||
"{@pagebreak}"
|
"{@pagebreak}"
|
||||||
"{quests.high_voltage.tnt.desc.2}"
|
"{quests.high_voltage.tnt.desc.2}"
|
||||||
|
"{@pagebreak}"
|
||||||
|
"{quests.high_voltage.tnt.desc.3}"
|
||||||
]
|
]
|
||||||
icon: "minecraft:tnt"
|
icon: "minecraft:tnt"
|
||||||
id: "2B7B214EDE0B45A2"
|
id: "2B7B214EDE0B45A2"
|
||||||
size: 1.0d
|
size: 1.0d
|
||||||
tasks: [
|
tasks: [
|
||||||
{
|
|
||||||
id: "1CB85F57BA45252D"
|
|
||||||
item: "gtceu:gelled_toluene"
|
|
||||||
type: "item"
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
id: "04BF6A36E965C348"
|
id: "04BF6A36E965C348"
|
||||||
item: "minecraft:tnt"
|
item: "minecraft:tnt"
|
||||||
type: "item"
|
type: "item"
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
id: "6DC25EED8E91BEC2"
|
id: "162CDC2567F6D6A8"
|
||||||
item: "gtceu:toluene_bucket"
|
item: "gtceu:industrial_tnt"
|
||||||
|
type: "item"
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id: "4CFB597542DD0194"
|
||||||
|
item: "gtceu:dynamite"
|
||||||
|
type: "item"
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id: "0BF4703D1DBAA5B7"
|
||||||
|
item: "gtceu:powderbarrel"
|
||||||
type: "item"
|
type: "item"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -283,6 +283,18 @@ function registerTFCStoneRecipes(event) {
|
||||||
|
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
//#region Укрепленный камень
|
||||||
|
|
||||||
|
event.recipes.gtceu.assembler(`smooth_${stone}`)
|
||||||
|
.itemInputs(`8x tfc:rock/raw/${stone}`)
|
||||||
|
.circuit(2)
|
||||||
|
.inputFluids(Fluid.of('gtceu:concrete', 72))
|
||||||
|
.itemOutputs(`8x tfc:rock/smooth/${stone}`)
|
||||||
|
.duration(250)
|
||||||
|
.EUt(8)
|
||||||
|
|
||||||
|
//#endregion
|
||||||
|
|
||||||
//#region Акведук
|
//#region Акведук
|
||||||
|
|
||||||
event.recipes.gtceu.assembler(`aqueduct_${stone}`)
|
event.recipes.gtceu.assembler(`aqueduct_${stone}`)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue