Commit graph

270 commits

Author SHA1 Message Date
Pyritie
cb1a7a9230 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-04-20 14:48:13 +01:00
Pyritie
30d25177bc fixed not being able to pick up spring water or use it in a barrel/mixing bowl 2025-04-20 14:42:51 +01:00
Pyritie
8b3745f72f
Refactored ore recipes and moved them out of TFG-Core (#888)
* refactored ore recipes and moved them out of TFG-Core. Also fixed the quern producing more output than the others, and added a workaround for the greate millstone bug

* fixed VI centrifuging recipes and bulk washing recipes to be consistent with their LV versions

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-20 13:34:41 +01:00
Pyritie
823508cba1 changed mud brick recipes so they don't need mortar any more
Fixes #622
Fixes #513
2025-04-19 14:27:26 +01:00
Pyritie
c83e05e473 added recipe to turn saplings into sticks 2025-04-19 14:16:43 +01:00
Pyritie
c2606c0c7b added recipe to empty the crucible 2025-04-19 13:43:44 +01:00
Pyritie
c7e4c03676 fixed mattock heads melting into the tfc liquid metals 2025-04-18 16:40:19 +01:00
Pyritie
189f5aebce
Alpha Release: additions 0.9.0 (#880)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Signed-off-by: Adora <adoradyne.58@gmail.com>
Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
Signed-off-by: CaitlynMC <135169224+CaitlynMC@users.noreply.github.com>
Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Nebby <78170922+Nebby1999@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: aidie8 <aidenvanzuilen@gmail.com>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
Co-authored-by: Adora <adoradyne.58@gmail.com>
Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
Co-authored-by: julia <97713533+juliakity@users.noreply.github.com>
Co-authored-by: GamerDadDave <gamerdaddave@gmail.com>
Co-authored-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
Co-authored-by: CaitlynMC <135169224+CaitlynMC@users.noreply.github.com>
Co-authored-by: SverhRazum-Nah <leon.trol@mail.ru>
Co-authored-by: Redeix <59435925+Redeix@users.noreply.github.com>
Co-authored-by: Nebby1999 <nebby131999@gmail.com>
2025-04-18 14:49:56 +05:00
Pyritie
ec2e3cd3c4
Alpha Release: 0.9.0 (#849)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Nebby <78170922+Nebby1999@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: aidie8 <aidenvanzuilen@gmail.com>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
2025-04-15 23:27:17 +05:00
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
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
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
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
CaptainGold1
981929bab0 UNTESTED: fixes wool recipe conflict 2025-01-24 20:00:41 -06: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
CaptainGold1
9f8defd707 Add glowstone as infinite lamp fuel 2025-01-22 16:37:20 -06: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
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
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
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
Dmitry
acf18b6e22
Merge pull request #702 from 8oyNextDoor/main
Исправил опечатку в температуре кипения морской воды для рецепта маленькой кучки соли с 1000 на 100
2025-01-18 12:53:19 +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
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
CaptainGold1
a9e446d5bb Fixed some recipes regarding dirt in the mixer 2025-01-15 15:06:29 -06:00
CaptainGold1
f30b6e38e9 Allows stick bundles to be used in the coke oven 2025-01-13 16:18:31 -06:00
Pyritie
ce3558feac
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 21:54:17 +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
Dmitry
9c4f53b690
Merge pull request #693 from Saaghh/electric-leather
electric leather
2025-01-12 11:55:50 +07: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
Dmitry
7490513d24
Merge pull request #687 from Saaghh/more-greenhouse-plants
Added greenhouse recipes for tfc plants tag
2025-01-11 14:20:28 +07:00
Sergey Semin
ea075ec8b5 fix again 2025-01-11 04:41:40 +03:00
Sergey Semin
7cc1ce81d1 Added greenhouse recipes for tfc plants tag 2025-01-11 03:03:10 +03:00
Dmitry
ff43daae07
Merge pull request #639 from Pyritie/patch-1
Fixed not being able to make cobble in assembler
2024-12-29 15:48:21 +07:00
Dmitry
aff372980b
Merge pull request #640 from Pyritie/patch-2
Added recipe for metal bars
2024-12-29 15:48:09 +07:00
Pyritie
386dd79bb3
Fixed red alloy crucible recipe
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-23 16:57:37 +00:00
Pyritie
bd3289fbb9
Added recipe for metal bars
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-22 17:29:00 +00:00