Commit graph

4525 commits

Author SHA1 Message Date
Xikaro
9f8c814759 workflows 2025-08-24 19:04:57 +05:00
Xikaro
e689a42a3e Update build.yml 2025-08-24 18:50:46 +05:00
Xikaro
32e1e98be9 Update build.yml 2025-08-24 18:37:20 +05:00
Xikaro
eb40a67083 Update build.yml 2025-08-24 18:33:08 +05:00
Xikaro
40fc7a33be Update build.yml 2025-08-24 18:14:41 +05:00
Xikaro
043bf112a4 fix: forge-auto-install 2025-08-24 18:04:04 +05:00
Pyritie
7b999a3faf Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-24 13:05:36 +01:00
Pyritie
1bbaebc577 added higher tier AA recipe for even more water 2025-08-24 13:05:31 +01:00
Pyritie
9e1267af05
Merge branch 'main' into dev 2025-08-24 12:35:43 +01:00
Pyritie
3a10aa2742 pakku 2025-08-24 12:35:12 +01:00
Pyritie
9255cd7814 0.10.10 time 2025-08-24 12:33:19 +01:00
Pyritie
6b7e79bcec update pakku 2025-08-24 12:26:36 +01:00
Pyritie
c0203267fe removed placeholder crimson spore particle, added cave carvers back to the desert 2025-08-24 12:23:32 +01:00
Pyritie
31edc20312 fix mars water lang key 2025-08-24 11:51:49 +01:00
Pyritie
4c68e2ab59 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-24 11:47:04 +01:00
Pyritie
84656b4606 remove embeddium/sodium, add xenon 2025-08-24 11:46:55 +01:00
Pyritie
7020229573 pakku 2025-08-24 11:41:29 +01:00
Redeix
3ab8616b8f
Patchouli stuff (#1684)
* Prospecting Stuff

* correction

* another correction

* another another correction

* lets just make this better
2025-08-24 00:56:37 +01:00
Pyritie
69fa9c1b23 lang 2025-08-24 00:53:03 +01:00
Pyritie
6c27029842 fucking formatting 2025-08-23 22:19:51 +01:00
Pyritie
9b6cc9cbd1 remove old bedrock miner quest, fix typo 2025-08-23 22:18:05 +01:00
Pyritie
143db245ab fix typo 2025-08-23 22:15:49 +01:00
Pyritie
0e5940b675 chipboard composite mixing bowl unification 2025-08-23 22:09:17 +01:00
Pyritie
e4e9e10ff2 fix banana split warning 2025-08-23 22:06:32 +01:00
Pyritie
4812aa5634 langs 2025-08-23 22:01:57 +01:00
Pyritie
922670f9ed Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-23 22:01:19 +01:00
TomPlop
e64c8bc6aa
Fix Board rework (#1681)
* fix board

* remove from tag

* more update

* last changes

* Add new quests

* fix the weird file

* Fixes

* fix quest optional

* fix duplicate recipe

* more fix

* Fix fur for insulation

* an other fix
2025-08-23 22:00:35 +01:00
Pyritie
8d7abd4cf7 langs 2025-08-23 21:54:21 +01:00
Redeix
e7f1198cf6 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	kubejs/assets/tfg/blockstates/large_nest_box.json
#	kubejs/assets/tfg/blockstates/large_nest_box_warped.json
2025-08-23 14:25:33 -05:00
Redeix
5e47c4a2ef git moment 2025-08-23 14:25:24 -05:00
TomPlop
2ebfaf2e3a
Board rework (#1679)
* fix board

* remove from tag

* more update

* last changes

* Add new quests

* fix the weird file

* Fixes

* fix quest optional
2025-08-23 14:13:07 -05:00
Pyritie
ac99b9db87
Solar tweaks (#1678)
* solar tweaks

* langs
2025-08-23 18:30:27 +01:00
Pyritie
fa67078182 added moon rabbits and birts to the carryon whitelist 2025-08-23 17:16:46 +01:00
Pyritie
47c0d51d8d Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-23 17:12:27 +01:00
Pyritie
18f37c23fa removed campfire from passive heaters 2025-08-23 17:12:25 +01:00
Pyritie
de0d71a066 create additions is a buggy ass mod 2025-08-23 17:11:49 +01:00
Frédéric Nieto
c7769c1382
fix: Fixed Oven quest after tongs were removed, still need russian localization update (#1677) 2025-08-23 16:53:12 +01:00
Pyritie
8335dcc19a pakku 2025-08-23 15:01:12 +01:00
Pyritie
3b57773792 langs 2025-08-23 13:03:23 +01:00
Pyritie
a3f9193001 changed steel mech saw back to cobalt brass since you can craft it much more easily now 2025-08-23 13:01:49 +01:00
Pyritie
912bf72277 moved the lye to sodium hydroxide to the vacuumizer instead 2025-08-23 12:54:57 +01:00
Pyritie
ca8ac9d727 added some more vanilla blocks to the forge/bloomery insulation tag #1673 2025-08-23 12:37:53 +01:00
Pyritie
df9e90efa6 fix brick recipe conflict 2025-08-23 12:26:39 +01:00
Pyritie
1b8cec25ff some new quests 2025-08-22 23:44:08 +01:00
Pyritie
bd379e106f buffed these guys some more because goddamn the ae2 guns shred them 2025-08-22 23:19:48 +01:00
Pyritie
b87c42be06 langs 2025-08-22 23:11:35 +01:00
Pyritie
941a0e2d0c tags to hide the sand piles from jei 2025-08-22 22:59:56 +01:00
Pyritie
d41827abdc oh you can just change this in the config! that's cool. Also changed the infinity wand recipe 2025-08-22 22:56:06 +01:00
Pyritie
3bcbcf6d06 added recipe for new hypertube thing 2025-08-22 22:47:32 +01:00
Pyritie
3329a49049 missing hematitic sand tag 2025-08-22 22:40:54 +01:00