Commit graph

556 commits

Author SHA1 Message Date
Dmitry
29fe3d4e66
Merge branch 'main' into trims
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 00:28:09 +07:00
Dmitry
d319067a8e
Merge pull request #705 from Pyritie/patch-1
Added missing recipe for nether brick
2025-01-18 00:26:31 +07:00
Dmitry
4c0d7f360c
Merge pull request #704 from Pyritie/glass
Added recipes for create glass, more windows, fixed tinted glass recipe conflict
2025-01-18 00:25:52 +07:00
Pyritie
5b834e6a05
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:58:30 +00:00
Pyritie
c5e5193da3
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:58:15 +00:00
Pyritie
65dd5e4ac5
Update main_server_script.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:57:57 +00:00
Pyritie
52c31181cc
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:41:11 +00:00
Pyritie
8eaa363f38
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:31:40 +00:00
Pyritie
66a1f2cc3b
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:04:01 +00:00
Pyritie
11b5790bd3
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 02:45:03 +00:00
Pyritie
1a29e4cfa0
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 01:17:21 +00:00
Pyritie
478b9ff3f6
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 01:14:56 +00:00
Pyritie
d2b75c170a
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 01:12:40 +00:00
Pyritie
dde2ec68e9
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 22:26:02 +00:00
Pyritie
6b81d71177
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 22:02:36 +00:00
Pyritie
ce3558feac
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 21:54:17 +00:00
Pyritie
64bd5bc8cf
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 21:53:33 +00:00
Pyritie
10d14ac7de
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 10:14:23 +00:00
Pyritie
db4d3e1b44
Merge branch 'TerraFirmaGreg-Team:main' into ae2 2025-01-12 10:06:48 +00:00
Dmitry
9c4f53b690
Merge pull request #693 from Saaghh/electric-leather
electric leather
2025-01-12 11:55:50 +07:00
Dmitry
b6627d9030
Merge pull request #694 from Saaghh/electrocheese
Electric cheese, tomato sauce and cream
2025-01-12 11:54:56 +07:00
Dmitry
e32627de7a
Merge pull request #695 from Pyritie/patch-2
Added another recipe for Create's electron tubes
2025-01-12 11:54:27 +07:00
Dmitry
59f66ff307
Merge pull request #686 from Pyritie/gas-multiblocks
Gas multiblocks
2025-01-12 11:53:48 +07:00
Dmitry
9d6e8fdf73
Merge pull request #696 from Pyritie/patch-3
Fixed mixer recipes for red/blue steel
2025-01-12 11:52:59 +07:00
Pyritie
6e477e1469
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 00:49:34 +00:00
Pyritie
26321b7e4b
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 23:50:40 +00:00
Pyritie
1db4a2c4be
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 23:34:26 +00:00
Sergey Semin
fc2c349be8 electric cheese, tomato sauce and cream 2025-01-12 01:29:47 +03:00
Sergey Semin
289bcae162 electric leather 2025-01-11 23:35:29 +03:00
Pyritie
b0a07a28c1
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 19:59:52 +00:00
Pyritie
98b9452ade
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 19:40:29 +00:00
Pyritie
547e1dae9a
adjusted glowstone recipe
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 18:01:35 +00:00
Pyritie
983ce50199
Merge branch 'main' into gas-multiblocks
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 11:45:40 +00:00
Dmitry
7d6755d4b9
Merge pull request #680 from Juzrm/main
Craft recipe for framed chest so it isn't cheaper then the alternatives
2025-01-11 14:23:13 +07:00
Dmitry
06c4477cc6
Merge pull request #681 from fluffle/0.7.15-mainframe
Use 2x annealed copper wires in ZPM mainframe recipe.
2025-01-11 14:21:41 +07:00
Dmitry
7490513d24
Merge pull request #687 from Saaghh/more-greenhouse-plants
Added greenhouse recipes for tfc plants tag
2025-01-11 14:20:28 +07:00
Dmitry
0b17cbe2ec
Merge pull request #689 from Saaghh/electric-olive-oil
Olive oil in machines
2025-01-11 14:18:31 +07:00
Sergey Semin
ea075ec8b5 fix again 2025-01-11 04:41:40 +03:00
Sergey Semin
7cc1ce81d1 Added greenhouse recipes for tfc plants tag 2025-01-11 03:03:10 +03:00
Pyritie
04407db649
update gregtech/recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 23:23:02 +00:00
Pyritie
55492435ce
terrarium recipes
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 23:16:05 +00:00
Alex Bramley
d6084eaff6 Use 2x annealed copper wires in ZPM mainframe recipe. 2025-01-09 23:06:26 +00:00
Juzrm
ee4292bee2
Update recipes.js
Signed-off-by: Juzrm <themarythemarythemary@gmail.com>
2025-01-09 22:19:07 +00:00
Alex Bramley
296b9abd9e Fix maintenance hatch recycling recipes too. 2025-01-09 09:28:47 +00:00
Dmitry
723b08001e Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern 2025-01-06 22:32:49 +07:00
Dmitry
867c17d3aa unfuck fucking javascript 2025-01-06 22:32:44 +07:00
Pyritie
9af4b02b21
Merge branch 'TerraFirmaGreg-Team:main' into patch-6 2025-01-06 15:12:56 +00:00
Dmitry
df29c37a9a
Merge pull request #669 from Pyritie/patch-1
Added recipes to stop duping of red alloy + steam machines
2025-01-06 22:02:45 +07:00
Pyritie
644bcdee41
Adds early glowstone recipe
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-06 14:58:56 +00:00
Pyritie
ea7f6d43cd
Added recipes to stop duping of redalloy + steam machines
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-06 14:55:23 +00:00