Redeix
6889dc525e
- Merge current Venus progress ( #1185 )
2025-06-18 12:40:49 +01:00
Pyritie
62edf3929f
species stuff and loot tables
2025-06-17 20:44:24 +01:00
Pyritie
8010958030
whoops that removed the magnet icon from magnetic neodymium
2025-06-17 16:24:59 +01:00
Pyritie
e38425d597
removed old refrigerator, added conversion to new one
2025-06-17 14:47:42 +01:00
Pyritie
f46962f689
removed dioside, fayalite, enstatite
2025-06-17 13:42:04 +01:00
Pyritie
5fa52781ed
fixed magnetic neodymium material set inconsistency
2025-06-17 13:38:43 +01:00
Pyritie
c13edcabdc
merge food branch into space branch
2025-06-17 12:12:43 +01:00
Redeix
50ad90af2a
Merge branch 'active/food' into revert-3-feature/food
...
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-17 00:57:55 -05:00
Redeix
2e5295614c
Revert "merge"
2025-06-17 00:56:25 -05:00
Redeix
fb90ef6666
Merge branch 'dev' into active/food
...
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-16 23:54:43 -05:00
Pyritie
bc61d06232
merge
2025-06-17 01:02:15 +01:00
Pyritie
a96bbf2b12
updated dimension marker for the beneath, new ones for other planets
2025-06-17 01:01:33 +01:00
Pyritie
dff7fd6196
material and rose quartz stuff
2025-06-16 20:32:09 +01:00
Pyritie
242a31b515
tweaked zinc color, added new plated block color
2025-06-16 17:40:22 +01:00
ofoxsmith
65f987dd4b
Add some more food recipes ( #1166 )
...
* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
* Add placeholder assets for food machines (copied from gtceu)
* remove greenhouse definition from kubejs
* change greenhouse recipe
* Rework recipes file
* Modify food recipes
* Add some more recipes
* add more recipes and tidy up food recipe file
* change incorrect string
---------
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-15 15:03:16 -05:00
Pyritie
ffc2106945
recipe fixes
2025-06-13 00:39:27 +01:00
Pyritie
284de79e8c
comment out coconut milk
2025-06-12 21:53:25 +01:00
Pyritie
b7cc04f188
merge
2025-06-12 13:33:44 +01:00
ofoxsmith
f822289573
custom gregtech machines and logic to handle TFC recipes ( #1160 )
...
* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
* Add placeholder assets for food machines (copied from gtceu)
* remove greenhouse definition from kubejs
* change greenhouse recipe
* Rework recipes file
---------
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-12 13:32:10 +01:00
Pyritie
33088aa174
rearranged food recipes into hopefully a good format?
2025-06-10 20:13:03 +01:00
Pyritie
601e92427b
more lunchbox stuff
2025-06-10 17:06:59 +01:00
Pyritie
75a6d3d875
fixed colored steel from having higher tier blast furnace recipes, now they can all just use the basic one too
2025-06-10 16:32:32 +01:00
Pyritie
31d21075e3
antigravity! and zip gun tags
2025-06-10 02:13:48 +01:00
Pyritie
5b462bbb28
compressed airs!
2025-06-10 02:13:26 +01:00
Pyritie
9c41fe262f
merge
2025-06-09 21:15:19 +01:00
Pyritie
917da8d00e
Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
2025-06-09 21:01:11 +01:00
Pyritie
5be2eb1d99
welcome back stonecutter
2025-06-09 21:01:09 +01:00
Jean Roberto de Souza
2b3a1d8ee2
Conductor ( #1144 )
...
* Remove Scaffolding Frame recipe
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
* Update Scaffolding Frame recipe
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
* Fix Glass Jar conflict
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
* Conductor Tags
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
* Conductor Recipes
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
* Update constants.js
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
* Update recipes.js
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
* update id
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
---------
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
2025-06-09 19:34:05 +01:00
GameStar
158f2c112c
gregtech facade crafting ( #1145 )
...
* Update recipes.js
* Whitelist Tag from Redeix
* Update tags.js
* fixed create copper blocks tag
* added more blocks to facades
* Fixed industrial iron
* changed facades to tfg
* changed tag to tfg
* updated tag to tfg from ae2
2025-06-09 16:56:02 +01:00
Pyritie
a830260b71
chorus/lightbloom stuff
2025-06-07 23:03:41 +01:00
Pyritie
29a713cb6c
asurine dust + centrifuge recipes
2025-06-07 21:29:41 +01:00
Pyritie
2180da4932
cc recipe tweaks
2025-06-07 20:06:27 +01:00
Pyritie
adc9932c2e
removed FE cables 💔
2025-06-07 18:52:45 +01:00
Pyritie
5805f9c082
fixed ad astra's lamps so they actually emit light lmao
2025-06-07 18:26:58 +01:00
Pyritie
7075f7eff1
we love material unification
2025-06-07 18:13:04 +01:00
Pyritie
3ccc700676
ore vein updates
2025-06-07 16:57:39 +01:00
Pyritie
69b4d83067
added recipes for ae2 deco blocks, stone dust centrifuge recipes for the moon
2025-06-07 00:58:45 +01:00
Pyritie
6a27fa98ca
what if we just added recipes for these?
2025-06-06 23:45:25 +01:00
Pyritie
604f2080f3
ad astra recipe tweaks and finishing up
2025-06-06 23:25:30 +01:00
Pyritie
2129d9611d
more work on deco blocks, needs checking
2025-06-06 13:21:16 +01:00
Pyritie
0e9d72137d
merge
2025-06-06 12:17:28 +01:00
Pyritie
07f984c288
yumy popped chorus fruit (needs a cooking recipe)
2025-06-06 01:22:48 +01:00
Pyritie
97f41f827a
remove cheese block
2025-06-06 01:20:42 +01:00
Pyritie
637dfda744
updated ore field guide
2025-06-05 22:45:02 +01:00
Pyritie
b446f9b45f
started recipes for some deco blocks
2025-06-05 13:09:15 +01:00
Pyritie
d8a3a956f7
ad astra recipe tweaks
2025-06-05 12:35:54 +01:00
Pyritie
263a9dfab7
merge
2025-06-05 12:24:32 +01:00
Pyritie
ecbc791b30
better recipes for bars, doors, trapdoors
2025-06-04 23:23:45 +01:00
Pyritie
1f507feefa
changed copper diving equipment durability to match copper armor, all diving equipment now copies any forging bonuses
2025-06-04 21:59:56 +01:00
Pyritie
3eebef1616
more greenhouse tweaks, added a recipe for grass blocks
2025-06-04 21:49:00 +01:00
