Commit graph

3443 commits

Author SHA1 Message Date
Pyritie
3d1e167387 quest merging 2025-06-23 22:41:04 +01:00
Pyritie
0568f7d68a fixed gas tank moonbase chest reward typo 2025-06-23 22:28:00 +01:00
Pyritie
fa44b350b1 changelog 2025-06-23 22:09:53 +01:00
Pyritie
8cd711d156 Merge branch 'dev' into feature/space 2025-06-23 22:03:21 +01:00
TomPlop
3daacb3c22
AE2 Rework - Recipes (#1193)
* AE2 Rework

* Adding a universal Requester recipe

* Lower tier of ME Requester

* Fix ME Requester again

* Fix for terminals Eu Tier

* Adding fluix dust to the AE2 Cables

* Add redstone to smart cable

* Change for Processor, Cryo Fluix in the Vac and new Fluix Crystal method

* Nerf moon processors

* Fixes to resolve PR

* Adding Pack/Unpack for colored cables

* Adding Accumulation Press Recipe and fix Molecular Assembler
2025-06-23 21:03:43 +01:00
Redeix
ac7e57387a
Updated textures for the fridge and food processor + (#1210)
* - Lots of food stuff

* Updated Changelog

* Changed dry ice and calorie paste recipes

* Update recipes.miscellaneous.js

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* Updated textures for the fridge and food processor. Added refrigerant gases for the refrigerators and added recycling recipes for all the new machines.

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-23 08:40:17 +01:00
34y34y34y34y34y34y34y34y34y
ae28642a7b
Liquid burning (#1204)
* Added ABS glowstone recipe

Idk how useful this is but I want it 

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>

* Update recipes.js

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>

* Update recipes.js

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>

* Added the straw

TomTomTom gave it to me to copy paste it here so the straw is all his work

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>

* Now it's tin alloy fluid pipe as per pyritie's wishes

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>

* Added Tom's anvil recipe for the straw

Also added comments to make it a clear region

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>

* Tier 5 now for straw

Tom edited the message after I saw it .

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>

* Tom's changes to anvil recipe , now tier 3 and plate instead of pipe

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>

---------

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
2025-06-22 21:44:01 +01:00
ofoxsmith
aa379fa51c
Merge pull request #1209 from TerraFirmaGreg-Team/revert-1205-dev
Revert "Dev -> space sync"
2025-06-22 16:06:19 +10:00
ofoxsmith
c4db9e821b
Revert "Dev -> space sync" 2025-06-22 16:05:59 +10:00
ofoxsmith
853fab11cb
Merge pull request #1208 from TerraFirmaGreg-Team/revert-1205-dev
Revert "Dev -> space sync"
2025-06-22 15:57:38 +10:00
ofoxsmith
0845aed8f9
Revert "Dev -> space sync" 2025-06-22 15:57:28 +10:00
Redeix
be9e510584
Merge pull request #1207 from TerraFirmaGreg-Team/revert-1205-dev
Revert "Dev -> space sync"
2025-06-22 00:46:55 -05:00
Redeix
e2a04c8c25
Revert "Dev -> space sync" 2025-06-22 00:46:22 -05:00
Redeix
e2f6514f44
Merge pull request #1205 from TerraFirmaGreg-Team/dev
Dev -> space sync
2025-06-22 00:43:27 -05:00
Redeix
2138a8b0dc
Merge branch 'feature/space' into dev
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-22 00:40:02 -05:00
Pyritie
8e9f1c51ab changelog 2025-06-21 11:06:05 +01:00
Pyritie
1c7aff030a changed clay bricks to extruder/curving press instead of assembler 2025-06-21 11:05:32 +01:00
Pyritie
d551b40d3a tweaked glowstone, added purpur recipes, changelog 2025-06-21 10:57:49 +01:00
Pyritie
02303f349b fixed recipe conflict with mushroom blocks 2025-06-21 10:57:11 +01:00
Pyritie
d205f76aa1 fixed some models needing particles 2025-06-21 10:56:54 +01:00
Pyritie
d3f0bcd6d6 added space suit fabric 2025-06-21 10:56:44 +01:00
Pyritie
6f8a70ef54 added dry ice to calorie paste recipe 2025-06-20 23:58:11 +01:00
Pyritie
ca87c96ee7 no circuit needed here 2025-06-20 23:57:07 +01:00
Pyritie
4914fa660d Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-20 23:16:37 +01:00
Pyritie
5b65ac70e6 whoops 2025-06-20 23:16:35 +01:00
34y34y34y34y34y34y34y34y34y
b0fb9e3e9a
ABS glowstone recipe (#1202)
* Added ABS glowstone recipe

Idk how useful this is but I want it 

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>

* Update recipes.js

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>

---------

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
2025-06-20 22:17:05 +01:00
Pyritie
5d5479d02a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-20 21:03:29 +01:00
Pyritie
9d0d152fb9 removed better foliage again + visual workbench (doesn't handle recipes with greg tools very well) 2025-06-20 21:03:27 +01:00
Pyritie
f5cb4fb013 whitelisted glue for wood buckets/barrels 2025-06-20 21:02:41 +01:00
Thomasx0
54f30d5cc6
lunchbox update into Pakku (#1200)
* Refactored KubeJS recipes for GT compatibility
lunchbox update into Pakku

* Refactored KubeJS recipes for GT compatibility
lunchbox update into Pakku
fixed bowl bug
fixed dupe food bug
2025-06-20 18:33:02 +01:00
Redeix
5ef550f0c2
changed dry ice and calorie paste recipes (#1201)
* - Lots of food stuff

* Updated Changelog

* Changed dry ice and calorie paste recipes

* Update recipes.miscellaneous.js

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-20 18:18:06 +01:00
Redeix
c567450875
- Lots of food stuff (#1196)
* - Lots of food stuff

* Updated Changelog
2025-06-20 09:49:39 +01:00
Pyritie
3428588b25 Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space 2025-06-19 20:20:19 +01:00
Pyritie
84b36479e0 changed rhyolite to use moon sand instead of white sand 2025-06-19 20:20:16 +01:00
Pyritie
316b116af5 comments 2025-06-19 17:30:46 +01:00
Pyritie
6103b87de0 changelog 2025-06-19 13:17:15 +01:00
Pyritie
0bc679107a removed burpflower field guide page 2025-06-19 13:16:51 +01:00
Pyritie
abae0a8c9f changelog 2025-06-19 13:10:58 +01:00
Pyritie
8f3eac722b Merge branch 'dev' into feature/space 2025-06-19 13:10:11 +01:00
Pyritie
afc88dda91 changelog, added blood lily to klayze loot 2025-06-19 13:09:46 +01:00
Pyritie
6f4ec99446 changelog 2025-06-19 13:03:28 +01:00
Pyritie
4eb9dcd4fc reorganized stone dusts, nerfed them a bit more 2025-06-19 13:03:23 +01:00
Pyritie
1519fc82db merge 2025-06-19 12:12:57 +01:00
Pyritie
5f7b9dd291 changelog 2025-06-19 12:11:56 +01:00
Pyritie
0b05648189 fixed a few other steel items being extractable in LV 2025-06-19 12:11:06 +01:00
Pyritie
5b17e57331 nerfed lava aqueous accumulator a bit 2025-06-19 10:50:28 +01:00
Pyritie
25530b72c5 cleaned up some of the tfc data files, also added moon meat! 2025-06-19 00:18:27 +01:00
Pyritie
59481eb03c hid the netherite space suit recipes, tweaked the normal space suit a little 2025-06-19 00:13:22 +01:00
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