Commit graph

456 commits

Author SHA1 Message Date
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
9de6557326
nugget material fix, changelog (#1332) 2025-07-14 21:34:23 +01:00
Pyritie
8dd8d5b344 added ice soup 2025-07-14 20:00:44 +01:00
Redeix
911ede670a
Created utility function to add circuit numbers to pre-existing recipes (#1320)
* - 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>

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-14 10:10:37 +01:00
GameStar
f9ece44a81
Bug fix/Adding in some missing recipes (#1319)
* kelp + seaweed dry

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

* add assembler 45-70

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

* fixed afc wood stomping barrel recipes

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

* give lead tfc properties

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

* give lead nuggets an anvil recipe

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

* Update CHANGELOG.md

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>
2025-07-14 10:06:47 +01:00
Pyritie
e4d67a0845 hid new sophisticated backpack upgrade 2025-07-13 13:25:19 +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
092d03fbd5
Adding recipe type for LSP (#1277)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-07-11 21:19:16 +01:00
TomPlop
d7443ed9ba
Adding the LSP Structure (#1276)
Oups

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-07-11 21:19:09 +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
Nebby
208b2ece88
Bronze variant Mortars (#1270) 2025-07-11 08:28:33 +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
423da664fe fucking gregtech 2025-07-09 22:58:04 +01:00
Pyritie
8013b4756d fixed the wild rapeseed/sunflowers not dropping their products 2025-07-09 21:34:07 +01:00
Pyritie
9e60fb584a fixed some damascus steel stuff still showing up 2025-07-09 21:33:51 +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
Pyritie
54e41bf2ef 🍰🎂 2025-07-08 17:35:42 +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
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
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
8b9da9c142 no idea if this is fixed in GT7 or not, but the nano/quark armor has actual armor points now 2025-07-07 21:51:04 +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
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
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
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
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
Pyritie
18fdc5a811 desh needs an EBF now 2025-07-05 02:43:18 +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
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
be7995a04e oxygenated climate stuff 2025-07-01 02:35:32 +01:00
Pyritie
9107d124a8 cheese 2025-07-01 01:12:38 +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