Commit graph

798 commits

Author SHA1 Message Date
Pyritie
79f4af85bc remove tungsten-bismuth large gear 2025-12-19 12:58:42 +00:00
Pyritie
f04923e491 fix accidentally deleting coke blocks 2025-12-19 00:45:45 +00:00
Pyritie
88af05c97e mining machines now replace rocks with the correct cobble 2025-12-15 22:54:23 +00:00
Pyritie
aeca63edfb Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-15 18:46:47 +00:00
Pyritie
75c94eb364 remove fancier coke gems 2025-12-15 18:37:34 +00:00
TomPlop
8ab09abe56
Add btx (#2416)
* adding textures and recipes

* Balance BTX and Reformate Gas

* Oups

* fix material amount
2025-12-15 12:12:49 -06:00
Pyritie
a807d2694f hide tfc gypsum, add some tag models for dirt and sand 2025-12-15 17:49:53 +00:00
Pyritie
7dc6ab64e4 halite so good I made halite2 2025-12-15 16:52:06 +00:00
Pyritie
c7d73a805d hid the other greate things, hid the rest of the swine-steel tool heads 2025-12-15 01:29:07 +00:00
GameStar
e06ca51081
New Active Transformer (#2424)
* textures and stuff

* recipes

* looks a little better

* got texture thing to be

* probably good enough

* cooling tower touchup
2025-12-14 22:03:41 +00:00
Pyritie
3896d00977 migrate all vintageimprovements recipes to the new kjs format 2025-12-14 17:32:25 +00:00
Pyritie
eb55f20a43 remove modrinth baguettelib, update greate, add vintage improvements kubejs mod, fix all the greate rose quartz namespace changes 2025-12-14 15:35:22 +00:00
GameStar
630d39bc78
add first smr boosters (#2381)
* dfgdfgdfgdfg

* molecules

* ran lang merger

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-12-14 01:57:31 +00:00
Pyritie
e3be7d6d1d medicine rework 2025-12-13 23:30:51 +00:00
Pyritie
4ef05a397d comment out greate belt stuff for now 2025-12-13 23:14:20 +00:00
Pyritie
3b05453c88 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-13 22:32:43 +00:00
Pyritie
546c598bc4 add item models for pills 2025-12-13 22:12:14 +00:00
thederpysockdude123
5f6089dd60
added tfc:foods tag to a whole bunch of tfg foods (#2405)
* Update items.food.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update items.food.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-12-13 12:21:49 -06:00
Pyritie
e5a4a356b3 remove c&a accumulator 2025-12-13 14:47:35 +00:00
Redeix
35a14ab62c
particles (#2401) 2025-12-13 11:59:20 +00:00
Pyritie
a65289562d new belts! 2025-12-13 03:00:58 +00:00
Redeix
29f4d54af3
Tags (#2385)
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-12-11 17:37:22 -06:00
Pyritie
1ed6ffb51f added machine recipes for tongs 2025-12-11 00:45:22 +00:00
Pyritie
0ec6f5da04 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-10 23:30:00 +00:00
Pyritie
a6f8024aee some different icons for things 2025-12-10 23:28:51 +00:00
Redeix
bb9c0b608c
A bunch of random stuff (#2365) 2025-12-10 01:53:28 -06:00
Pyritie
f653703615 tags for hotornot 2025-12-09 18:51:02 +00:00
Pyritie
30cfcbff81 well no wonder this wasn't working 2025-12-09 18:47:08 +00:00
Pyritie
28a657494f some leftover items 2025-12-09 18:46:55 +00:00
Pyritie
7896b5f7fd doubled the durability of space suits 2025-12-09 15:40:22 +00:00
Pyritie
c04b3eacb0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-12-09 12:23:54 +00:00
Pyritie
445809cc87 0.11.10 2025-12-09 12:23:52 +00:00
Redeix
0d75405aee
why doesnt rhino just have classes? (#2355) 2025-12-09 00:11:17 -06:00
GameStar
5494a07dbf
Ochem stuff for Fission (#2338)
* molecules

* Update recipes.biochem.js

* will use these later

* update this

* ugh

* lang merger

* Update fructose.json

* iconsets I guess

* Update recipes.nuclear.js

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

* Update recipes.nuclear.js

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-12-08 23:43:30 +00:00
Pyritie
deb466e801 added temporary workaround for the missing pipe recipes 2025-12-08 22:17:50 +00:00
Pyritie
4e9e94eb45 fix some warnings 2025-12-08 21:18:31 +00:00
Pyritie
811cf2766f move venus fluids into core 2025-12-08 19:53:36 +00:00
Pyritie
dd1463acdf update to forge 47.4.13, fix aged sake, fix cleanroom doors, fix butyraldehyde 2025-12-08 19:36:35 +00:00
Pyritie
a8d1bb1505 new venus stuff 2025-12-08 12:35:11 +00:00
TomPlop
6c4775d58e
Balance early power (#2319)
* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* fix tallow

* balance update

* Add textures

* last balance tweaks

* Oupsi

* more fixes

* add changed quests

* push latest balance

* fix tallow

* add btx

* Update quests

* Oups

* Adding some nuclear stuffs so I can merge my branches

* fix tallow

* fix

* add tfg:
2025-12-07 17:05:21 +00:00
Pyritie
e2d01b6536 add new icon set, thank you cosmic frontiers 2025-12-06 00:29:06 +00:00
Pyritie
cc47fe55ce big tag/data refactor 2025-12-03 00:32:14 +00:00
Pyritie
5b612d88fd whoops 2025-12-02 19:49:22 +00:00
Pyritie
a3096dd5c9 move around some files 2025-12-02 19:20:01 +00:00
Pyritie
1545f19ce6 big refactor of a lot of the recipe files! 2025-12-02 19:12:36 +00:00
Pyritie
0916fd2e21 big tidying of startup scripts! 2025-12-01 23:39:42 +00:00
Pyritie
adfea6d7bb added brewery recipes for LV syngas 2025-12-01 14:58:14 +00:00
Pyritie
aa22fda898 swapping OLA from gtceu to tfg namespace, some cleanup, langs 2025-12-01 14:38:48 +00:00
TomPlop
72ae40a2b4
Rework Early Game Fuel (#2309)
* Add materials and multiblock

* try to fix conflict

* Fix conflict

* Fix conflict

* Rework tungsten line (#5)

* fix materials

* Update Ostrum to core

* Fix conflict

* fix conflict

* Fix fucking conflict

* Upload more changes

* Add more things

* Introduce new gas fuel

* Add Anthracite

* Add Syngas early game and more modifications

* More fixes

* Add textures to fluid
2025-12-01 13:42:45 +00:00
Pyritie
53c5a20489
TFC Gurman integration (#2298)
* started working on tfc-gurman integration

* updated recipes, should be mostly good now?

* pizza adjustments

* meal bag tags

* ugh these crafting table foods are gonna take 5ever

* milk curdling and automation for new cheeses

* moved these

* Update tags.js

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

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
2025-12-01 00:35:55 +00:00