Commit graph

4757 commits

Author SHA1 Message Date
Xikaro
8af43a10ae Update build.yml 2025-09-09 18:49:32 +05:00
Pyritie
3763a59641
Merge branch 'main' into dev 2025-09-09 14:41:22 +01:00
Pyritie
04510a26c8 gomenyasorry 2025-09-09 14:38:54 +01:00
Pyritie
a64a678838 langs, fixed a few nether brick items being hidden 2025-09-09 14:36:33 +01:00
Pyritie
69e152f7d3 pakku 2025-09-09 14:28:39 +01:00
Pyritie
65d2915038 excluded lunchbox and mob net field guide pages 2025-09-09 13:34:40 +01:00
Pyritie
48309eb375 pakku 2025-09-09 12:59:52 +01:00
Pyritie
ae699faf1e remove priority 2025-09-09 11:59:41 +01:00
Pyritie
9107a122c4 fix missing empty syringe model 2025-09-09 11:56:23 +01:00
Pyritie
4d323b4ed3 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-09 11:51:15 +01:00
Pyritie
aa12ac3f43 fix stone stuff 2025-09-09 11:51:09 +01:00
dependabot[bot]
3d4f412070
Bump the dependencies group with 2 updates (#1763)
Bumps the dependencies group with 2 updates: [actions/github-script](https://github.com/actions/github-script) and [softprops/action-gh-release](https://github.com/softprops/action-gh-release).


Updates `actions/github-script` from 7.0.1 to 8.0.0
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v7.0.1...v8.0.0)

Updates `softprops/action-gh-release` from 2.3.2 to 2.3.3
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v2.3.2...v2.3.3)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: 8.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: softprops/action-gh-release
  dependency-version: 2.3.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
