Commit graph

73 commits

Author SHA1 Message Date
Pyritie
55b3e45697 I think gregtech uses these to say if something is a gas or liquid 2025-07-19 00:46:03 +01:00
Pyritie
d1baf88d5b
Merging in mars worldgen branch (#1370)
* red granite is now a real stone type

* starting mars rock layers

* fixed red granite

* flipped the continentalness! thanks stardust
2025-07-18 02:28:21 +01:00
GameStar
0a32609a4b
Feature: Tier 2 insulation (#1349)
* Add files via upload

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

* models

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

* textures

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

* ad as

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

* Update tags.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>

* Update recipes.removes.js

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

* Update recipes.js

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

* Update recipes.removes.js

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

* Update recipes.js

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

* Update recipes.miscellaneous.js

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

* Update items.js

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

* Update materials.js

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

* Update recipes.miscellaneous.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>

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-16 12:05:10 +01:00
Redeix
31b6da9f1c
Integrated Ad Astra wood & and added wood recipe utility (#1346)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

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

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-15 17:41:08 +01:00
Pyritie
64244314e0
Updated Primitive Creatures (#1337)
* updated primitive creatures, and figured out how to make them not spawn randomly any more

* tags and items and recipes

* tweak

* langs

* adding loot

* mod ID rename

* langs

* more loot tweaks

* loot tweaks
2025-07-15 11:48:00 +01:00
Redeix
28d87caae3
Harvest baskets + (#1338)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

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

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-15 03:37:45 +01:00
Pyritie
8dd8d5b344 added ice soup 2025-07-14 20:00:44 +01:00
Pyritie
30f50f2e97
Merging guns branch (#1283)
* Feature/ulv ev guns (#1280)

* update pakku mods

* mod config stuff

* Port over of current guns

* ae2 gun recipes

* nitrocellulose and other stuff

* more recipes

* gun packs

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

* Update pakku-lock.json

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

---------

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

* LICENSE

* changed powderbarrel to use lumber instead of wood boards

* lang

* gunpowder unification

* emi categories

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-13 12:31:39 +01:00
Pyritie
a571779997 fixed naming of casing blocks 2025-07-11 23:20:30 +01:00
Pyritie
8db3266ada langs, disabled unused casings 2025-07-11 22:39:35 +01:00
TomPlop
044494ee8e
Adding the Large Solar Panel (#1275)
* Adding the Large Solar Panel

* Update config for Ad Astral Solar increase possible output

* fix conflict
2025-07-11 20:23:47 +01:00
Pyritie
ec7e245220 orbit dim markers 2025-07-10 12:45:11 +01:00
Pyritie
8987b23b21 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-09 22:58:12 +01:00
Pyritie
8013b4756d fixed the wild rapeseed/sunflowers not dropping their products 2025-07-09 21:34:07 +01:00
Redeix
7c0c3cd341
Added dry ice support for lunchboxes (#1262)
* - 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

* - Moon rabbit meat textures and casings for tom

* - models

* - oops

* - rocket

* - ooops

* - Added dry ice support for lunchboxes

* - Fixed soybean oil quest

* - Added dry ice block

* - Assets for dry ice block

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-09 08:28:16 +01:00
Pyritie
3dffb8e93e remove ender eye, added vitrified ender pearl 2025-07-09 00:49:02 +01:00
Redeix
be23b09e9c
Machine casings for Tom and moon rabbit meat stuff I forgot to push (#1259)
* - 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

* - Moon rabbit meat textures and casings for tom

* - models

* - oops

* - rocket

* - ooops

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-08 12:18:54 +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
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
4dcbd46a0b space food tag 2025-07-05 19:41:19 +01:00
Pyritie
0848393225 cleanup of #1248
Related Work Items: #12
2025-07-05 13:12:08 +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
346e825351 🐇 2025-07-05 01:40:59 +01:00
Redeix
256d976531
Moved some items from tfg-core (#1242)
* - 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.

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-04 00:01:20 +01:00
Redeix
2c834b527d
Updated stromatolite textures + some new venus foliage (#1234)
* - 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

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-01 12:04:14 +01:00
Pyritie
d544b43a0a oh yeah, kubejs-tfc fixed this 2025-06-30 00:03:29 +01:00
Pyritie
7519e85fea merge 2025-06-29 20:11:55 +01:00
Pyritie
2c564ab3f3 convert the nether mushrooms into the new plant block builder type too 2025-06-29 20:11:31 +01:00
Pyritie
710db0a913
added a bunch of plants from Better End, tags, recipes, license, credits (#1229) 2025-06-29 20:10:37 +01:00
Pyritie
282a20e2cd hid the tfg icon from jei 2025-06-29 20:03:35 +01:00
Pyritie
92351f718a idk entity stuff 2025-06-27 00:16:23 +01:00
Pyritie
dad9acede5 started moon rabbit entity 2025-06-26 01:30:03 +01:00
Pyritie
b6d9994f36 cleaning up some todos 2025-06-24 17:27:15 +01:00
Pyritie
072263a981 added, changed, removed recipes and things for create + its addons 2025-06-24 16:56:55 +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
Pyritie
d3f0bcd6d6 added space suit fabric 2025-06-21 10:56:44 +01:00
Redeix
c567450875
- Lots of food stuff (#1196)
* - Lots of food stuff

* Updated Changelog
2025-06-20 09:49:39 +01:00
Pyritie
25530b72c5 cleaned up some of the tfc data files, also added moon meat! 2025-06-19 00:18:27 +01:00
Redeix
6889dc525e
- Merge current Venus progress (#1185) 2025-06-18 12:40:49 +01:00
Pyritie
e38425d597 removed old refrigerator, added conversion to new one 2025-06-17 14:47:42 +01:00
Pyritie
a96bbf2b12 updated dimension marker for the beneath, new ones for other planets 2025-06-17 01:01:33 +01:00
Pyritie
5b462bbb28 compressed airs! 2025-06-10 02:13:26 +01:00
Pyritie
e1bbc3a708 forgor to add lunar sands to the moon biome list 2025-06-03 20:16:03 +01:00
Pyritie
96aae3ae33 finished adding spikes for all rocks 2025-05-13 16:24:00 +01:00
Pyritie
9262133484 merge 2025-05-13 10:55:31 +01:00
Pyritie
4aee3b2f51 added proper loose rock, rock pile, and rock delta features for all the moon rock types, added coral features, retextured warped vines 2025-05-13 10:53:11 +01:00
Redeix
cf54f584b4
Fixes and features (#987)
* - Fixed hide duping recipes.
- Added quest book and field guide instances for fishing nets.
- Fixed rebar support recipe crash.
- Fixed red steel flask dupe.
- Fixed red alloy recipe inconsistency.

* - Fixed blue steel backpack block lang

* - Added max vessel fluid warning to small vessels.

* - Moved red steel flask recipe

* - Fixed fishing nets event function

* Update queststfc_tips.snbt

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

* Update en_us.json

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

* - Added item to summon armor stands with arms

* - Added recipes to empty vessels and molds

* - Added recipes for extracting/ forming magma blocks.

* - Added recipes for extracting/ forming magma blocks.

* - Nerfed steel support recipe output.

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-12 12:29:10 +01:00