Commit graph

3530 commits

Author SHA1 Message Date
Pyritie
282a20e2cd hid the tfg icon from jei 2025-06-29 20:03:35 +01:00
Pyritie
c9f7c46251 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-28 23:39:17 +01:00
Pyritie
8cc6b86f45 updated kubejs-tfc 2025-06-28 23:39:15 +01:00
Redeix
5c356b0f46
Some small stuff (#1225)
* - 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

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-28 11:14:05 +01:00
Pyritie
b04791403c fixed the vibrating table with rose quartz 2025-06-28 01:07:03 +01:00
Pyritie
d7a47307c3 removed the other ad astra material components (for now) 2025-06-28 00:57:50 +01:00
Pyritie
686715c251 fixed the lathe not making gem rods, also lens stuff 2025-06-28 00:57:39 +01:00
Pyritie
6d971bead8 quest tweaks 2025-06-28 00:57:10 +01:00
Pyritie
18570f4126 adjusted the water wheel recipe again so it's not quite so evil 2025-06-28 00:10:02 +01:00
Pyritie
2154bfdf77 changed a few create recipes to need bolts instead of screws 2025-06-28 00:09:13 +01:00
Kayla
50340ec0df
Changes the greg wood plank and treated wood plank recipes to follow a more realistic processing chain (#1223)
* adds MDF, reworks treated wood and normal wood plate crafting chains

* removes treated wood plank from the minecraft:planks tag
2025-06-27 22:37:27 +01:00
Pyritie
1cf4a6cae6 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-27 12:34:25 +01:00
Pyritie
86f7c1eb27 added pt_br ore field guide pages 2025-06-27 12:32:39 +01:00
Xikaro
635248c485 Update README.md 2025-06-27 15:50:16 +05:00
Redeix
ed41d542aa
- Lots of ui updates. And a couple fixes. (#1221)
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-27 11:49:46 +01:00
Pyritie
4fb5ea2ea2
I think that's a better tagline
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-06-27 11:42:43 +01:00
Pyritie
54a44071a3 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-27 00:54:28 +01:00
Pyritie
51e3725748 removed ae2-things 2025-06-27 00:54:25 +01:00
Gustavo
80c0e0e4af Merge branch 'feature/space' into dev 2025-06-27 09:23:23 +10:00
Gustavo
791cef4f32 lang keys 2025-06-27 09:23:11 +10:00
Pyritie
92351f718a idk entity stuff 2025-06-27 00:16:23 +01:00
Pyritie
eb5a59e4eb Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-27 00:15:27 +01:00
Pyritie
20dff9e211 merging langs 2025-06-27 00:15:25 +01:00
Jean Roberto de Souza
54660c80c8
Steam N Rails loottable (#1220)
fix for the conductor

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
2025-06-26 23:08:02 +01:00
Pyritie
dc270457cd ah fuck it I'll be nice 2025-06-26 22:23:45 +01:00
Pyritie
bb9bfecc05 nerfed the steam age fire clay recipe because let's be real 2025-06-26 22:23:12 +01:00
Pyritie
dad9acede5 started moon rabbit entity 2025-06-26 01:30:03 +01:00
Pyritie
f38215cb74 cleanup 2025-06-26 00:55:47 +01:00
Pyritie
d59e42de28 fix typo on gas tanks 2025-06-25 23:48:30 +01:00
Pyritie
1d8f9e0c2d Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-25 22:59:52 +01:00
Pyritie
1696806401 updated steam n rails, added entityjs 2025-06-25 22:55:21 +01:00
Pyritie
9f439a60ed added rock duping recipes for vanilla basalt, added greenhouse recipe for spore blossom 2025-06-25 22:10:33 +01:00
Pyritie
27a9c676a5 disabled orbits 2025-06-25 17:57:04 +01:00
Pyritie
ee655ac5b3 adjusted recipes of crushing wheels to need a machine hull now 2025-06-25 17:53:58 +01:00
Pyritie
70e491903d nerfed VI centrifuge times 2025-06-25 00:16:35 +01:00
Pyritie
f1cf6919fb corrected average temp in orbits, since spacesuits have ambiental compat now 2025-06-25 00:16:23 +01:00
Pyritie
161e2185cf added back ad astra oxygen loader JEI page, removed greate haunting + ae2 entropy 2025-06-24 23:48:06 +01:00
Pyritie
4d10d5ac28 I can't remember why I added this 2025-06-24 23:37:13 +01:00
Pyritie
0a7ea3e6ab added resource pack for the old create copper textures, reverted the new models of the greate pumps 2025-06-24 18:00:17 +01:00
Pyritie
cb8a5e6df9 hide all the error messages from ae2's ingame guide, see GuideMe#58 2025-06-24 17:54:37 +01:00
Pyritie
4b0edf9833 finally removing this old greate jank 2025-06-24 17:27:24 +01:00
Pyritie
b6d9994f36 cleaning up some todos 2025-06-24 17:27:15 +01:00
Pyritie
b350b0a16d included some default options for resource packs, turning off narrator, volume 2025-06-24 17:26:48 +01:00
Pyritie
412aaef5d5 removing loot tables for encased greate cogwheels, since the bug is officially fixed now 2025-06-24 17:01:06 +01:00
Pyritie
072263a981 added, changed, removed recipes and things for create + its addons 2025-06-24 16:56:55 +01:00
Pyritie
f41f02c41a update tfg-core in pakku 2025-06-24 15:08:56 +01:00
Pyritie
5b491c7386 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-24 15:07:49 +01:00
Pyritie
b4ef70ac63 redo dff7fd6 2025-06-24 15:06:38 +01:00
Xikaro
9712e2a499 Delete .gitmodules 2025-06-24 19:03:02 +05:00
Pyritie
006a1c8da9 redo e35c340 2025-06-24 15:03:00 +01:00