Commit graph

720 commits

Author SHA1 Message Date
Pyritie
1db4a2c4be
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 23:34:26 +00: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
Sergey Semin
ea075ec8b5 fix again 2025-01-11 04:41:40 +03: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
BoyNextDoor
c006a36e86
Add files via upload
Signed-off-by: BoyNextDoor <130379681+8oyNextDoor@users.noreply.github.com>
2025-01-10 16:33:53 +03:00
BoyNextDoor
4dbcfc648b
Add files via upload
Signed-off-by: BoyNextDoor <130379681+8oyNextDoor@users.noreply.github.com>
2025-01-10 16:31:13 +03:00
BoyNextDoor
7103b0056a
Update deep_scheelite.json
Исправил опечатку/fixed a typo

Signed-off-by: BoyNextDoor <130379681+8oyNextDoor@users.noreply.github.com>
2025-01-10 16:26:05 +03: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
Pyritie
567af6a226
Remove ore spreadsheet link from field guide
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-08 12:59:07 +00:00
Dmitry
12ed029fb6 requested fixes 2025-01-08 00:26:09 +07:00
Pyritie
f9c3ef144f
Delete kubejs/assets/tfc/patchouli_books/field_guide/ru_ru directory
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-07 13:15:58 +00:00
Pyritie
368542fc64
Delete kubejs/assets/tfg/patchouli_books directory
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-07 13:15:34 +00:00
Pyritie
5c89688b87
Moved files to correct place
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-07 13:15:03 +00:00
Pyritie
8448e9147e
Update names of entries
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-07 09:34:34 +00:00
Pyritie
193770c671
Update tfg_ores.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-07 09:33:32 +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
Alex Bramley
d6939485ab Add circuit to assembler redstone lamp recipe. 2025-01-06 14:26:24 +00:00
Alex Bramley
772e8f313e Super tank/chest self-crafting recipes to strip NBT. 2025-01-06 14:26:13 +00:00
Alex Bramley
28c95a7b61 Controversial: remove in-world certus transformation; buff mixer recipes to compensate. 2025-01-06 14:24:57 +00:00
Alex Bramley
eb5a0e5c15 Recipes for certus/nether quartz cutting knives. 2025-01-06 14:24:57 +00:00
Alex Bramley
868defd38f Reduce costs of covered and smart cables. 2025-01-06 14:24:57 +00:00
Dmitry
705db91ad2
Merge pull request #663 from SverhRazum-Nah/patch-7
precision mech in assembler
2025-01-06 21:18:58 +07:00
Dmitry
f46202efec
Merge pull request #666 from Pyritie/main
Fixed TFG things in field guide, added oregen section
2025-01-06 21:12:35 +07:00
Alex Bramley
dac64097ea Fix LV recycling recipes to produce basic steel. 2025-01-06 09:47:47 +00:00
Pyritie
41f99f940c
initial commit of field guide changes
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-05 17:31:57 +00:00
Pyritie
2c7d8e3688
Merge branch 'TerraFirmaGreg-Team:main' into patch-6 2025-01-05 17:28:35 +00:00
Pyritie
0968a1b080
Update tooltips.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-05 17:28:10 +00:00
Pyritie
1a0dfa3dcb
Merge branch 'TerraFirmaGreg-Team:main' into main 2025-01-05 17:25:58 +00:00
SverhRazum-Nah
3d8b3e7fb6
precision mech in assembler
Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
2025-01-03 02:05:38 +03:00
Dmitry
ff43daae07
Merge pull request #639 from Pyritie/patch-1
Fixed not being able to make cobble in assembler
2024-12-29 15:48:21 +07:00
Dmitry
aff372980b
Merge pull request #640 from Pyritie/patch-2
Added recipe for metal bars
2024-12-29 15:48:09 +07:00
Dmitry
58f2a04505
Merge pull request #642 from Pyritie/patch-4
Added quern recipes for graphite
2024-12-29 15:47:56 +07:00
Dmitry
ae069316d3
Merge pull request #641 from Pyritie/patch-3
Added yeast starter and cocoa powder recipes
2024-12-29 15:47:10 +07:00
Pyritie
386dd79bb3
Fixed red alloy crucible recipe
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-23 16:57:37 +00:00
Pyritie
72c5e41eb4
fix stone dust tag
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-22 21:19:27 +00:00
Pyritie
73e06eb285
add tooltips
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-22 21:05:56 +00:00
Pyritie
6b5373b2cb
Added quern recipes for graphite
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-22 18:06:20 +00:00