Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,097 Commits 4 Branches 84 Tags
ed335689443d67eae9f4488dbb9b97570cdc82a8
Commit Graph

3097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pyritie
ed33568944 Merge branch 'dev' into feature/create-6 2025-06-02 22:43:49 +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
eso
043e1655d0 add the create toolbox to the list of unsortable inventories (#1120) 
* add the create toolbox to the list of unsortable inventories

* changelog update
 2025-06-02 11:05:15 -05:00
Pyritie
b1187d43ef removed ftb-quests-optimizer because it's causing problems with quests not completing 2025-06-02 10:30:47 +01:00
Pyritie
7a3c5647b3 removed sparks_on_sulfur tag 2025-06-01 21:32:45 +01:00
Pyritie
c955b8ab04 Merge branch 'dev' into feature/create-6 2025-06-01 21:14:16 +01:00
Pyritie
2027047130 reverted the sugars change 2025-06-01 18:26:42 +01:00
Pyritie
08b8cf7f1c changed the sugars recipe to just work for everything 2025-06-01 18:24:11 +01:00
Spicy Noodles
d83a774a63 TFC sugar recipes use tfg:sugars tag and kaolin dupe fix (#1099) 2025-06-01 12:21:31 -05:00
Pyritie
916ea99440 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-01 18:14:03 +01:00
Pyritie
e4d943eab4 langs 2025-06-01 18:14:01 +01:00
Jean Roberto de Souza
a85f4dafe3 Winemaking Recipes (#1111) 
* Winemaking recipes

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

* Update CHANGELOG.md

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

* Update CHANGELOG.md

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-01 12:06:03 -05:00
Pyritie
dcd975a430 added tfc anvil helper resource pack 2025-06-01 16:47:29 +01:00
Pyritie
50bec53f30 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-01 15:58:23 +01:00
Pyritie
76064bd8d2 reverted the modernfix revert, added changelog #1102 2025-06-01 15:58:21 +01:00
Xikaro
cec84cef50 fix #1102 2025-06-01 19:54:53 +05:00
Pyritie
7b5e3ab204 changed modernfix back to an older version because it was removing tooltips and jade information. Also added back better-foliage 2025-06-01 15:32:53 +01:00
Pyritie
996d3cccd4 Revert "pakku updates" 
This reverts commit 6f550a8daa.
 2025-06-01 00:05:20 +01:00
Pyritie
6f550a8daa pakku updates 2025-06-01 00:04:53 +01:00
Pyritie
1d2a9125da remove betterfoliage (it is not, in fact, better) 2025-05-31 23:55:55 +01:00
Pyritie
3908a5cf06 changelog 2025-05-31 19:43:53 +01:00
Pyritie
a9d35c95d1 changelog 2025-05-31 19:35:52 +01:00
Pyritie
050c90ae35 I finally found that pesky "combatting lag" quest 2025-05-31 19:35:02 +01:00
Pyritie
3f0206f35c ore processing chapter tweaks 2025-05-31 19:34:49 +01:00
Pyritie
9bea38834b fixes #1108 2025-05-31 19:34:26 +01:00
Pyritie
58a4c3ee55 Changed materials of steam grinder/oven, HS greate things, HV cutter 2025-05-31 15:14:53 +01:00
Pyritie
dc96173174 Fixes #1103 2025-05-31 15:14:16 +01:00
Pyritie
0b47224d98 added better aqueous accumulator machine textures, added a quest for it, rearranged LV a bit because it was getting cramped 2025-05-31 15:14:03 +01:00
Pyritie
17e7981da7 merge 2025-05-31 13:22:08 +01:00
Pyritie
2ceba8b259 aqueous accumulator recipes 2025-05-31 13:21:37 +01:00
Redeix
e0cbe907f4 Trowel item (#1106) 
* - Changed the weird assembler piston recipe.

* - Updated Changelog

* - Added Trowel tool.
- Increased size of piglin disguise to prevent texture clipping.

* - Updated Changelog
 2025-05-31 11:35:36 +01:00
Pyritie
6f5ce5e6d7 langs 2025-05-31 03:15:12 +01:00
Pyritie
d5d395f9c7 langs for aqueous accumulator 2025-05-31 02:36:53 +01:00
Pyritie
43d3717900 brazilian portuguese langs 2025-05-31 02:33:41 +01:00
Pyritie
fae04de6f4 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-31 00:28:32 +01:00
Pyritie
5efc7a607d removed the "nether hint vein" because it's just confusing people 2025-05-31 00:28:26 +01:00
Jean Roberto de Souza
eb182e18b8 Stick Bundling (#1101) 
Just packer recipes to make compacting sticks easier

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
 2025-05-31 00:22:34 +01:00
Pyritie
3055a9a230 removed dogs and cats from the carryon whitelist because it was getting in the way of the keybind to assign commands to them 2025-05-30 22:45:40 +01:00
TomPlop
6ad1717237 Fix for Hopper conflict with Assembler (#1098) 2025-05-30 19:58:37 +01:00
Pyritie
0828126688 removed spark because it makes macos crash (fixes #1096) 2025-05-30 14:55:21 +01:00
Pyritie
2a6db3a271 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-30 12:51:30 +01:00
Xikaro
c24ac801bd Update pakku.json 2025-05-30 12:49:52 +01:00
Xikaro
261a266450 Update pakku.json 2025-05-30 15:26:16 +05:00
Redeix
2bf3746f33 - Changed the weird assembler piston recipe. (#1092) 
* - Changed the weird assembler piston recipe.

* - Updated Changelog
 2025-05-30 08:24:11 +01:00
Pyritie
df499fc8ff changelog for #947 2025-05-30 00:36:40 +01:00