Commit graph

910 commits

Author SHA1 Message Date
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
237891bc9a
Merge branch 'TerraFirmaGreg-Team:main' into sprinklers 2025-01-12 21:51:20 +00:00
Pyritie
6b8a822028
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 21:50:43 +00:00
Pyritie
cf78d06b46
Merge branch 'main' into patch-5 2025-01-12 18:36:01 +00:00
BoyNextDoor
f75ac9e652
Update recipes.js
Исправил опечатку в температуре кипения морской воды для рецепта маленькой кучки соли с 1000 на 100
(Fixed a typo in salt water boiling recipe's temperature for small salt pile - 1000 > 100)

Signed-off-by: BoyNextDoor <130379681+8oyNextDoor@users.noreply.github.com>
2025-01-12 19:47:20 +03:00
Pyritie
d6580093df
Merge branch 'main' into create-additions 2025-01-12 15:52:27 +00:00
Pyritie
dc0ed9001d
Merge branch 'main' into create-additions
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 14:25:41 +00:00
Pyritie
4d3edb5fa3
Update tooltips.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 14:08:39 +00:00
Pyritie
725e44381e
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 13:49:41 +00:00
Pyritie
8ee3f9d296
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 13:36:27 +00:00
Pyritie
b8d9d261e1
Update tooltips.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 13:30:13 +00:00
Pyritie
5a70837dd0
Update machines.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 13:29:13 +00:00
Pyritie
6ac60ec841
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 13:28:54 +00:00
Pyritie
9558a9c4a5
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 10:56:39 +00:00
Pyritie
b745920cbf
Delete kubejs/assets/create/models/block/blaze_burner/block_with_blaze.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 10:56:12 +00:00
Pyritie
56702012fd
Delete kubejs/assets/create/models/block/blaze_burner/blaze_cage.obj
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 10:56:05 +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
Pyritie
af1c91ebdf
Merge branch 'TerraFirmaGreg-Team:main' into patch-5 2025-01-12 10:06:37 +00:00
Pyritie
f6e31716e4
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 08:54:49 +00:00
Pyritie
b94ae44b04
Merge branch 'main' into patch-5
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 08:52:01 +00:00
Pyritie
1c55351bfc
Merge branch 'main' into main
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 08:48:23 +00:00
Dmitry
0f1f7a2f6d what? 2025-01-12 11:58:27 +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
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
b0a07a28c1
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 19:59:52 +00:00
Pyritie
78ff3af136
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 19:56:51 +00: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
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
7b71cda5eb
Update recipe_types.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 16:37:30 +00:00
Pyritie
d7176bb431
Update machines.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 16:37:06 +00:00
Pyritie
6520e5bdab
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 16:33:34 +00:00
Pyritie
8a63e4188c
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 16:32:54 +00:00
Pyritie
243aa97968
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 16:32:34 +00:00
Pyritie
70668ceb0c
add recipe
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 15:40:34 +00:00