Commit graph

3394 commits

Author SHA1 Message Date
Pyritie
eef2628484 Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space 2025-06-18 20:27:54 +01:00
Pyritie
67215fba92 one of the mud hut structures had an old gregtech zinc ingot 2025-06-18 20:27:51 +01:00
Redeix
6889dc525e
- Merge current Venus progress (#1185) 2025-06-18 12:40:49 +01:00
Pyritie
50f07fbe0c fix birt dwelling model 2025-06-18 01:27:41 +01:00
Pyritie
4ae60492d4 aircraft configs 2025-06-18 01:27:34 +01:00
Pyritie
75d2767402 I think that's how you do emissive textures? 2025-06-18 01:02:15 +01:00
Pyritie
f6b7075d8e the other egg tag for the birt egg 2025-06-18 01:01:58 +01:00
Pyritie
8da1538f7a loot table for birt dwelling 2025-06-18 01:01:45 +01:00
Pyritie
49d33fe0d3 reduce the spawning of limpets 2025-06-18 01:01:31 +01:00
Pyritie
0ad57dfe3b mob changes in moon biomes since we have birts and surface limpets now 2025-06-17 23:55:24 +01:00
Pyritie
00c7104cb7 is this ever going to work? 2025-06-17 22:19:34 +01:00
Pyritie
4bc92aeda3 birt stuff 2025-06-17 22:19:18 +01:00
Pyritie
b29361a79b trying to get the moon rabbit houses to not put squares on the ground 2025-06-17 21:13:06 +01:00
Pyritie
7f21277843 langs for bedrock ores 2025-06-17 21:12:45 +01:00
Pyritie
4f0ada9529 emi categories 2025-06-17 21:09:10 +01:00
Pyritie
62edf3929f species stuff and loot tables 2025-06-17 20:44:24 +01:00
Pyritie
f646c46377 fix refrigerator in structure 2025-06-17 20:43:47 +01:00
Pyritie
1cc0aafa45 dyes 2025-06-17 20:11:29 +01:00
Pyritie
ddf9851a42 chicken 2025-06-17 20:07:59 +01:00
Pyritie
54da8a20e5 oh so that's why 2025-06-17 19:29:19 +01:00
Pyritie
914a82a68a balance tweak? 2025-06-17 19:24:40 +01:00
Pyritie
daa8ab0493 lang 2025-06-17 19:24:34 +01:00
Pyritie
01fd420f49 people are gonna hate me for this 2025-06-17 19:24:27 +01:00
Pyritie
3676080d13 added a second recipe for leather water flask sides 2025-06-17 19:23:54 +01:00
Pyritie
96d7435867 did I forget to save this last night or something...? 2025-06-17 18:42:11 +01:00
Pyritie
a9c4bbf473 firmalife moment 2025-06-17 17:44:31 +01:00
Pyritie
d688ee0d11 fix duplicate dyes 2025-06-17 16:57:37 +01:00
Pyritie
8010958030 whoops that removed the magnet icon from magnetic neodymium 2025-06-17 16:24:59 +01:00
Pyritie
9e3768eb5b fixed vat having the wrong fluid for dyes, added other dye fluids 2025-06-17 16:24:44 +01:00
Pyritie
425ef439eb added some text to the food recipes! 2025-06-17 15:52:31 +01:00
Pyritie
9d7c38b6ee whoops, conversion recipe was the wrong way around 2025-06-17 14:51:25 +01:00
Pyritie
e38425d597 removed old refrigerator, added conversion to new one 2025-06-17 14:47:42 +01:00
Pyritie
f46962f689 removed dioside, fayalite, enstatite 2025-06-17 13:42:04 +01:00
Pyritie
d362e73055 updated veins 2025-06-17 13:39:29 +01:00
Pyritie
5fa52781ed fixed magnetic neodymium material set inconsistency 2025-06-17 13:38:43 +01:00
Pyritie
7ab8693fe2 langs 2025-06-17 12:30:38 +01:00
Pyritie
1ab2777fcd fixed ISPRecipeLogic path 2025-06-17 12:20:47 +01:00
Pyritie
c13edcabdc merge food branch into space branch 2025-06-17 12:12:43 +01:00
Redeix
208b916d8c
- Fixed brining and smoking recipes and added drying recipes. (#1181) 2025-06-17 11:33:15 +01:00
Redeix
4f2a27b7b4
Merge pull request #1180 from Redeix/revert-3-feature/food
Revert 3 feature/food
2025-06-17 01:04:35 -05:00
Redeix
50ad90af2a
Merge branch 'active/food' into revert-3-feature/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-17 00:57:55 -05:00
Redeix
2e5295614c
Revert "merge" 2025-06-17 00:56:25 -05:00
Redeix
2c24ad385d
Revert "Active/food (#1176)" (#1177)
This reverts commit 6c3fce648b.
2025-06-16 23:57:48 -05:00
Redeix
6c3fce648b
Active/food (#1176)
* rearranged food recipes into hopefully a good format?

* custom gregtech machines and logic to handle TFC recipes (#1160)

* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket

Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>

* Add placeholder assets for food machines (copied from gtceu)

* remove greenhouse definition from kubejs

* change greenhouse recipe

* Rework recipes file

---------

Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>

* update greenhouse quest

* update greenhouse tooltip

* comment out coconut milk

* langs

* tooltip fix

* wrong food lang

* recipe fixes

* Add some more food recipes (#1166)

* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket

Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>

* Add placeholder assets for food machines (copied from gtceu)

* remove greenhouse definition from kubejs

* change greenhouse recipe

* Rework recipes file

* Modify food recipes

* Add some more recipes

* add more recipes and tidy up food recipe file

* change incorrect string

---------

Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>

* - Food changes

---------

Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
2025-06-16 23:54:59 -05:00
Redeix
fb90ef6666
Merge branch 'dev' into active/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-16 23:54:43 -05:00
Redeix
c211aed518
Merge pull request #3 from TerraFirmaGreg-Team/feature/food
merge
2025-06-16 23:07:25 -05:00
Pyritie
553c3a9702 mushroom blocks now drop way less mushroom 2025-06-17 01:10:10 +01:00
Pyritie
595c917ef9 langs 2025-06-17 01:03:28 +01:00
Pyritie
bc61d06232 merge 2025-06-17 01:02:15 +01:00
Pyritie
4f3d8f3ec6 Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space 2025-06-17 01:01:35 +01:00