Commit graph

610 commits

Author SHA1 Message Date
CaptainGold1
42e6665ee3 Added heat values for blocks and log rods 2025-01-23 23:00:09 -06:00
CaptainGold1
c71dff649b Fixed crushed/processed ores not heating 2025-01-23 22:25:50 -06:00
Pyritie
20050fa3eb
Merge branch 'main' into patch-5 2025-01-18 12:18:38 +00:00
Pyritie
28b86c9ff3
Merge branch 'main' into patch-5 2025-01-18 11:11:31 +00:00
Pyritie
f53dfcb847
Merge branch 'main' into create-additions 2025-01-18 10:37:20 +00:00
Curtis Merrill
34c46c3b0d create some rich coal recipes in coke oven and pyro oven 2025-01-18 03:59:24 -05:00
Dmitry
c28b64a9c8
Merge branch 'main' into create-additions 2025-01-18 13:21:30 +07:00
Dmitry
acf18b6e22
Merge pull request #702 from 8oyNextDoor/main
Исправил опечатку в температуре кипения морской воды для рецепта маленькой кучки соли с 1000 на 100
2025-01-18 12:53:19 +07:00
Pyritie
eaace89b0a
Update main_server_script.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-18 00:04:19 +00:00
Pyritie
9e34df8ffc
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 23:58:43 +00:00
Pyritie
f42fbd7239
Delete kubejs/server_scripts/tfg/recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 23:58:20 +00:00
Pyritie
324ac1adda
Merge branch 'main' into create-additions
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 22:10:34 +00:00
Pyritie
5035130495
Merge branch 'main' into mv_superwire
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 17:52:01 +00:00
Dmitry
c49c9e7ebb
Merge branch 'main' into main
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 00:38:10 +07:00
Dmitry
26e1d84be0
Merge pull request #723 from Pyritie/rails
Changed train tracks to be cheaper
2025-01-18 00:36:17 +07:00
Dmitry
5195828a09
Merge pull request #722 from CaptainGold1/dirt_mixer_fixes
Fixes fertilizer recipe and modifies some mixer recipes relating to dirt
2025-01-18 00:35:43 +07:00
Dmitry
2f43a94b27
Merge pull request #721 from KorGgenT/flux
create fluxstone recipes in macerator and forge hammer
2025-01-18 00:34:51 +07:00
Dmitry
256f6184d4
Merge pull request #720 from Egogorka/fix-dupes-patch
Fix dupes via recycling firmaciv items
2025-01-18 00:33:44 +07:00
Dmitry
ed1becf35d
Merge branch 'main' into colored_glass_macerate
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 00:32:00 +07:00
Dmitry
2ab6853ae7
Merge pull request #712 from CaptainGold1/stick_bundle_coke_oven
Allows stick bundles to be used in the coke oven
2025-01-18 00:30:37 +07:00
Dmitry
29fe3d4e66
Merge branch 'main' into trims
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 00:28:09 +07:00
Dmitry
d319067a8e
Merge pull request #705 from Pyritie/patch-1
Added missing recipe for nether brick
2025-01-18 00:26:31 +07:00
Dmitry
4c0d7f360c
Merge pull request #704 from Pyritie/glass
Added recipes for create glass, more windows, fixed tinted glass recipe conflict
2025-01-18 00:25:52 +07:00
Pyritie
793cc7676c
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-16 00:23:48 +00:00
Pyritie
9983d34d45
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 23:55:45 +00:00
Pyritie
afc055ec0a
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 23:54:33 +00:00
CaptainGold1
a9e446d5bb Fixed some recipes regarding dirt in the mixer 2025-01-15 15:06:29 -06:00
Curtis Merrill
2b5d388c09 create fluxstone recipes in macerator and forge hammer 2025-01-15 15:51:51 -05:00
Egogorka
1ebf496587
fix dupes via firmaciv items
Signed-off-by: Egogorka <35399166+Egogorka@users.noreply.github.com>
2025-01-15 22:53:02 +03:00
Nebby_G
deed3c4849 Add silk to tag, redo comments 2025-01-15 13:22:26 -03:00
Pyritie
ffaa650288
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 11:50:37 +00:00
Pyritie
72ecc7ec89
Update main_server_script.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 11:47:12 +00:00
Pyritie
180e593c7e
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 11:46:18 +00:00
Nebby_G
a9db4c5754 Remove create sail conversions 2025-01-14 21:24:36 -03:00
Nebby_G
ba87e796f3 Add more accesible create sails 2025-01-14 21:20:03 -03:00
CaptainGold1
56b631346a Removed create_connected glass panes 2025-01-13 20:07:20 -06:00
CaptainGold1
edfe28034b Allows all colors of glass to be macerated/hammered to dust 2025-01-13 16:57:49 -06:00
CaptainGold1
f30b6e38e9 Allows stick bundles to be used in the coke oven 2025-01-13 16:18:31 -06:00
Pyritie
5b834e6a05
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:58:30 +00:00
Pyritie
c5e5193da3
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:58:15 +00:00
Pyritie
65dd5e4ac5
Update main_server_script.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:57:57 +00:00
Pyritie
52c31181cc
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:41:11 +00:00
Pyritie
8eaa363f38
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:31:40 +00:00
Pyritie
66a1f2cc3b
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:04:01 +00:00
Pyritie
11b5790bd3
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 02:45:03 +00:00
Pyritie
1a29e4cfa0
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 01:17:21 +00:00
Pyritie
478b9ff3f6
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 01:14:56 +00:00
Pyritie
d2b75c170a
Add files via upload
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 01:12:40 +00:00
Pyritie
dde2ec68e9
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 22:26:02 +00:00
Pyritie
6b81d71177
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 22:02:36 +00:00