2025-09-09 15:40:31 +05:00
Pyritie
93b7518278 merge langs 2025-09-09 11:25:01 +01:00
Xikaro
ce12b1ca93 Update build.yml 2025-09-09 13:26:26 +05:00
TomPlop
f2aae5356a
Fix recipe Ostrum Fab (#1771)
Forgot to change the name

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-09-09 01:27:14 -05:00
Redeix
423351a82b
Update CHANGELOG.md
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-09-09 01:26:26 -05:00
Redeix
3661f3c903
Update recipes.js (#1772)
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-09-09 01:22:30 -05:00
Redeix
2a3a179d48
naughty naughty (#1768) 2025-09-09 00:34:57 -05:00
Redeix
568db16430
Dna syringes and stainless steel needle (#1759)
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-09-09 00:17:04 -05:00
Pyritie
93ef66881e increased flint patch rarity 2025-09-09 01:04:15 +01:00
Pyritie
1bba78571f Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-09 00:52:10 +01:00
Pyritie
a6bb8cb730 tweaked these loot tables 2025-09-09 00:52:06 +01:00
Adrien Vidal
96188e761d
TFG-fication of all exotic stone types (#1764)
* Deepslate, Blackstone and Dripstone + hammer crushing refactor

* crackrack and space stones

* tags + stonecutting + fixes

* Moon deepslate set + QoL recipes + tags fixes

* pyroxenite tags

* Update tags.js

* Update constants.js

* Update constants.js

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-09-09 00:16:27 +01:00
Xikaro
51aeb7cfea Update build.yml 2025-09-09 03:37:43 +05:00
Xikaro
7a61ebc259
Release: 0.10.11 (#1761)
* added higher tier AA recipe for even more water

* fix: forge-auto-install

* Update build.yml

* Update build.yml

* Update build.yml

* Update build.yml

* workflows

* workflows

* Update build.yml

* Update build.yml

* Update build.yml

* Update build.yml

* Update build.yml

* Update build.yml

* Update build.yml

* added back dynamic lights

* fixed wrong chorus flower in moon quest

* Update mmc-pack.json

* fix: CONTRIBUTING.md

* remove xenon, add embeddium + the sodium addons back, also add the create liquid fuel mod and remove straws

* Adding liquid burner recipes for Create: Liquid Fuel (#1694)

* Create blaze_burner_fuel

Signed-off-by: Ghoulcel <150391748+Ghoulcel@users.noreply.github.com>

* Delete kubejs/data/create_liquid_fuel/blaze_burner_fuel

Signed-off-by: Ghoulcel <150391748+Ghoulcel@users.noreply.github.com>

* Create steam.json

Signed-off-by: Ghoulcel <150391748+Ghoulcel@users.noreply.github.com>

* Add burner fuel recipies

Signed-off-by: Ghoulcel <150391748+Ghoulcel@users.noreply.github.com>

---------

Signed-off-by: Ghoulcel <150391748+Ghoulcel@users.noreply.github.com>

* and of course I forget the actual pakku file

* liquid fuel blaze burner quest + langs + CL

* soarer feather -> fletching

* more mars entity stuff (#1697)

* stuff

* Create wraptor.json

* Update tags.js

* fix wool

* eggs

* Update constants.js

* more recipe stuff

* doing tooltips the correct way

* oops

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* whoops

* make the deposit size a little bigger

* new clay/kaolin clay blocks

* added clay discs, updated their tags

* tag fixes, collapse recipes

* Update CONTRIBUTING.md (#1702)

Signed-off-by: Pyritie <pyritie@gmail.com>

* I messed up the tooltips oops (#1703)

* stuff

* Create wraptor.json

* Update tags.js

* fix wool

* eggs

* Update constants.js

* more recipe stuff

* doing tooltips the correct way

* oops

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* oops

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* spice stuff!

* fixed tongs getting stuck in ovens

* made deposits invisible on xaeros

* added ochrum blob to mars

* quicksand!

* turns out this doesn't work with landslides very well

* fixed quicksand placement

* added skulls and bones to the desert

* peat discs

* fix sangnum clay block texture

* mars crops now spawn alive

* loot tables for mars clay

* peat disc rarity again

* fix ochrum so it only spawns in stone/dirt/gravel and not sand

* prevent spice and venus geysers from being movable with create contraptions

* autopack-director

* pakku-lock.json

* fix: probejs

* langs

* Hot Bread Fixes (#1709)

* Update recipes.removes.js

Remove bread burning recipe

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>

* Update recipes.js

Reintroduce bread burning at a slightly higher temperature to prevent regular logs from burning it

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>

---------

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>

* Increasing Jar Capacity in create_factory_logistics-server.toml (#1707)

Signed-off-by: Ghoulcel <150391748+Ghoulcel@users.noreply.github.com>

* shrunk spread of bone patches

* oh yeah I remember why I got rid of these carvers in the desert

* still seeing so dang much peat

* Feature/sandworm, sacks, soulbind (#1710)

* stuff

* Create wraptor.json

* Update tags.js

* fix wool

* eggs

* Update constants.js

* more recipe stuff

* doing tooltips the correct way

* oops

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* oops

* eater mixin stuff

* add sandworm+dep to pakku

* new configs I think

* soulbind recipes

* thumper

* Update main_server_script.js

* Update pakku-lock.json

* sack configs

* Update sns-server.toml

* Update sns-server.toml

* sack recipes and stuff

* Create soulbinding-common.toml

* soulbind fix

* Update pakku-lock.json

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.js

* Update recipes.js

* Delete EffekseerNativeForJava.dll

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update .gitignore

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* some progress on mars worldgen stuff

* fix reinforced fiber recipe (#1711)

* Add files via upload (#1714)

Added structures intended for the overworld world generation.

Signed-off-by: Kresten (Nordic) <32569116+Nordic001@users.noreply.github.com>

* added PBI to better space suit fabric

* lang

* stop floating skulls

* pakku

* some container changes  (#1716)

* stuff

* Create wraptor.json

* Update tags.js

* fix wool

* eggs

* Update constants.js

* more recipe stuff

* doing tooltips the correct way

* oops

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* oops

* eater mixin stuff

* add sandworm+dep to pakku

* new configs I think

* soulbind recipes

* thumper

* Update main_server_script.js

* Update pakku-lock.json

* sack configs

* Update sns-server.toml

* Update sns-server.toml

* sack recipes and stuff

* Create soulbinding-common.toml

* soulbind fix

* Update pakku-lock.json

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.js

* Update recipes.js

* Delete EffekseerNativeForJava.dll

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update .gitignore

* sack tags

* sewing table change

* Update tags.js

* straw knapping

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* better island edges, better mountains, better biome placement

* changed thumper to ostrum, idk, using spice to defeat the worm sounds fun

* update changelog

* started moving over some ae2 quests

* Buff Sand with Forge Hammer (#1720)

* fix board

* remove from tag

* more update

* last changes

* Add new quests

* fix the weird file

* Fixes

* fix quest optional

* fix duplicate recipe

* more fix

* Fix fur for insulation

* an other fix

* nerf sand recipes

* make popped chorus fruit edible (#1722)

* added charnia and reduced mountain biome range

* charnia tweaks, offset tweaks

* yeah ok

* fixed charnia again

* finished moving over the ae2 quests

* ae2 quest langs

* emi categories

* changed mars volcanic features to obsidian instead of basalt

* snow layer tags for quicksand

* new chinese translation!

* Update CHANGELOG.md (#1728)

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

* Update data.js (#1727)

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

* Update data.js (#1729)

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

* Update CHANGELOG.md (#1730)

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

* added venus sand, messing around with surfer spawning again...

* ok ok

* a bunch more better end textures

* missing log block tags on ad astra logs

* added more variants of a few plans, added some leaf blocks to use as bushes, added some new feather groundcover and started work on some twigs

* langs

* slightly reduced charnia density

* emi

* chinese field guide ores

* Flax (#1735)

* some flax stuff

* linen stuff

* flax line stuff

* flax again

* rapseed wild crop changes

* flax worldgen

* revert grooming station update

* more flax stuff

* trying to fix stuff

one doesn't work

* recipes and lang

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* fixes

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* toolbelt uses buckles/leather strips now

* pakku

* pakku

* fix VI buckle recipe

* lanceleaf, large amaranita mushroom, and some fixes

* some backpack tweaks and updated backpack quests (#1741)

* some flax stuff

* linen stuff

* flax line stuff

* flax again

* rapseed wild crop changes

* flax worldgen

* revert grooming station update

* more flax stuff

* trying to fix stuff

one doesn't work

* recipes and lang

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* fixes

* recipe changes

* quest changes

* Update sophisticatedbackpacks-server.toml

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update sns-server.toml

* horseshoes

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* tags to stop mars saplings from being destroyed

* the never ending treadmill of mars deco

* added gravel below the dirt

* added those cobble slab deltas to mars

* langs

* Ostrum line (#1734)

* Adding the Ostrum Line

* fix comment and add geysers to blacklist

* Remove muffler hatch

* Adding the Ostrum Line

* fix comment and add geysers to blacklist

* Remove muffler hatch

* fix tfg for id recipe

* Fix fucking Git

* change a line

* hid raw ostrum since we aren't using it any more

* refactor the dusty ore code

* ostrum formula

* more forest deco

* enabled t2 spacesuit, space suits count as PPE now

* hide molten ad astra materials

* heightmap ignore tags

* added some underground mobs, martian raptor still needs a reskin

* langs

* bioreactor stuff (#1742)

* bioreactor stuff

* Update recipes.js

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

---------

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

* fixed butchery knife meat bonus, added it to all the non-earth animals too

* textures for mars twigs, fixed models for saplings, some tags

* langs

* Russian translation (incomplete) (part of book) (description!!!!) (#1747)

* Add files via upload

Signed-off-by: DI <mu61282@gmail.com>

* Add files via upload

Signed-off-by: DI <mu61282@gmail.com>

---------

Signed-off-by: DI <mu61282@gmail.com>

* Add decompozition for heavy and semiheavy water (#1745)

* add semiheavy water

* add semiheavy water to centrifuge

* fix color

* not this shit again

* langs! including russian! wow!

* changelog for translations

* ore langs

* ore vein updates

* cl

* fix broken recipe

* changed to scorchia instead of obsidian

* why did rivers have such deep sandstone?

* mountain tweaks

* oh nvm

* small tweaks

* langs

* Fix sheet metal and welding conflict (#1746)

* Fix sheet metal and welding conflict

* Increase amount and changelog

---------

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>

* damn

* fix wrong texture property

* retextured martian raptor

* added floating water plants

* update bioreactor and food processor recipe functions to support more conditions (#1750)

* Update CHANGELOG.md

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

* gtceu -> tfg semiheavy/heavy water

* fix water lang

* more mars plants

* mars vein update

* fix features being organized wrong

* silly rivers

* simplification

* better sand

* these weren't spawning on water

* cave stuff?

* redid forest definitions

* underground deco tags

* Disable Batch Rendering (#1754)

Fix the EMI Tree issue

Signed-off-by: TomPlop <tomdidome@gmail.com>

* temperature changing foods (#1753)

* update sack mod

* Update wan_ancient_beasts-server.toml

* stuff

* lang

* images

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

* noise tweaks

* fix some blocks disappearing

* fix the small water ponds

* temporary lanceleaf change

* fix mars edge biome again

* again

* rainfall should be X axis, not Z

* update pakku, remove clumps because APT has its own xp orb optimizer

* updated the tall deco plants to use the new configured feature

* eating uranium (#1758)

* eat nuggets

* Update pakku-lock.json

* fixed some of the bigger dupes until gt gets their shit together

* idk

* fixes #1685

* https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues/1696

* langs

* changed backup frequency to hourly #1705

* moved stone dust tags

* added missing space suit tags to quarktech, though I don't think it'll let you breathe in space #1751

* redstone integrator -> redstone relay #1737

* fixed the quantum link recipe being impossible

* fix methanol recipe conflict #1731

* added a tag for wraptor/sniffer wool

* whoops

* fix missing item in quartz sand centrifuging #1717

* ok tom

* langs

* remove get it together drops because adaptive perf tweaks does that too

* refactor of soulbinding stuff, added recipes for the t2 suit

* changelog

* soulbound quest

* fix soup tooltip issue

* added recipe for bone meal to white dye #1757

* Fixed missing sheet pile texture for cobalt, cobalt brass, aluminium silicate, invar, lead, red alloy, and tin alloy #1713

* spike cleanup

* fixed smooth stone not collapsing #1732

* tfg-core pakku update

* lang

* let'sa go

* moved gt armor hud to bottom right corner, instead of on top of the FPS text

---------

Signed-off-by: Ghoulcel <150391748+Ghoulcel@users.noreply.github.com>
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>
Signed-off-by: Kresten (Nordic) <32569116+Nordic001@users.noreply.github.com>
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
Signed-off-by: DI <mu61282@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Ghoulcel <150391748+Ghoulcel@users.noreply.github.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: Kresten (Nordic) <32569116+Nordic001@users.noreply.github.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: programmer3481 <72498180+programmer3481@users.noreply.github.com>
Co-authored-by: DI <mu61282@gmail.com>
Co-authored-by: Spicy Noodles <93035068+SpicyNoodle5@users.noreply.github.com>
2025-09-09 03:20:03 +05:00
Pyritie
b1590265d4 moved gt armor hud to bottom right corner, instead of on top of the FPS text 2025-09-08 19:46:37 +01:00
Pyritie
070b2cac8a
Merge branch 'main' into dev 2025-09-08 17:14:06 +01:00
Pyritie
bb394e92d5 let'sa go 2025-09-08 17:11:13 +01:00
Pyritie
5d498898d6 lang 2025-09-08 17:07:57 +01:00
Pyritie
3cc1e977f8 tfg-core pakku update 2025-09-08 17:07:33 +01:00
Pyritie
8424682586 fixed smooth stone not collapsing #1732 2025-09-08 16:55:57 +01:00
Pyritie
521fc19ce5 spike cleanup 2025-09-08 16:54:35 +01:00
Pyritie
f5b549b1da Fixed missing sheet pile texture for cobalt, cobalt brass, aluminium silicate, invar, lead, red alloy, and tin alloy #1713 2025-09-08 16:33:36 +01:00
Pyritie
91cd35e91a added recipe for bone meal to white dye #1757 2025-09-08 16:08:48 +01:00
Pyritie
f1b9d9fb2b fix soup tooltip issue 2025-09-08 15:47:29 +01:00
Pyritie
0d2b556280 soulbound quest 2025-09-08 15:28:37 +01:00
Pyritie
69380e4096 changelog 2025-09-08 15:28:28 +01:00
Pyritie
7759242baf refactor of soulbinding stuff, added recipes for the t2 suit 2025-09-08 15:28:15 +01:00
Pyritie
5b2f62d612 remove get it together drops because adaptive perf tweaks does that too 2025-09-08 15:01:43 +01:00
Pyritie
305283dd65 langs 2025-09-08 14:46:57 +01:00
Pyritie
adcf5cbd6a ok tom 2025-09-08 14:44:26 +01:00
Pyritie
46ded056ed fix missing item in quartz sand centrifuging #1717 2025-09-08 14:42:24 +01:00
Pyritie
f1b9b03896 whoops 2025-09-08 14:42:10 +01:00
Pyritie
abef8191e1 added a tag for wraptor/sniffer wool 2025-09-08 14:35:46 +01:00
Pyritie
f8f7de77e0 fix methanol recipe conflict #1731 2025-09-08 14:31:52 +01:00
Pyritie
5abfc852ad fixed the quantum link recipe being impossible 2025-09-08 14:26:16 +01:00
Pyritie
d8b79ac952 redstone integrator -> redstone relay #1737 2025-09-08 14:21:48 +01:00
Pyritie
9b124a2065 added missing space suit tags to quarktech, though I don't think it'll let you breathe in space #1751 2025-09-08 14:13:18 +01:00
Pyritie
fb5b214321 moved stone dust tags 2025-09-08 14:12:21 +01:00
Pyritie
566ccc630d changed backup frequency to hourly #1705 2025-09-08 00:57:48 +01:00