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
bd7b4042c9
Add files via upload
...
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 21:50:04 +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
Dmitry
8741d77147
Update CHANGELOG.md
...
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-12 22:49:29 +07:00
Dmitry
e6641ca0a7
Merge pull request #698 from Pyritie/ae2
...
Changed the AE2 network analyzer to HV instead of IV
2025-01-12 22:49:10 +07:00
Pyritie
de368a045f
Merge branch 'TerraFirmaGreg-Team:main' into patch-5
2025-01-12 14:51:11 +00:00
Pyritie
629da2b0ea
Merge branch 'TerraFirmaGreg-Team:main' into ae2
2025-01-12 14:51:09 +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
Xikaro
0babb1175a
Revert "Update pakku-lock.json"
...
This reverts commit e7129dac26
2025-01-12 17:28:38 +05: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
Xikaro
e7129dac26
Update pakku-lock.json
2025-01-12 15:47:35 +05: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
Dmitry
ba895caa15
Update CHANGELOG.md
...
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-12 16:41:19 +07:00
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
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
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
