Commit graph

2147 commits

Author SHA1 Message Date
Dmitry
fc9be024c1
Merge pull request #690 from Pyritie/main
Added ore index, started work on other TFC info category
2025-01-12 16:40:22 +07:00
Pyritie
1c55351bfc
Merge branch 'main' into main
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 08:48:23 +00:00
Xikaro
fface8041c workflows 2025-01-12 10:56:34 +05:00
Xikaro
af5a0638e5
Update build.yml
Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
2025-01-12 10:41:50 +05:00
Xikaro
2a89fa630a
Update build.yml
Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
2025-01-12 10:41:04 +05:00
Dmitry
bdb0e05beb
Update pakku.json
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-12 12:37:34 +07:00
Dmitry
0f1f7a2f6d what? 2025-01-12 11:58:27 +07:00
Dmitry
0212f19e50
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-12 11:57:06 +07: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
Dmitry
2d3fac3443
Merge pull request #692 from Pyritie/patch-1
Creosote treated planks fixes
2025-01-12 11:52:38 +07:00
Pyritie
0492936227
Update en_us.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 00:52:00 +00: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
98b9452ade
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 19:40:29 +00:00
Pyritie
3d7c02ccf3
Update main_startup_script.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 18:22:19 +00:00
Pyritie
c0efaf5340
missed nether_brick
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 18:05:47 +00:00
Pyritie
547e1dae9a
adjusted glowstone recipe
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 18:01:35 +00:00
Pyritie
38b162fa3d
Update index.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 17:17:01 +00:00
Pyritie
15ffc51f1b
added tips files
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 17:16:16 +00:00
Pyritie
fc8a824a53
Update tfg_tips.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 17:15:47 +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
Pyritie
5fdeb8442c
Merge branch 'TerraFirmaGreg-Team:main' into main 2025-01-11 11:42:52 +00:00
Dmitry
510e84390c
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-11 14:29:37 +07:00
Dmitry
fbb8e91637
Update CHANGELOG.md
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-11 14:29:08 +07:00
Dmitry
f6414b980c
Merge pull request #684 from 8oyNextDoor/main
Перевод книги
2025-01-11 14:27:33 +07: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
a8a1614893
Merge pull request #688 from Pyritie/patch-3
Fix charcoal in macerator overlap
2025-01-11 14:19:30 +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
Dmitry
8f06680702
Merge pull request #678 from fluffle/0.7.15-mainthatch
Fix maintenance hatch recycling recipes too.
2025-01-11 14:17:50 +07:00
Sergey Semin
ea075ec8b5 fix again 2025-01-11 04:41:40 +03:00
Pyritie
46a49c0f4a
Delete kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_faqs directory
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 01:02:01 +00:00
Pyritie
1f4e289ca6
Delete kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/infinite_resources.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 00:58:13 +00:00
Pyritie
2c7560735c
Update and rename tfg_faqs.json to tfg_tips.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 00:56:48 +00:00
Pyritie
7fa49554e7
Update tfg_faqs.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 00:54:24 +00:00
Pyritie
fede9c252a
Update index.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 00:51:25 +00:00
Pyritie
fec5cad599
Update index.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 00:40:29 +00:00
Pyritie
f1469147ae
fix charcoal in macerator
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 00:21:35 +00:00
Sergey Semin
7cc1ce81d1 Added greenhouse recipes for tfc plants tag 2025-01-11 03:03:10 +03:00
Pyritie
10d69af86f
update tooltips.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 23:23:26 +00:00
Pyritie
04407db649
update gregtech/recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 23:23:02 +00:00
Pyritie
a1d402eba6
update minecraft/constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 23:21:53 +00:00