Merge pull request #1428 from TerraFirmaGreg-Team/dev

Release: 0.10.3
This commit is contained in:
Xikaro
2025-07-24 01:48:00 +05:00
committed by GitHub
428 changed files with 4379 additions and 3471 deletions

34
.gitattributes vendored
View File

@@ -1,9 +1,39 @@
* text=auto eol=lf
# Set the default behavior:
# On checkout, the line endings will be normalized to the correct one for the OS
# On commit, the line endings will be reset to lf
* text=auto
*.zip binary
# Text Files
*.txt text
*.md text
LICENSE text
*.cfg text
*.lang text
*.bat text
*.sh text
*.json text
*.yml text
*.yaml text
*.toml text
*.js text
*.ts text
*.zs text
*.groovy text
*.xml text
*.xsd text
*.svg text
# Binary Files
*.png binary
*.jpg binary
*.jpeg binary
*.pdf binary
dumps/**/*.* linguist-generated=true
*.log linguist-generated=true

View File

@@ -257,6 +257,11 @@ There are two approaches to creating a Pull Request: via terminal and via GitHub
- #### Localization:
- If you're looking for Localizing the modpack to a Language, please feel free to head to the [Tools-Modern]
- #### Linting & Typescript support
- Install NodeJS and use an editor with Typescript and ESLint support (e.g. Visual Studio Code).
- Run `npm init`, and create a project with default options. (required for language support to work properly)
- Run `npm install --save-dev eslint@latest @eslint/js@latest @stylistic/eslint-plugin`
- To enable type annotations & diagnostics, run [ProbeJS] and set `noCheck: false` in tsconfig.json.
---
@@ -499,4 +504,4 @@ There are two approaches to creating a Pull Request: via terminal and via GitHub
[GitHub Desktop]: https://desktop.github.com/download
[Pakku]: https://juraj-hrivnak.github.io/Pakku/home.html
[ProbeJs]: https://marketplace.visualstudio.com/items/?itemName=Prunoideae.probejs
[Discord]: https://discord.gg/AEaCzCTUwQ
[Discord]: https://discord.gg/AEaCzCTUwQ

View File

@@ -188,7 +188,7 @@ jobs:
- name: 🔍 Create Pull Request if tag not found
id: create_pr
if: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'true'}}
if: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'true' && github.repository == 'TerraFirmaGreg-Team/Modpack-Modern' }}
uses: devops-infra/action-pull-request@v0.6.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}

6
.gitignore vendored
View File

@@ -11,6 +11,12 @@
.vs/
.vscode/
.idea/
package.json
package.g.props
package-lock.json
node_modules/
Modpack-Modern.sln
Modpack-Modern.esproj
# Pakku
build/

View File

