Commit graph

2620 commits

Author SHA1 Message Date
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
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
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
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
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
Pyritie
ddd0a9780b
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 15:34:00 +00:00
Pyritie
310b82a707
blaze burner fuels
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 15:33:24 +00:00
Pyritie
226b746a07
blaze burner model
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 15:32:52 +00:00
Pyritie
758f26b63b
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 12:41:55 +00:00
Pyritie
9459b20888
Update machines.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 12:41:11 +00:00
Pyritie
e73f363911
Update recipe_types.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 12:40:57 +00:00
Pyritie
9dcb74fe7e
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 12:39:42 +00:00
Pyritie
07261b3ae8
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 12:39:04 +00:00
Pyritie
73096acc50
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 12:14:06 +00:00
Pyritie
fa51974bc6
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 11:56:16 +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