Commit graph

1235 commits

Author SHA1 Message Date
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
Pyritie
538f6c8952
add model for artificial end portal frame
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 23:20:57 +00:00
Pyritie
4602044a59
add new blocks + fluids
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 23:20:11 +00:00
Pyritie
11c3737c5e
update main_server_script.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 23:19:20 +00:00
Pyritie
55492435ce
terrarium recipes
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 23:16:05 +00:00
Pyritie
1707781a0a
updated multiblocks
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 23:15:19 +00:00
Pyritie
9bf15cedfa
deleted faqs.json, moved to separate category
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 18:06:03 +00:00
Pyritie
522e15644b
initial faqs
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 18:05:15 +00:00
Pyritie
11f97200d3
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 18:03:29 +00: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
Pyritie
0abd9d0e40
WIP index
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 13:04:20 +00:00
Pyritie
5431621574
multiblock definitions
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-09 23:18:10 +00:00
Pyritie
013c4f4fb5
new lang strings for the terrariums
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-09 23:17:16 +00:00
Pyritie
4af7345975
re-enable things for multiblocks
dragon egg, end stone, netherrack, nether bricks

Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-09 23:13:21 +00:00
Pyritie
8a7d15be6f
Merge branch 'TerraFirmaGreg-Team:main' into patch-5 2025-01-09 23:09:24 +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
Pyritie
f4d73fd5cf
started adding some tips entries
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-09 13:00:58 +00:00
Pyritie
eeb84836a5
Merge branch 'TerraFirmaGreg-Team:main' into main 2025-01-09 12:23:20 +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
7243c8530c
Fix broken saltpeter link
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-07 14:47:28 +00: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
Pyritie
0332cf4620
Merge branch 'TerraFirmaGreg-Team:main' into patch-5 2025-01-06 17:44:43 +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
Pyritie
11e8626e91
Merge branch 'main' into patch-5
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-06 15:11:55 +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