Commit graph

3134 commits

Author SHA1 Message Date
Pyritie
5d3f50daeb fix railways cap decolor recipe 2025-06-09 21:51:53 +01:00
Pyritie
84041d2e00 changelog 2025-06-09 21:08:50 +01:00
Pyritie
f9d2130192 changelog 2025-06-09 21:05:26 +01:00
Pyritie
917da8d00e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-09 21:01:11 +01:00
Pyritie
5be2eb1d99 welcome back stonecutter 2025-06-09 21:01:09 +01:00
Pyritie
86a35b7386 turned on the EMI default recipe button by default 2025-06-09 20:50:40 +01:00
Jean Roberto de Souza
2b3a1d8ee2
Conductor (#1144)
* Remove Scaffolding Frame recipe

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Update Scaffolding Frame recipe

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Fix Glass Jar conflict 

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Conductor Tags

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Conductor Recipes

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Update constants.js

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Update recipes.js

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* update id

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

---------

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
2025-06-09 19:34:05 +01:00
Pyritie
1a5867d956 fixes #1107 2025-06-09 18:59:05 +01:00
Pyritie
fd7ae525ff langs 2025-06-09 18:52:20 +01:00
Pyritie
d3a47fa04f changelog 2025-06-09 18:51:11 +01:00
Pyritie
c11e13c949 fixes #1149 2025-06-09 18:46:30 +01:00
GameStar
158f2c112c
gregtech facade crafting (#1145)
* Update recipes.js

* Whitelist Tag from Redeix

* Update tags.js

* fixed create copper blocks tag

* added more  blocks to facades

* Fixed industrial iron

* changed facades to tfg

* changed tag to tfg

* updated tag to tfg from ae2
2025-06-09 16:56:02 +01:00
2a0f11bd15
Include ElytraServers/Greate-Encased-Cogwheel-Drop-Fix (#1148) 2025-06-09 16:54:04 +01:00
TomPlop
e4014d1d6e
Small fixes for Empty Jar, Beekeeper quest and Assembler Chute (#1142)
* Fix Chute Assembler recipe

* Fix quest tips beekeper

* Fix for wine and jar alloy smelter conflicting recipe

* fix to fit #1141

* mistakes were made

* Fix jetpack 1 quest mv

* Mistake again

* Revert the fix on chute
2025-06-08 22:22:01 +01:00
Jean Roberto de Souza
8beb9ba090
Conflict issues fix (#1141)
* Remove Scaffolding Frame recipe

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Update Scaffolding Frame recipe

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Fix Glass Jar conflict 

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

---------

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
2025-06-08 22:21:46 +01:00
Pyritie
0ab1572392 added a bunch of circuits to create's assembler recipes 2025-06-07 23:29:34 +01:00
Pyritie
a99c2da26c changelog 2025-06-07 11:24:04 +01:00
Pyritie
7dc2130819 fixes #1134 2025-06-07 11:13:55 +01:00
Pyritie
e8c9346f8a added computercraft/advanced peripherals resource pack 2025-06-07 11:12:01 +01:00
Pyritie
1942321b1c added clean-swing-through-grass mod 2025-06-05 21:48:45 +01:00
Pyritie
6a06c5298a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-05 21:44:39 +01:00
Pyritie
80fff75580 fixes #1130 2025-06-05 21:44:37 +01:00
Xikaro
47151283b1
Merge branch 'main' into dev 2025-06-05 17:32:32 +05:00
Xikaro
08e0c40723 bump 2025-06-05 17:30:13 +05:00
Xikaro
c2b330acf0 Update pakku-lock.json 2025-06-05 12:53:22 +05:00
Xikaro
33e056943b Revert "fix merge"
This reverts commit 331f29bf06.
2025-06-05 12:48:28 +05:00
Pyritie
0d5c176d3a added a resource pack that makes some animals look nicer 2025-06-05 00:26:09 +01:00
Pyritie
331f29bf06 fix merge 2025-06-04 23:35:46 +01:00
Pyritie
5279972f48 merge 2025-06-04 23:28:02 +01:00
Pyritie
3610e29c7b changelog 2025-06-04 23:26:23 +01:00
Pyritie
3832fbbe2e langs 2025-06-04 23:25:59 +01:00
TomPlop
955a838aca
Quests work (Langfile, WIP) (#1126) 2025-06-04 23:24:40 +01:00
Pyritie
ecbc791b30 better recipes for bars, doors, trapdoors 2025-06-04 23:23:45 +01:00
Pyritie
d8c4713247 pakku moment 2025-06-04 22:36:54 +01:00
Pyritie
1f507feefa changed copper diving equipment durability to match copper armor, all diving equipment now copies any forging bonuses 2025-06-04 21:59:56 +01:00
Pyritie
3eebef1616 more greenhouse tweaks, added a recipe for grass blocks 2025-06-04 21:49:00 +01:00
Pyritie
e13960638f fixed greenhouse perfect OC 2025-06-04 21:14:15 +01:00
Pyritie
da64f9975c updating langs 2025-06-04 20:34:39 +01:00
Pyritie
3f172255ac added high quality fabric tags to phantom silk and nylon 2025-06-04 20:01:04 +01:00
Pyritie
435f514db2 increased durability of blue steel diving suit 2025-06-04 12:41:23 +01:00
Pyritie
706db40033 added tooltip for elec greenhouse overclock, improved armor insulated tooltips for more clarity 2025-06-04 12:33:24 +01:00
Pyritie
4ac7cc16a2 added perfect OC to the elec greenhouse 2025-06-04 12:30:58 +01:00
Pyritie
f6660c6a48 updated changelog (are sections like this ok?) 2025-06-04 12:24:43 +01:00
Pyritie
9de617d8b1 you can now use anthracite to superheat blaze burners like coke 2025-06-04 12:09:45 +01:00
Redeix
6a26c9b6e2
- Added loot table to piglin disguise and updated its texture. (#1123)
- Reformated lootjs file
2025-06-02 22:17:52 +01:00
Spicy Noodles
52dcc54089
Add Optional Bacon Quest (#1122)
* Add bacon quest

* Fix merging issue

* Changelog

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-02 15:45:47 -05:00
Pyritie
e237fa04f2 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-02 21:15:42 +01:00
Pyritie
e8938115ca fixed assembler crafting recipe for item silos 2025-06-02 21:15:40 +01:00
Pyritie
da452c88e3 fixed some field guide pages 2025-06-02 21:15:32 +01:00
ofoxsmith
c87af7bf16
Change lv chem reactor quest to require any container with rubber instead of a rubber bucket (#1116)
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
2025-06-02 11:07:24 -05:00