@@ -1,6 +1,28 @@
# Changelog
## [Unreleased]
## [0.10.3] - 23-07-2025
### Changes
- Reduced duration of biodiesel recipes @Pyritie
- Changed some options of a performance mod, let us know if you find any weird issues! (#1410) @victordlp8
- Added mortar and pestel recipes for grain to flour @Pyritie
- Added in-world shift + right-click interactions for bricks. Greens can be used to turn bricks into mossy bricks, and a knife reverts it. Hammers make cracked bricks and mortar repairs them. (#1416) @Redeix
- Steam can now be pumped into Blaze Burners via the Straw (#1379) @Nyonyix
- Replaced moon skeletons with Strays @Pyritie
- Replaced Beneath cave endermen with a different, passive one (same loot table though) @Pyritie
- Added sandpaper recipes for early game gems @Pyritie
- Unified observer recipes @Pyritie
### Bug fixes
- Fixed butchery knife crafting recipe (#1405) @Pyritie
- Fixed new extruder molds missing a tag to work with the curving press (#1412) @Forsuin
- Fixed contraptions no longer understanding TFC chests @Pyritie
- Fixed ice never melting in the overworld (#1408) @Pyritie
- Removed most empty tag recipes (#1420) @BlueBoat29
- Fixed Styrene Butadiene Belt recipe (#1421) @BlueBoat29
- Fixed deer dropping camelidae meat with a butchery knife @Pyritie
- Fixed gas pressurizer machine not having a GUI (#1425) @Pyritie
- Fixed recipe conflict with hoppers and ULV machine casings (#1423) @Pyritie
## [0.10.2] - 20-07-2025
### Changes
- Aged Corn Whiskey and Aged Rye Whiskey now have status effects (#1390) @EveProgrammingsockson

View File

@@ -2503,6 +2503,61 @@
x: -6.0d
y: 10.0d
}
{
description: ["{quests.tfg_tips.harpoon.desc}"]
id: "78374FC41EFCFD9B"
subtitle: "{quests.tfg_tips.harpoon.subtitle}"
tasks: [{
id: "0DDF6CE85945464A"
item: {
Count: 1
id: "species:harpoon"
tag: {
Damage: 0
}
}
type: "item"
}]
title: "{quests.tfg_tips.harpoon.title}"
x: -8.0d
y: 4.0d
}
{
dependencies: ["78374FC41EFCFD9B"]
description: ["{quests.tfg_tips.coil.desc}"]
id: "3876C12655AE6E3C"
subtitle: "{quests.tfg_tips.coil.subtitle}"
tasks: [{
id: "0B27949208A80BD9"
item: "species:coil"
type: "item"
}]
title: "{quests.tfg_tips.coil.title}"
x: -9.5d
y: 4.0d
}
{
dependencies: ["72B3EA6588E18CCC"]
description: ["{quests.tfg_tips.self_defense.desc}"]
icon: "species:cranktrap"
id: "104EFD3257F7BA61"
subtitle: "{quests.tfg_tips.self_defense.subtitle}"
tasks: [
{
id: "227B319F72D2E23C"
item: "species:cranktrap"
type: "item"
}
{
id: "7551326CEF2F9575"
item: "createaddition:barbed_wire"
type: "item"
}
]
title: "{quests.tfg_tips.self_defense.title}"
x: -2.5d
y: 0.5d
}
]
subtitle: ["{quests.tfg_tips.tools_tips.subtitle}"]
title: "Tips - Tools"

View File

@@ -395,7 +395,12 @@
}
]
order_index: 2
quest_links: [ ]
quest_links: [{
id: "704C995D4B6CE874"
linked_quest: "46C92B938921A0AC"
x: 4.5d
y: 0.5d
}]
quests: [
{
dependencies: ["2746958D3D4A0885"]

View File

@@ -107,4 +107,14 @@
# mixin.safety=true # (default)
#
# User overrides go here.
mixin.bugfix.packet_leak=true
mixin.feature.disable_unihex_font=true
mixin.feature.spark_profile_launch=true
mixin.perf.clear_mixin_classinfo=true
mixin.perf.deduplicate_location=true
mixin.perf.dynamic_entity_renderers=true
mixin.perf.dynamic_resources=true
mixin.perf.faster_item_rendering=true
mixin.perf.remove_spawn_chunks=true
mixin.perf.smart_ingredient_sync=false
mixin.perf.worldgen_allocation=true

View File

@@ -0,0 +1,31 @@
["Desert Behemoths: Sandworms! Config"]
#Value at which sandworm will spawn. Higher values mean the worm will take longer to spawn. Default 4000.
#Range: 1000 ~ 100000
"Max Wormsign" = 4000
#Seconds after leaving a worm's range until another one can spawn. Default 120.
#Range: 10 ~ 216000
"Respawn Duration" = 120
#Time til despawn in seconds when not targeting a survival player. Default 3 minutes.
#Range: 30 ~ 216000
"Despawn Duration" = 180
#Number of explosions the worm's head can handle before dropping a tooth and running away. Default 3
#Range: 1 ~ 100
Health = 3
#Value the damage dealt by the worm is scaled by. Default 1.0.
#Range: 0.01 ~ 100.0
"Damage Multiplier" = 1.0
#Multiplier for damage dealt by the head of the worm compared to a body segment. Default 2.0 (head deals double damage).
#Range: 0.01 ~ 100.0
"Head Multiplier" = 2.0
#By default, the sandworm can spawn in any biome golden rabbits spawn in. This option enables or disables that.
#To add additional biomes the sandworm can spawn in, create a datapack that edits the sandworm_mod:can_spawn_sandworms biome tag.
#Specifically, create can_spawn_sandworms.json in data->sandworm_mod->tags->worldgen->biome.
#Bellow is an example json file that allows sandworms to spawn in jungles:
#{
# "values": [
# "minecraft:jungle"
# ]
#}
"Default Spawning" = false

View File

@@ -245,7 +245,7 @@
[kinetics.stressValues.v2]
large_water_wheel = 16.0
windmill_bearing = 32.0
hand_crank = 0.25
hand_crank = 2.0
creative_motor = 2097152.0
water_wheel = 4.0
copper_valve_handle = 2.0

31
eslint.config.js Normal file
View File

@@ -0,0 +1,31 @@
import js from "@eslint/js";
import globals from "globals";
import { defineConfig } from "eslint/config";
import stylistic from '@stylistic/eslint-plugin'
export default defineConfig([
{
files: ["**/*.{js,mjs,cjs,ts,mts,cts}"],
plugins: {
"js": js,
"@stylistic": stylistic
},
extends: ["js/recommended"],
languageOptions: { globals: globals.node, ecmaVersion: 2015 },
rules: {
"no-undef": "off",
"no-unused-vars": "off",
"no-unexpected-multiline": "off",
"@stylistic/comma-style": [1, "last"],
"@stylistic/brace-style": [1, "1tbs"],
"@stylistic/function-call-spacing": [1, "never"],
"@stylistic/no-floating-decimal": "error",
"@stylistic/arrow-spacing": [1, { "before": true, "after": true }],
"@stylistic/block-spacing": [1, "always"],
"@stylistic/keyword-spacing": [1, { "before": true, "after": true }],
"@stylistic/dot-location": [1, "property"]
}
},
]);

View File

@@ -107,11 +107,13 @@
"block.ad_astra.polished_glacio_stone_stairs": "Polished Phonolite Stairs",
"entity.ad_astra.corrupted_lunarian": "Lunar Zombie",
"entity.ad_astra.tier_1_rocket": "R-Aluminosteel Rocket",
"entity.ad_astra.tier_2_rocket": "ASM 4914 Titanium Rocket",
"entity.ad_astra.tier_1_rover": "Rover",
"fluid_type.ad_astra.oxygen": "Breathable Air",
"item.ad_astra.steel_cable": "Basic RF Cable",
"item.ad_astra.desh_cable": "Advanced RF Cable",
"item.ad_astra.tier_1_rocket": "R-Aluminosteel Rocket",
"item.ad_astra.tier_2_rocket": "ASM 4914 Titanium Rocket",
"item.ad_astra.oxygen_bucket": "Breathable Air Bucket",
"item.ad_astra.tier_1_rover": "Rover",
"item.ad_astra.photovoltaic_etrium_cell": "Basic Photovoltaic Cell",

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@@ -1,4 +1,4 @@
{
"__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
"blocks.createhorsepower.horse_crank": "Animal Crank"
"block.createhorsepower.horse_crank": "Animal Crank"
}

View File

@@ -1 +1 @@
{"ad_astra:oxygen_loading":{"order":151}}
{"ad_astra:oxygen_loading":{"order":154}}

View File

@@ -1 +1 @@
{"ae2:attunement":{"order":148}}
{"ae2:attunement":{"order":151}}

View File

@@ -1 +1 @@
{"ae2:condenser":{"order":138}}
{"ae2:condenser":{"order":141}}

View File

@@ -1 +1 @@
{"ae2:item_transformation":{"order":127}}
{"ae2:item_transformation":{"order":130}}

View File

@@ -1 +1 @@
{"create:deploying":{"order":47}}
{"create:deploying":{"order":48}}

View File

@@ -1 +1 @@
{"create:draining":{"order":149}}
{"create:draining":{"order":152}}

View File

@@ -1 +1 @@
{"create:item_application":{"order":48}}
{"create:item_application":{"order":49}}

View File

@@ -0,0 +1 @@
{"create:sandpaper_polishing":{"order":47}}

View File

@@ -1 +1 @@
{"create:sequenced_assembly":{"order":49}}
{"create:sequenced_assembly":{"order":50}}

View File

@@ -1 +1 @@
{"create:spout_filling":{"order":150}}
{"create:spout_filling":{"order":153}}

View File

@@ -1 +1 @@
{"createaddition:liquid_burning":{"order":53}}
{"createaddition:liquid_burning":{"order":54}}

View File

@@ -1 +1 @@
{"createaddition:rolling":{"order":65}}
{"createaddition:rolling":{"order":67}}

View File

@@ -1 +1 @@
{"domum_ornamentum:architects_cutter":{"order":147}}
{"domum_ornamentum:architects_cutter":{"order":150}}

View File

@@ -1 +1 @@
{"emi:info":{"order":156}}
{"emi:info":{"order":159}}

View File

@@ -1 +1 @@
{"emi:tag":{"order":157}}
{"emi:tag":{"order":160}}

View File

@@ -1 +1 @@
{"exposure:photograph_printing":{"order":143}}
{"exposure:photograph_printing":{"order":146}}

View File

@@ -1 +1 @@
{"exposure:photograph_stacking":{"order":152}}
{"exposure:photograph_stacking":{"order":155}}

View File

@@ -1 +1 @@
{"framedblocks:framing_saw":{"order":146}}
{"framedblocks:framing_saw":{"order":149}}

View File

@@ -1 +1 @@
{"greate:automatic_packing":{"order":141}}
{"greate:automatic_packing":{"order":144}}

View File

@@ -1 +1 @@
{"greate:automatic_shaped":{"order":139}}
{"greate:automatic_shaped":{"order":142}}

View File

@@ -1 +1 @@
{"greate:automatic_shapeless":{"order":140}}
{"greate:automatic_shapeless":{"order":143}}

View File

@@ -1 +1 @@
{"greate:block_cutting":{"order":145}}
{"greate:block_cutting":{"order":148}}

View File

@@ -1 +1 @@
{"greate:crushing":{"order":99}}
{"greate:crushing":{"order":102}}

View File

@@ -1 +1 @@
{"greate:fan_washing":{"order":129}}
{"greate:fan_washing":{"order":132}}

View File

@@ -1 +1 @@
{"greate:milling":{"order":98}}
{"greate:milling":{"order":101}}

View File

@@ -1 +1 @@
{"greate:mixing":{"order":101}}
{"greate:mixing":{"order":104}}

View File

@@ -1 +1 @@
{"greate:pressing":{"order":90}}
{"greate:pressing":{"order":92}}

View File

@@ -1 +1 @@
{"greate:sawing":{"order":77}}
{"greate:sawing":{"order":79}}

View File

@@ -1 +1 @@
{"gtceu:air_scrubber":{"order":59}}
{"gtceu:air_scrubber":{"order":61}}

View File

@@ -1 +1 @@
{"gtceu:alloy_blast_smelter":{"order":112}}
{"gtceu:alloy_blast_smelter":{"order":115}}

View File

@@ -1 +1 @@
{"gtceu:alloy_smelter":{"order":60}}
{"gtceu:alloy_smelter":{"order":62}}

View File

@@ -1 +1 @@
{"gtceu:aqueous_accumulator":{"order":61}}
{"gtceu:aqueous_accumulator":{"order":63}}

View File

@@ -1 +1 @@
{"gtceu:arc_furnace":{"order":62}}
{"gtceu:arc_furnace":{"order":64}}

View File

@@ -1 +1 @@
{"gtceu:arc_furnace_recycling":{"order":135}}
{"gtceu:arc_furnace_recycling":{"order":138}}

View File

@@ -1 +1 @@
{"gtceu:assembler":{"order":63}}
{"gtceu:assembler":{"order":65}}

View File

@@ -1 +1 @@
{"gtceu:assembly_line":{"order":113}}
{"gtceu:assembly_line":{"order":116}}

View File

@@ -1 +1 @@
{"gtceu:autoclave":{"order":64}}
{"gtceu:autoclave":{"order":66}}

View File

@@ -1 +1 @@
{"gtceu:bender":{"order":67}}
{"gtceu:bender":{"order":69}}

View File

@@ -1 +1 @@
{"gtceu:brewery":{"order":68}}
{"gtceu:brewery":{"order":70}}

View File

@@ -1 +1 @@
{"gtceu:canner":{"order":69}}
{"gtceu:canner":{"order":71}}

View File

@@ -1 +1 @@
{"gtceu:centrifuge":{"order":71}}
{"gtceu:centrifuge":{"order":73}}

View File

@@ -1 +1 @@
{"gtceu:chem_dyes":{"order":133}}
{"gtceu:chem_dyes":{"order":136}}

View File

@@ -1 +1 @@
{"gtceu:chemical_bath":{"order":72}}
{"gtceu:chemical_bath":{"order":74}}

View File

@@ -1 +1 @@
{"gtceu:chemical_reactor":{"order":73}}
{"gtceu:chemical_reactor":{"order":75}}

View File

@@ -1 +1 @@
{"gtceu:circuit_assembler":{"order":75}}
{"gtceu:circuit_assembler":{"order":77}}

View File

@@ -1 +1 @@
{"gtceu:coke_oven":{"order":52}}
{"gtceu:coke_oven":{"order":53}}

View File

@@ -1 +1 @@
{"gtceu:combustion_generator":{"order":54}}
{"gtceu:combustion_generator":{"order":55}}

View File

@@ -1 +1 @@
{"gtceu:compressor":{"order":76}}
{"gtceu:compressor":{"order":78}}

View File

@@ -1 +1 @@
{"gtceu:cracker":{"order":114}}
{"gtceu:cracker":{"order":117}}

View File

@@ -1 +1 @@
{"gtceu:cutter":{"order":78}}
{"gtceu:cutter":{"order":80}}

View File

@@ -1 +1 @@
{"gtceu:distillation_tower":{"order":80}}
{"gtceu:distillation_tower":{"order":82}}

View File

@@ -1 +1 @@
{"gtceu:distillery":{"order":79}}
{"gtceu:distillery":{"order":81}}

View File

@@ -1 +1 @@
{"gtceu:electric_blast_furnace":{"order":115}}
{"gtceu:electric_blast_furnace":{"order":118}}

View File

@@ -1 +1 @@
{"gtceu:electrolyzer":{"order":81}}
{"gtceu:electrolyzer":{"order":83}}

View File

@@ -1 +1 @@
{"gtceu:electromagnetic_separator":{"order":82}}
{"gtceu:electromagnetic_separator":{"order":84}}

View File

@@ -1 +1 @@
{"gtceu:end_dome":{"order":116}}
{"gtceu:end_dome":{"order":119}}

View File

@@ -1 +1 @@
{"gtceu:evaporation":{"order":117}}
{"gtceu:evaporation":{"order":120}}

View File

@@ -1 +1 @@
{"gtceu:extractor":{"order":84}}
{"gtceu:extractor":{"order":86}}

View File

@@ -1 +1 @@
{"gtceu:extractor_recycling":{"order":137}}
{"gtceu:extractor_recycling":{"order":140}}

View File

@@ -1 +1 @@
{"gtceu:extruder":{"order":86}}
{"gtceu:extruder":{"order":88}}

View File

@@ -1 +1 @@
{"gtceu:fermenter":{"order":87}}
{"gtceu:fermenter":{"order":89}}

View File

@@ -1 +1 @@
{"gtceu:fluid_heater":{"order":88}}
{"gtceu:fluid_heater":{"order":90}}

View File

@@ -1 +1 @@
{"gtceu:fluid_solidifier":{"order":89}}
{"gtceu:fluid_solidifier":{"order":91}}

View File

@@ -1 +1 @@
{"gtceu:forge_hammer":{"order":91}}
{"gtceu:forge_hammer":{"order":93}}

View File

@@ -1 +1 @@
{"gtceu:forming_press":{"order":92}}
{"gtceu:forming_press":{"order":94}}

View File

@@ -1 +1 @@
{"gtceu:fusion_reactor":{"order":118}}
{"gtceu:fusion_reactor":{"order":121}}

View File

@@ -1 +1 @@
{"gtceu:gas_collector":{"order":93}}
{"gtceu:gas_collector":{"order":95}}

View File

@@ -0,0 +1 @@
{"gtceu:gas_pressurizer":{"order":96}}

View File

@@ -1 +1 @@
{"gtceu:gas_turbine":{"order":55}}
{"gtceu:gas_turbine":{"order":56}}

View File

@@ -1 +1 @@
{"gtceu:greenhouse":{"order":119}}
{"gtceu:greenhouse":{"order":122}}

View File

@@ -1 +1 @@
{"gtceu:implosion_compressor":{"order":120}}
{"gtceu:implosion_compressor":{"order":123}}

View File

@@ -1 +1 @@
{"gtceu:ingot_molding":{"order":134}}
{"gtceu:ingot_molding":{"order":137}}

View File

@@ -1 +1 @@
{"gtceu:large_boiler":{"order":50}}
{"gtceu:large_boiler":{"order":51}}

View File

@@ -1 +1 @@
{"gtceu:large_chemical_reactor":{"order":74}}
{"gtceu:large_chemical_reactor":{"order":76}}

View File

@@ -0,0 +1 @@
{"gtceu:large_solar_panel":{"order":57}}

View File

@@ -1 +1 @@
{"gtceu:laser_engraver":{"order":95}}
{"gtceu:laser_engraver":{"order":98}}

View File

@@ -1 +1 @@
{"gtceu:lathe":{"order":97}}
{"gtceu:lathe":{"order":100}}

View File

@@ -1 +1 @@
{"gtceu:macerator":{"order":100}}
{"gtceu:macerator":{"order":103}}

View File

@@ -1 +1 @@
{"gtceu:macerator_recycling":{"order":136}}
{"gtceu:macerator_recycling":{"order":139}}

View File

@@ -1 +1 @@
{"gtceu:mixer":{"order":102}}
{"gtceu:mixer":{"order":105}}

View File

@@ -1 +1 @@
{"gtceu:nether_dome":{"order":121}}
{"gtceu:nether_dome":{"order":124}}

View File

@@ -1 +1 @@
{"gtceu:ore_bathing":{"order":132}}
{"gtceu:ore_bathing":{"order":135}}

View File

@@ -1 +1 @@
{"gtceu:ore_crushing":{"order":130}}
{"gtceu:ore_crushing":{"order":133}}

View File

@@ -1 +1 @@
{"gtceu:ore_forging":{"order":131}}
{"gtceu:ore_forging":{"order":134}}

View File

@@ -1 +1 @@
{"gtceu:ore_washer":{"order":128}}
{"gtceu:ore_washer":{"order":131}}

View File

@@ -1 +1 @@
{"gtceu:packer":{"order":103}}
{"gtceu:packer":{"order":106}}

Some files were not shown because too many files have changed in this diff Show More