Commit graph

650 commits

Author SHA1 Message Date
Dmitry
8e6e1318e5
Merge pull request #733 from Egogorka/fix-collapsible-bricks
Fix collapsible brick slab blocks
2025-01-26 00:03:32 +07:00
Dmitry
c0a53cab62
Merge pull request #732 from AirRice/sign-exploit-squasher
Hanging Sign Metal Dupe fix
2025-01-26 00:01:51 +07:00
Dmitry
d8fa521bc9
Merge pull request #739 from Nebby1999/main
Feature:  Papermaking Overhaul with Wood
2025-01-26 00:00:21 +07:00
Dmitry
5a5260a542
Merge branch 'main' into main
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-25 23:58:43 +07:00
Dmitry
d8c37eac78
Merge pull request #742 from Metriximor/main
Add seaweed and kelp drying recipes
2025-01-25 23:56:42 +07:00
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
Metriximor
5ddda569d9
Add item heat to kelp and seaweed
Signed-off-by: Metriximor <metriximor@gmail.com>
2025-01-22 10:43:12 +00:00
Metriximor
f30cd26a0e
Add seaweed and kelp drying recipes
Signed-off-by: Metriximor <metriximor@gmail.com>
2025-01-21 20:27:49 +00:00
Nebby_G
3dc98922a9 Replace blasting charcoal recipe 2025-01-21 13:00:17 -03:00
Nebby_G
6bc6af4641 Comply with Initial Review 2025-01-20 20:57:32 -03:00
Deneth Weerasinghe
ed7d9c854a
Added circuit 0 to new cloth to wool recipe
Signed-off-by: Deneth Weerasinghe <11477150+deneth-weerasinghe@users.noreply.github.com>
2025-01-20 23:16:01 +00:00
Deneth Weerasinghe
1e8f089259
Assembler recipe to turn cloth into wool
Signed-off-by: Deneth Weerasinghe <11477150+deneth-weerasinghe@users.noreply.github.com>
2025-01-20 22:10:18 +00:00
Deneth Weerasinghe
0aa0b22c69
Set circuit 0 to assembler string to cloth recipes
Signed-off-by: Deneth Weerasinghe <11477150+deneth-weerasinghe@users.noreply.github.com>
2025-01-20 22:08:08 +00:00
Deneth Weerasinghe
2064d07334
Assembler wool from string consistency
Signed-off-by: Deneth Weerasinghe <11477150+deneth-weerasinghe@users.noreply.github.com>
2025-01-20 22:02:28 +00:00
Deneth Weerasinghe
56a630e679
Incorrect comment label
Signed-off-by: Deneth Weerasinghe <11477150+deneth-weerasinghe@users.noreply.github.com>
2025-01-20 21:43:29 +00:00
Nebby_G
382fa8c4c5 Finished Implementation, added to Field Guide 2025-01-20 14:29:42 -03:00
Nebby_G
f56ec8a90b Merge tag '0.7.18' 2025-01-19 21:30:24 -03:00
Nebby_G
9f9a9f229a More Hardwood work 2025-01-19 21:30:03 -03:00
Egogorka
15d5341c79
Update tags.js - adds brick tags to brick items
Signed-off-by: Egogorka <35399166+Egogorka@users.noreply.github.com>
2025-01-19 15:21:31 +03:00
AirRice
f0a4f4f57b fix hanging sign metal exploit 2025-01-19 08:34:23 +00:00
Nebby_G
2731ac8de4 Merge remote-tracking branch 'upstream/main' 2025-01-18 12:12:07 -03:00
Nebby_G
6c36949dc1 Hardwood Materials, items made 2025-01-18 12:11:03 -03: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