Commit graph

1151 commits

Author SHA1 Message Date
Pyritie
6d159872cc Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-08 03:24:15 +01:00
Pyritie
3a5df84b40 species update! also some biome spawn rates of limpets, and adding create hypertubes to pakku 2025-07-08 03:19:07 +01:00
Nebby1999
ad3683a9bc Add recipe for Bamboo Hopper. Add quest for it too 2025-07-07 21:28:19 -04:00
GameStar
48d4475f6b
wire cutter mold and Hypertube compat (#1258)
* Update constants.js

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

* Update recipes.molds.js

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

* Create hypertube.png

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

* Add files via upload

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

* Create recipes.js

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

* Add files via upload

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

* Add files via upload

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

* Update main_server_script.js

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

* Update recipes.js

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-08 00:12:46 +01:00
Pyritie
ffd7630d2d firmalife update! 2025-07-07 21:26:36 +01:00
Pyritie
1c00ef1120 fixed orbit structures 2025-07-07 19:32:13 +01:00
Pyritie
b1f76dc706 whoops 2025-07-07 19:15:29 +01:00
Pyritie
466ac32107 removed power tool recycling recipes because of duping, fixed crafting table spring recipes 2025-07-07 19:12:34 +01:00
Pyritie
df173e17ab more unification for #898, also a workaround for #963 maybe? 2025-07-07 18:54:55 +01:00
Pyritie
4fa02ec0c9 removed cast iron tongs 2025-07-07 18:53:45 +01:00
Pyritie
436663a5d3 delete chisel and bits 2025-07-07 15:33:51 +01:00
GameStar
bf1bbe12d0
Feature/new molds (#1253)
* Update recipes.js

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

* Update constants.js

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

* Update recipes.molds.js

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

* Add files via upload

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

* Add files via upload

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

* Update recipes.materials.js

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

* Update recipes.materials.js

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-07 13:17:30 +01:00
Redeix
8949f7bc86
Moon rabbit meat stuff (#1254)
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

* - Quests re-ordering and some new ones

* - Hide wild crops from emi

* - Hide wild crops from emi

* - Moon rabbit meat

* - Moon rabbit meat

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-07 11:56:53 +01:00
Redeix
c6a26d49b0
Hide wild crops and forgot to push some quest stuff (#1252)
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

* - Quests re-ordering and some new ones

* - Hide wild crops from emi

* - Hide wild crops from emi

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-07 01:20:51 +01:00
Pyritie
dde7ca5b89 fixes #1203 and some other incorrect/missing food recipes 2025-07-06 23:24:06 +01:00
Pyritie
3a255f5e70 oops, greate's update meant all our macerator removals stopped working 2025-07-06 22:48:42 +01:00
Pyritie
715115820d seed oil now lasts as long as soybean oil in a lamp 2025-07-06 21:58:55 +01:00
Pyritie
9816bfa0c5 apparently 9 inputs is the maximum, so no flux allowed 2025-07-06 21:11:28 +01:00
Pyritie
429720772b buffing air distributor again 2025-07-06 17:22:38 +01:00
Pyritie
edd59f502e moon bedrock veins 2025-07-06 17:12:09 +01:00
Pyritie
88bac4db34 got the oil crops all working! 2025-07-06 16:22:01 +01:00
Pyritie
519e7403ad fixes #1240
Related Work Items: #12
2025-07-06 14:27:40 +01:00
Pyritie
aa85b679c7 added bio fuel quests, more biodiesel recipes 2025-07-06 14:08:25 +01:00
Redeix
035d55ffd5
Biodiesel Stuff (#1249)
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-06 11:56:14 +01:00
Pyritie
a9eab2e3b9 some more tweaks 2025-07-06 01:40:01 +01:00
Pyritie
41ee5d7b44 let's give these more fruits 2025-07-06 01:01:39 +01:00
Pyritie
d80c5a0e84 tweaks and balances after playtesting a bit 2025-07-06 00:49:29 +01:00
Pyritie
1c2dbae5f4 gave calorie paste a little nutrition 2025-07-05 19:45:09 +01:00
Pyritie
4dcbd46a0b space food tag 2025-07-05 19:41:19 +01:00
Pyritie
6ac427a585 replace wood dust for carbon in biomass distillation 2025-07-05 17:19:50 +01:00
Pyritie
1e4d4c2590 ah screw it, orbits 2025-07-05 17:12:07 +01:00
Pyritie
2a2e56dffe forgot some ore processing forge hammer recipes 2025-07-05 15:13:09 +01:00
Pyritie
0e34f7295f added create factory logistics 2025-07-05 15:01:08 +01:00
Pyritie
8f9bbc258d missing uses for clean foil packs 2025-07-05 13:27:21 +01:00
Pyritie
f8693af91c seed oil can be used in lamps now, added recipes to get it early 2025-07-05 13:27:14 +01:00
Pyritie
91f6e7f9dd bottle labels can use any wax 2025-07-05 13:19:55 +01:00
Pyritie
0848393225 cleanup of #1248
Related Work Items: #12
2025-07-05 13:12:08 +01:00
Pyritie
c6bae51299 sorry, no floor alcohol on the moon 2025-07-05 13:11:49 +01:00
34y34y34y34y34y34y34y34y34y
460b5db80e
Crop stuff for biodiesel, works on my machine . (#1248)
* Added the crop stuff I made so far

* I think thiss should be fine?

* I litteraly have no idea what I am doing

* I hope this fixes everything

---------

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
2025-07-05 12:15:00 +01:00
Pyritie
18fdc5a811 desh needs an EBF now 2025-07-05 02:43:18 +01:00
Pyritie
7f52fbe09a stops a future version of greate from generating a bender-to-mech-press recipe for double ingots 2025-07-05 02:22:58 +01:00
Pyritie
9bccf4fa3b merge 2025-07-05 01:41:34 +01:00
Pyritie
6bf2ad74cd
Mechanical press (#1243)
* welcome back, mechanical press

* EMI category order

* langs

* quests

* emi categories

* quests

* greate stress settings for the mech press

* I got distracted so I guess these are on this branch now

* removed welding recipes from the pressurizer

* recipe additions and changes for the mech press!

* let's go gambling!

* added flux to the mech press "welding" recipes
2025-07-05 01:41:03 +01:00
Pyritie
346e825351 🐇 2025-07-05 01:40:59 +01:00
Pyritie
352c97a966 moon cheese tags 2025-07-03 21:10:02 +01:00
Pyritie
0853cc46db blacklisting super chests from contraptions 2025-07-03 21:04:42 +01:00
Pyritie
74335f4f8b added recipe to smelt wrought iron ingots back into cast iron in case you need them in that state 2025-07-01 22:10:08 +01:00
Pyritie
aab85119a9 sea and spring water now also freeze in space 2025-07-01 22:09:48 +01:00
Pyritie
f36e7b860f changing some other recipes to use bolts instead of nuggets 2025-07-01 02:39:34 +01:00
Pyritie
a497c6fcac adding greenhouse tier bonuses + fixing the fertilised recipes chanced outputs consistency 2025-07-01 01:57:59 +01:00