Commit graph

3638 commits

Author SHA1 Message Date
Pyritie
54f01fbff0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-07 00:40:10 +01:00
Pyritie
4113da26c1 tweaks to default keybinds 2025-07-07 00:40:09 +01:00
Redeix
d0ad38a901
Quest changes (#1251)
* - 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

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-07 00:36:56 +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
a2677310ba langs 2025-07-06 17:12:14 +01:00
Pyritie
edd59f502e moon bedrock veins 2025-07-06 17:12:09 +01:00
Pyritie
2dc1f06c68 langs 2025-07-06 16:31:31 +01:00
Pyritie
88bac4db34 got the oil crops all working! 2025-07-06 16:22:01 +01:00
Pyritie
589ed9cf23 field guide 2025-07-06 15:57:55 +01:00
Pyritie
cdbc2e74bc fixed blockstates 2025-07-06 15:57:47 +01:00
Pyritie
c96f9853c3 clean up this infinite resources entry 2025-07-06 15:22:20 +01:00
Pyritie
2847652763 this stupid quest that I hate 2025-07-06 15:13:38 +01:00
Pyritie
98f0c124a2 excluded ad astra and advanced peripherals books 2025-07-06 15:13:27 +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
cf3b658a47 langs 2025-07-06 01:40:18 +01:00
Pyritie
a9eab2e3b9 some more tweaks 2025-07-06 01:40:01 +01:00
Pyritie
1fb98d9cb8 made these a little more spread out 2025-07-06 01:39:45 +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
54a6a90868 changelog 2025-07-05 20:00:58 +01:00
Pyritie
1a8efac05f made the space station quest optional 2025-07-05 19:47:11 +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
faafb3e27e made solars worse on earth 2025-07-05 19:41:13 +01:00
Pyritie
8f6edd922a langs n quests 2025-07-05 19:41:01 +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
afa435898f I think that's the ore processing chapter sorted 2025-07-05 16:19:45 +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
cdfbf81227 pakku updates, removed entityjs (for now), added ad-astra-3d 2025-07-05 13:35:52 +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
Pyritie
2ce6bcaa8d langs 2025-07-05 13:07:13 +01:00
Pyritie
e20945790c oops we had two fluix blocks 2025-07-05 12:54:09 +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
Redeix
c16af2c440
Updated more textures for ad-astra stuff + new panorama (#1247)
* - 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

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-05 12:12:45 +01:00
Pyritie
18fdc5a811 desh needs an EBF now 2025-07-05 02:43:18 +01:00
Pyritie
67b3911e46 fixed the FE cables still being in the loot chests 2025-07-05 02:32:03 +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
4cb2cd9885 flag changes again 2025-07-05 01:49:18 +01:00