Commit graph

2930 commits

Author SHA1 Message Date
Pyritie
dc99a50fe7 fixed moon rabbit houses 2025-05-13 16:34:14 +01:00
Pyritie
96aae3ae33 finished adding spikes for all rocks 2025-05-13 16:24:00 +01:00
Pyritie
e102e89f09 added spikes for all ad astra rocks 2025-05-13 15:48:30 +01:00
Pyritie
9262133484 merge 2025-05-13 10:55:31 +01:00
Pyritie
0e7254559a Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space 2025-05-13 10:53:13 +01:00
Pyritie
4aee3b2f51 added proper loose rock, rock pile, and rock delta features for all the moon rock types, added coral features, retextured warped vines 2025-05-13 10:53:11 +01:00
Pyritie
43560cb1c3 this fucking lang that I hate 2025-05-13 10:52:15 +01:00
Redeix
a097ec6174
Merge branch 'dev' into dev
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-13 01:25:09 -05:00
Redeix
a2ed5209c2 - Revert mold changes from #987 2025-05-13 01:19:09 -05:00
SverhRazum-Nah
72c2bce583
salt water fast fix (#992)
no more circuits

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
2025-05-12 20:23:08 -05:00
Redeix
550f658ac5
Merge branch 'hv_moon_quest' into feature/space
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-12 12:28:05 -05:00
Zack
f1fadb4e99
Add wrought iron alternatives for early game cast iron recipes (#985)
* Add wrought iron alternatives for early game cast iron recipes

* Change doulbe iron ingots tag to use #forge item tags
2025-05-12 11:02:11 -05:00
Redeix
cf54f584b4
Fixes and features (#987)
* - Fixed hide duping recipes.
- Added quest book and field guide instances for fishing nets.
- Fixed rebar support recipe crash.
- Fixed red steel flask dupe.
- Fixed red alloy recipe inconsistency.

* - Fixed blue steel backpack block lang

* - Added max vessel fluid warning to small vessels.

* - Moved red steel flask recipe

* - Fixed fishing nets event function

* Update queststfc_tips.snbt

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* Update en_us.json

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added item to summon armor stands with arms

* - Added recipes to empty vessels and molds

* - Added recipes for extracting/ forming magma blocks.

* - Added recipes for extracting/ forming magma blocks.

* - Nerfed steel support recipe output.

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-12 12:29:10 +01:00
Redeix
1b3e4c98db - Nerfed steel support recipe output. 2025-05-11 23:33:00 -05:00
Redeix
f2d98359de - Added recipes for extracting/ forming magma blocks. 2025-05-11 23:22:38 -05:00
Redeix
0d96bc775a - Added recipes for extracting/ forming magma blocks. 2025-05-11 23:22:30 -05:00
Redeix
7176adfc8d - Added recipes to empty vessels and molds 2025-05-11 22:49:16 -05:00
Redeix
9564090c1b - Added item to summon armor stands with arms 2025-05-11 22:15:31 -05:00
Redeix
80d2acac57
Update en_us.json
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-11 21:23:34 -05:00
Redeix
afdbc82416
Update queststfc_tips.snbt
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-11 21:21:45 -05:00
Redeix
e47e591c02 - Fixed fishing nets event function 2025-05-11 21:14:36 -05:00
Redeix
83edfb98b1 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	CHANGELOG.md
#	kubejs/assets/tfg/lang/en_us.json
#	kubejs/client_scripts/tooltips.js
2025-05-11 21:11:46 -05:00
Pyritie
3b9c6e32a6 added recipes for the other millstones 2025-05-11 18:57:03 +01:00
Pyritie
34b32b8377 updated changelog 2025-05-11 18:26:28 +01:00
Pyritie
f4c82abc1e added assembler recipes for greate things 2025-05-11 18:26:07 +01:00
Pyritie
92d0146ee0 changed default flywheel setting back to instanced 2025-05-11 17:54:10 +01:00
Pyritie
dc0647f917 merge 2025-05-11 17:53:55 +01:00
Pyritie
1771c2eecc made the steam multiblock inputs/outputs significantly cheaper 2025-05-11 17:52:18 +01:00
Pyritie
594fd5ee16 oh so THAT's why the recycling recipes weren't working... 2025-05-11 17:52:01 +01:00
Risuga
68eaf58693
Buff Large Boiler Fuel Efficiency (#977)
* bufflargeboilers

* formatting
2025-05-11 17:29:24 +01:00
Pyritie
e9a43b6a7a fixes #931 2025-05-11 17:25:16 +01:00
Pyritie
3baa373313 hopper in assembler now has a circuit condition 2025-05-11 17:24:58 +01:00
Pyritie
3aafbc709a fixed iron door inconsistency 2025-05-11 17:24:36 +01:00
Pyritie
3bad04a06b removed the leather armor recycling because it's basically infinite armor 2025-05-11 17:20:14 +01:00
Pyritie
9f0c8a35ca removed gt compressed clay, fixed assembler recipe for clay bricks 2025-05-11 17:05:32 +01:00
Pyritie
8f67db7554 langs 2025-05-11 16:59:07 +01:00
Pyritie
26438a6165 added assembler recipes for most create things, made steam engines, blaze burners, and alternators cheaper, made firmaciv sails use any fabric 2025-05-11 16:59:03 +01:00
Pyritie
b9af0c3afe quest fixes, lang strings 2025-05-11 15:55:19 +01:00
Pyritie
07880e5783 added recipes for greenhouse ports, added recipes for stainless steel greenhouse (if you want to be fancy) 2025-05-11 15:35:35 +01:00
Pyritie
58641ad8db moon biome/feature updates, added chorus plants 2025-05-10 15:00:09 +01:00
Pyritie
0130abd232 lang update 2025-05-10 14:59:40 +01:00
Pyritie
65384ea36a fixed missing tooltips on AFC wooden supports 2025-05-10 11:35:48 +01:00
Pyritie
94de3037e4 added "requiresNaturalLog" config to afc tree tapping recipes so you can't tap your house 2025-05-10 02:33:44 +01:00
Pyritie
ad10795d7c chorus plants! 2025-05-10 02:32:19 +01:00
Pyritie
dfa3ccd967 removed kjs moon plants since they're in tfg-core now 2025-05-09 21:16:36 +01:00
Pyritie
461cb8912b Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space 2025-05-09 21:14:43 +01:00
Pyritie
cdef2a2884 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-09 21:14:33 +01:00
Pyritie
719db1c422 added detected-setblock-be-gone to pakku server 2025-05-09 19:22:20 +01:00
TomPlop
6ff217e21b
New crafting process for the Tier 1 Rocket (#971)
* Rocket craft

* fix name for asbestos

Signed-off-by: TomPlop <tomdidome@gmail.com>

* fix asbestos name

Signed-off-by: TomPlop <tomdidome@gmail.com>

* remove wires for rocket alloy and fix asbestos

Signed-off-by: TomPlop <tomdidome@gmail.com>

---------

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-05-09 17:51:57 +01:00
Risuga
91185360db
Field guide updates (#973) 2025-05-09 08:31:25 +01:00