Commit graph

629 commits

Author SHA1 Message Date
Dmitry
1ecdc4bd76
Merge pull request #744 from Pyritie/patch-2
Changed LV casing/hull recipes (again)
2025-01-25 23:55:45 +07:00
Dmitry
93ee99349a
Merge pull request #745 from CaptainGold1/glowstone_lamp_fuel
Add glowstone as infinite lamp fuel
2025-01-25 23:54:59 +07:00
Dmitry
50fa27f0e7
Merge pull request #750 from Nebby1999/feature/create_sequenced_assemblying_Scraping
Automatic Scraping with Sequenced Assembly
2025-01-25 23:53:34 +07:00
Dmitry
81b06d7caa
Merge pull request #751 from Pyritie/Fixed-colored-steel-dust-centrifuge-recipes
Fixed colored steel dust centrifuge recipes
2025-01-25 23:53:07 +07:00
Dmitry
3543e8f083
Merge pull request #752 from Pyritie/patch-3
Add circuit settings to netherarium/enderarium
2025-01-25 23:52:43 +07:00
Dmitry
ab9a22d29d
Merge pull request #753 from CaptainGold1/processed-ores-heat
Adds heat values for items with valid heating recipes but no heat values
2025-01-25 23:52:11 +07:00
Dmitry
160de3cfa7
Merge branch 'main' into TFC-magma-as-passive-boiler-heater
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-25 23:48:34 +07:00
Dmitry
811f0976b0
Merge pull request #756 from CaptainGold1/cassiterite-fix
Fixed cassiterite heating "exploit"
2025-01-25 23:47:42 +07:00
Dmitry
f2d124265b
Merge pull request #758 from Nebby1999/feature/small_dust_from_failed_pressing
Get small dust from failed pressing
2025-01-25 23:45:49 +07:00
CaptainGold1
981929bab0 UNTESTED: fixes wool recipe conflict 2025-01-24 20:00:41 -06:00
Nebby1999
52f44279c9 Remove log call 2025-01-24 20:43:26 -03:00
Nebby1999
afdba67fd4 Get small dust from failed pressing 2025-01-24 20:36:50 -03:00
SverhRazum-Nah
9ad7d5a05d
Add files via upload
Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
2025-01-24 21:50:52 +03:00
CaptainGold1
8a9cd75dd6 Fixed cassiterite heating exploit 2025-01-24 12:48:21 -06:00
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
fb580befb1
Update terrariums.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-23 21:53:47 +00:00
Pyritie
030bc552d4
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-23 21:46:48 +00:00
Nebby_G
d5770b8993 Automatic Scraping with Sequenced Assembly 2025-01-23 13:40:19 -03:00
CaptainGold1
9f8defd707 Add glowstone as infinite lamp fuel 2025-01-22 16:37:20 -06:00
Pyritie
387c72d380
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-22 20:38:42 +00: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