Commit graph

6197 commits

Author SHA1 Message Date
be4b92ce2c schlanguish 2026-01-18 14:21:33 +02:00
478088e311 readme 2026-01-18 14:11:13 +02:00
1c1fef1117 readme 2026-01-18 13:56:43 +02:00
4078857909 added resource pack and kube stuff 2026-01-09 15:12:59 +02:00
be3719ed10 lglbgllgbllbg 2026-01-09 15:10:33 +02:00
9c58b46a73 removed vs sails and ihearttfc 2026-01-08 15:23:20 +02:00
021711d12d removed crash assistant 2026-01-08 13:30:40 +02:00
f7c795a072 removed hit and run 2026-01-08 13:29:35 +02:00
f2d1e9c88f added blank recipe kubejs scripts, added create propulsion 2026-01-08 13:03:32 +02:00
9daac06580 added create tweaked controllers, drive by wire and interactive 2026-01-07 23:08:14 +02:00
88c5642279 updated tfcpain 2026-01-07 23:05:39 +02:00
d51a758411 added cogslop 2026-01-07 23:01:07 +02:00
11a2161791 merged from upstream 2026-01-05 16:56:18 +02:00
c1b2ca97d0 oopsies 2026-01-05 16:50:41 +02:00
Xikaro
ac330fe9d4
Merge pull request #2628 from TerraFirmaGreg-Team/dev
Release: 0.11.16
2026-01-05 19:26:04 +05:00
3a06cef334 nyabau 2026-01-05 16:13:22 +02:00
Pyritie
f1aaae8fe2
Merge branch 'main' into dev 2026-01-05 14:09:58 +00:00
Pyritie
6d5c2b3cfd fix quest 2026-01-05 14:06:30 +00:00
Pyritie
0e9c6c571c 0.11.16 + pakku 2026-01-05 14:05:10 +00:00
Pyritie
2b3808092e langs + field guide 2026-01-05 14:03:47 +00:00
Pyritie
420d8a85bf add components to glowstone 2026-01-05 13:57:22 +00:00
Pyritie
423aec9291 oh I'm stupid 2026-01-05 13:57:10 +00:00
Pyritie
9e3d106504 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-05 13:38:16 +00:00
thederpysockdude123
c17679c64d
Add ad astra metal blocks to domum ornamentum blocks whitelist (#2627)
* Update tags.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* added Ad Astra metal blocks to domum ornamentum blocks whitelist

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* gave the Ad Astra metal blocks a block tag

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* Update tags.js

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* dw about that

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* removed some s's so KubeJS behaves

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* removed some s's so KubeJS behaves

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

* added Ad Astra metal blocks to domum ornamentum blocks whitelist (fr this time)

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>

---------

Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-05 13:38:04 +00:00
Xikaro
90775f0855 Update build.yml 2026-01-05 18:10:49 +05:00
Xikaro
e7890a1ea5 Update build.yml 2026-01-05 18:02:31 +05:00
Pyritie
e0391bbaef add more fluids to the non-placeable tag 2026-01-05 12:55:07 +00:00
Pyritie
4ab41f33f5 fix kjs error with the pills 2026-01-05 12:54:44 +00:00
Xikaro
7ead0d43f5 Update build.yml 2026-01-05 17:45:41 +05:00
Pyritie
d686c18336 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-05 12:43:43 +00:00
Pyritie
9cdd11646c quest tweaks + langs 2026-01-05 12:43:40 +00:00
Xikaro
d55d1fac3b feat: docker 2026-01-05 17:29:39 +05:00
Pyritie
e57e1cff59 fix some warnings 2026-01-05 12:28:57 +00:00
Pyritie
45aca7793c age=7 doesn't exist 2026-01-05 12:27:08 +00:00
Pyritie
71ad3bf3aa langs 2026-01-05 12:22:02 +00:00
Pyritie
16c44e78fb nah ok this can start with fewer hits 2026-01-05 12:14:17 +00:00
Pyritie
2e6f78845c add recipe to make unrefined paper with the helve #2621 2026-01-05 12:13:51 +00:00
Yan
0c56f0e7a8
feat: update zh_cn translation (#2623)
Co-authored-by: 闫茂源 <yanmaoyuan@baijiayun.com>
2026-01-04 23:45:29 -06:00
Pyritie
b50c48c035 rename the beneath boat entry 2026-01-05 02:07:20 +00:00
Pyritie
32ca043d3f Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-05 02:05:26 +00:00
Pyritie
b6c68ac934 buffed hp of beasts 2026-01-05 02:04:46 +00:00
Petr211071
4b97a0164c
ru_ru translation update (#2622)
* Update arborfirmacraft.json

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

* Update beneath.json

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

* Marsian trees

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>

* remove burn warning

Signed-off-by: Pyritie <pyritie@gmail.com>

---------

Signed-off-by: Petr211071 <55793813+Petr211071@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-01-05 01:57:00 +00:00
Pyritie
772d859d4b changelog, langs 2026-01-05 01:42:06 +00:00
Pyritie
a6c4e02e36 recolored diamond gregtech things 2026-01-05 01:38:51 +00:00
Pyritie
919bbbf0a4 DA NETHERLANDS 2026-01-05 01:22:44 +00:00
Pyritie
c9f1a8dcf5 fix filter on gurman recipes since they're still broken, tweak blast furnace tips section 2026-01-05 01:09:47 +00:00
Pyritie
60afdc7f55 fix ladder consistency #2616 2026-01-05 00:16:02 +00:00
Pyritie
f804638592 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-05 00:09:40 +00:00
Pyritie
895fe026c3 temp fix for a tfc-gurman tag error 2026-01-05 00:09:37 +00:00
Pyritie
d9c35bba9d fix #2619 2026-01-05 00:00:01 +00:00