Skip to content

Commit 135f8cb

Browse files
authored
Merge pull request #2831 from TerraFirmaGreg-Team/dev
Release: 0.11.18
2 parents ac5d6a2 + 13bc6a2 commit 135f8cb

File tree

228 files changed

+4916
-3322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+4916
-3322
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ jobs:
347347
sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/docker-overrides/docker-compose.yml
348348
349349
- name: 📝 Cache Pakku
350-
uses: actions/cache@v5.0.1
350+
uses: actions/cache@v5.0.2
351351
id: cache
352352
with:
353353
path: build/.cache

CHANGELOG.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,48 @@
33
## Unreleased
44
### Changes
55
### Bug fixes
6+
### Translation updates
7+
8+
## [0.11.18] - 23-01-2026
9+
### Important notes
10+
If you missed it, 0.11.17 was a Beta version with other important breaking changes. Be sure to [read it](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/releases/tag/0.11.17) as well!
11+
- OC has been fixed on the Pisciculture Fishery and Hydroponics Facility. You will have to break and replace the machine for the fix to take effect.
12+
- The Saltpeter chemical reactor recipe is now on circuit 2, to avoid a conflict with Nitrous Oxide (#2826) @Pyritie
13+
### Breaking changes we forgot to write last time
14+
- Water wheels now *require* flowing water to work correctly. So you can't just put them in a lake, but you can make little flows off the side of it or use aqueducts and those should work. Other than that, they should have their same stress numbers as before.
15+
#### Stone dusts and other rock-related changes
16+
- Individual stone dusts for each rock type have been removed, instead being replaced with more general dusts based on rock composition. The centrifuging recipes have also been removed, though we plan on using these for something else later.
17+
- Marble/chalk dust has been replaced with Carbonate Sedimentary dust in concrete-related recipes
18+
- The Moon Sand in the Regolith Vapor recipe has been replaced with Asurine Dust (renewable via Rock Breaker)
19+
- The Mars rock dusts in the Hexafluorosilic Acid recipe has been replaced with Ochrum Dust (renewable via Rock Breaker)
20+
- Other recipe and tag unifications for consistency, like all cobbles should landslide, all slabs should be craftable the same way, etc
21+
### Changes
22+
- Fixed balancing issues with the Aquaponics Loop. @Redeix
23+
- Mars log electric greenhouse recipes now output the same amount of logs as earth log recipes @Pyritie
24+
- Geodes (in newly generated chunks) are now completely solid so they won't cause cave-ins any more @Pyritie
25+
- Recolored the different oils so you can actually tell them apart visually @Pyritie
26+
- The food meter's saturation level is now indicated by a gold outline instead of a red one, so it's less difficult to see (#2812) @TreyR9
27+
- Changed some of the colors of Greate things to make the different tiers more visually distinct @Pyritie
28+
- Buffed ore washing and ore maceration recipes so at least they aren't so awful compared to Greate's methods @Pyritie
29+
- Added TFG's crops to the field guide's Wild Crops entry @Petr211071
30+
- You can now drink concrete @Pyritie
31+
### Bug fixes
32+
- Fixed a config bug causing waves to deposit shells etc with 100% chance. @Mqrius
33+
- Fixed a bug preventing the Pisciculture Fishery and Hydroponics Facility from overclocking. @Redeix
34+
- Fixed not being able to make glass tubes out of glass dust (#2795) @thederpysockdude123
35+
- Fixed roads losing their movement speed bonus (#2790) @Pyritie
36+
- Fixed water wheels misbehaving again (#2791) @Pyritie
37+
- Fixed not being able to cast steel or higher tier materials into ceramic molds (#2789, #2794) @Pyritie
38+
- Fixed the Ad Astra airlock not counting as a cleanroom door (#2808) @thederpysockdude123
39+
- Removed some leftover rock dust centrifuge recipes (#2804) @thederpysockdude123
40+
- Fixed some mars plants self-destructing @Pyritie
41+
- Fixed mossy cobblestone not collapsing @Pyritie
42+
- Fixed welding not preserving forging bonuses (#2827) @Pyritie
43+
### Translation updates
44+
- Spanish @NikoNeko17
45+
- Russian @Petr211071
46+
- Chinese (simplified) @jmecn
47+
- Japanese @sakura-gondra
648

749
## [0.11.17] - 20-01-2026
850
### Important note

config/blockrunner-client.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Prevent running on blocks with higher speeds from changing the field of view.
22
disable_field_of_view_changes = true
33
#Add a tooltip to blocks that have an altered block speed with the multiplier.
4-
block_speed_multiplier_tooltip = false
4+
block_speed_multiplier_tooltip = true
55

config/blockrunner.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
{
22
"schema_version": "2",
3-
"minecraft:dirt_path": 1,
4-
"#blockrunner:slow_blocks": 1,
5-
"#blockrunner:very_slow_blocks": 1,
6-
"#blockrunner:quick_blocks": 1,
7-
"#blockrunner:very_quick_blocks": 1,
8-
"#blockrunner:slightly_slow_blocks": 1,
9-
"#blockrunner:slightly_quick_blocks": 1,
10-
"#minecraft:stone_bricks": 1
3+
"#tfc:paths": 1,
4+
"rnr:hoggin": 1.1,
5+
"rnr:hoggin_slab": 1.1,
6+
"rnr:hoggin_stairs": 1.1,
7+
"#rnr:gravel_road_blocks": 1.1,
8+
"#rnr:overheight_gravel_blocks": 1.1,
9+
"#rnr:macadam_road_blocks": 1.2,
10+
"#rnr:sett_road_blocks": 1.2,
11+
"#rnr:flagstones_blocks": 1.2,
12+
"#rnr:cobbled_road_blocks": 1.2,
13+
"#rnr:functional_concrete_roads": 1.3,
14+
"#rnr:functional_concrete_road_stairs": 1.3,
15+
"#rnr:functional_concrete_road_slabs": 1.3
1116
}

config/crash_assistant/modlist.json

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,13 @@
452452
"curseForgeHash": 3915242941,
453453
"modrinthHash": "338704cdf6623ad96983e72e81e8a9d97e8b28d8"
454454
},
455+
"createstockbridge-1.20-0.1.5.jar": {
456+
"jarName": "createstockbridge-1.20-0.1.5.jar",
457+
"modId": "createstockbridge",
458+
"version": "0.1.5",
459+
"curseForgeHash": 3147522607,
460+
"modrinthHash": "0fa15f11788e3bc3a812fc597ade17af33888952"
461+
},
455462
"CreativeCore_FORGE_v2.12.32_mc1.20.1.jar": {
456463
"jarName": "CreativeCore_FORGE_v2.12.32_mc1.20.1.jar",
457464
"modId": "creativecore",
@@ -718,12 +725,12 @@
718725
"curseForgeHash": 1064675696,
719726
"modrinthHash": "1ef101b4c5991cc239d9b56a95500e3b404228f7"
720727
},
721-
"ftb-teams-forge-2001.3.1.jar": {
722-
"jarName": "ftb-teams-forge-2001.3.1.jar",
728+
"ftb-teams-forge-2001.3.2.jar": {
729+
"jarName": "ftb-teams-forge-2001.3.2.jar",
723730
"modId": "ftbteams",
724-
"version": "2001.3.1",
725-
"curseForgeHash": 1240744296,
726-
"modrinthHash": "c2af94e0b86631cb75daa8de2377ff72527651ca"
731+
"version": "2001.3.2",
732+
"curseForgeHash": 816412664,
733+
"modrinthHash": "c49023f5d471aa1ba7fc624d2565fe9e82b7117e"
727734
},
728735
"ftb-xmod-compat-forge-2.1.3.jar": {
729736
"jarName": "ftb-xmod-compat-forge-2.1.3.jar",
@@ -1017,12 +1024,12 @@
10171024
"curseForgeHash": 544928077,
10181025
"modrinthHash": "24e6611df470afd957eafd16c43890b7214e3da9"
10191026
},
1020-
"modernfix-forge-5.25.2+mc1.20.1.jar": {
1021-
"jarName": "modernfix-forge-5.25.2+mc1.20.1.jar",
1027+
"modernfix-forge-5.26.1+mc1.20.1.jar": {
1028+
"jarName": "modernfix-forge-5.26.1+mc1.20.1.jar",
10221029
"modId": "modernfix",
1023-
"version": "5.25.2+mc1.20.1",
1024-
"curseForgeHash": 3074548209,
1025-
"modrinthHash": "4069534174e618393f0c14d9dc61ac27a04bb992"
1030+
"version": "5.26.1+mc1.20.1",
1031+
"curseForgeHash": 424935770,
1032+
"modrinthHash": "fa0163b33e911b69af61fee8a3920820e7c617a0"
10261033
},
10271034
"ModernUI-Forge-1.20.1-3.12.0.1-universal.jar": {
10281035
"jarName": "ModernUI-Forge-1.20.1-3.12.0.1-universal.jar",
@@ -1122,12 +1129,12 @@
11221129
"curseForgeHash": 3233971835,
11231130
"modrinthHash": "cc0332d3bbf7824b673abc59e231f1f5aafc6420"
11241131
},
1125-
"particle_core-0.2.6+1.20.1+forge.jar": {
1126-
"jarName": "particle_core-0.2.6+1.20.1+forge.jar",
1132+
"particle_core-0.3.1+1.20.1+forge.jar": {
1133+
"jarName": "particle_core-0.3.1+1.20.1+forge.jar",
11271134
"modId": "particle_core",
1128-
"version": "0.2.6+1.20.1+forge",
1129-
"curseForgeHash": 4189650687,
1130-
"modrinthHash": "91f302ab9b85016aeb3a9a0e85b80650a1d2e984"
1135+
"version": "0.3.1+1.20.1+forge",
1136+
"curseForgeHash": 4077743380,
1137+
"modrinthHash": "935a8c19cc7a72364fdfe494d9ddbd599f01588d"
11311138
},
11321139
"particular-1.20.1-Forge-1.2.7.jar": {
11331140
"jarName": "particular-1.20.1-Forge-1.2.7.jar",
@@ -1367,12 +1374,12 @@
13671374
"curseForgeHash": 218830698,
13681375
"modrinthHash": "7d4f578a42c9b880744ea6058a495847aac9e4c3"
13691376
},
1370-
"tacz-tweaks-2.11.2-all.jar": {
1371-
"jarName": "tacz-tweaks-2.11.2-all.jar",
1377+
"tacz-tweaks-2.12.1-all.jar": {
1378+
"jarName": "tacz-tweaks-2.12.1-all.jar",
13721379
"modId": "tacztweaks",
1373-
"version": "2.11.2",
1374-
"curseForgeHash": 2376197194,
1375-
"modrinthHash": "889c0885b6388fc7966b956a5df4efbb1c758965"
1380+
"version": "2.12.1",
1381+
"curseForgeHash": 769672337,
1382+
"modrinthHash": "92c9981e2e2f2edecab25ee48c5bade7a14298a8"
13761383
},
13771384
"taczammoquery-1.20.1-1.0.0.jar": {
13781385
"jarName": "taczammoquery-1.20.1-1.0.0.jar",
@@ -1395,12 +1402,12 @@
13951402
"curseForgeHash": 2679626739,
13961403
"modrinthHash": "ea725f5bed9662aa22d4ec089a009bd52fb82275"
13971404
},
1398-
"TerraFirmaGreg-Core-Modern-0.8.17.jar": {
1399-
"jarName": "TerraFirmaGreg-Core-Modern-0.8.17.jar",
1405+
"TerraFirmaGreg-Core-Modern-0.8.18.jar": {
1406+
"jarName": "TerraFirmaGreg-Core-Modern-0.8.18.jar",
14001407
"modId": "tfg",
1401-
"version": "0.8.17",
1402-
"curseForgeHash": 2296143699,
1403-
"modrinthHash": "8a92b1d2a0a88eb0d7ffdfcdab93b0fb31e2e312"
1408+
"version": "0.8.18",
1409+
"curseForgeHash": 3264017794,
1410+
"modrinthHash": "b4f98b976aa7096b6ec0a6bd291fb16415dfeb3a"
14041411
},
14051412
"tfc_gurman-1.3.0.jar": {
14061413
"jarName": "tfc_gurman-1.3.0.jar",
@@ -1626,6 +1633,13 @@
16261633
"curseForgeHash": 2333549546,
16271634
"modrinthHash": "7298a59e383d2327e2acc49d8f1b132cedb8860b"
16281635
},
1636+
"wakes-1.20.1-Forge-1.0.9.jar": {
1637+
"jarName": "wakes-1.20.1-Forge-1.0.9.jar",
1638+
"modId": "wakes",
1639+
"version": "1.0.9",
1640+
"curseForgeHash": 650217522,
1641+
"modrinthHash": "4e2f19e3c2d36968630f66b370ad0ab984aa5b25"
1642+
},
16291643
"waterflasks-3.0.10.jar": {
16301644
"jarName": "waterflasks-3.0.10.jar",
16311645
"modId": "waterflasks",

config/createpickywheels-common.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
waterwheelBiomeSTRESSPenalty = 1.0
2323

2424
#Body of water requirement impact (similar to infinite fluid extraction from pulley)
25-
[waterwheels."optimal condition"]
25+
[waterwheels."power source condition"]
2626
#When enabled waterwheels also work when under create's default conditions but at a penalty
2727
waterwheelsPorqueNoLosDos = true
2828
#Boost for Waterwheels placed on optimal conditions.
@@ -65,7 +65,7 @@
6565
#The minimum amount of points that must hit windmillRequiredRange.
6666
#Range: > 1
6767
windmillRequiredRangePoints = 1
68-
#The maximum distance a windmills can consider air blocks from.
68+
#The maximum distance a windmill can consider air blocks from.
6969
#Range: > 1
7070
windmillMaxRange = 32
7171
#The percentage of Generated Speed only given if windmills are raised enough.

config/ftbquests/quests/chapters/applied_energistics_2.snbt

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
quest_links: [{
7373
id: "6845144F7EA1081D"
7474
linked_quest: "24158DEE63DAEB41"
75-
x: 5.0d
76-
y: -4.5d
75+
x: 6.0d
76+
y: -3.5d
7777
}]
7878
quests: [
7979
{
@@ -362,6 +362,7 @@
362362
type: "item"
363363
}
364364
]
365+
title: "{quests.ae2.cables.title}"
365366
x: 0.5d
366367
y: -6.0d
367368
}
@@ -400,7 +401,7 @@
400401
item: "ae2:crafting_unit"
401402
type: "item"
402403
}]
403-
x: -1.0d
404+
x: -2.0d
404405
y: -6.0d
405406
}
406407
{
@@ -412,7 +413,7 @@
412413
item: "ae2:crafting_accelerator"
413414
type: "item"
414415
}]
415-
x: -2.5d
416+
x: -3.5d
416417
y: -6.5d
417418
}
418419
{
@@ -431,7 +432,8 @@
431432
title: "{quests.ae2.crafting_storage.task}"
432433
type: "item"
433434
}]
434-
x: -2.5d
435+
title: "{quests.ae2.crafting_storage.title}"
436+
x: -3.5d
435437
y: -5.5d
436438
}
437439
{
@@ -452,6 +454,7 @@
452454
title: "{quests.ae2.pattern_provider.task}"
453455
type: "item"
454456
}]
457+
title: "{quests.ae2.pattern_provider.title}"
455458
x: 0.5d
456459
y: -9.0d
457460
}
@@ -507,7 +510,7 @@
507510
item: "ae2:interface"
508511
type: "item"
509512
}]
510-
x: 2.0d
513+
x: 3.0d
511514
y: -6.0d
512515
}
513516
{
@@ -526,7 +529,8 @@
526529
title: "{quests.ae2.export_bus.task}"
527530
type: "item"
528531
}]
529-
x: 3.5d
532+
title: "{quests.ae2.export_bus.title}"
533+
x: 5.0d
530534
y: -7.0d
531535
}
532536
{
@@ -653,7 +657,7 @@
653657
item: "ae2:import_bus"
654658
type: "item"
655659
}]
656-
x: 3.5d
660+
x: 5.0d
657661
y: -5.0d
658662
}
659663
{
@@ -680,7 +684,7 @@
680684
type: "item"
681685
}
682686
]
683-
x: 3.5d
687+
x: 5.0d
684688
y: -6.0d
685689
}
686690
{
@@ -693,7 +697,7 @@
693697
type: "checkmark"
694698
}]
695699
title: "{quests.ae2.interface_automation.title}"
696-
x: 5.0d
700+
x: 6.5d
697701
y: -6.0d
698702
}
699703
{
@@ -1094,6 +1098,7 @@
10941098
{
10951099
id: "270F842BF5012A13"
10961100
item: "ae2:io_port"
1101+
optional_task: true
10971102
type: "item"
10981103
}
10991104
{
@@ -1283,6 +1288,21 @@
12831288
x: -2.0d
12841289
y: -9.0d
12851290
}
1291+
{
1292+
dependencies: ["25007C5E43D28DB2"]
1293+
description: ["{quests.ae2.stock_bridge.desc}"]
1294+
id: "0E54B3BCBBA34A00"
1295+
optional: true
1296+
shape: "heart"
1297+
tasks: [{
1298+
id: "1F8D81C524CE694A"
1299+
item: "createstockbridge:ae_bridge"
1300+
type: "item"
1301+
}]
1302+
title: "{quests.ae2.stock_bridge.title}"
1303+
x: 5.0d
1304+
y: -8.0d
1305+
}
12861306
]
12871307
subtitle: ["{quests.ae2.subtitle}"]
12881308
title: "{quests.ae2}"

config/ftbquests/quests/chapters/hv__high_voltage.snbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,6 @@
911911
dependencies: ["52AD30F04DD5A812"]
912912
dependency_requirement: "all_started"
913913
description: ["{quests.high_voltage.hv_mixer.desc}"]
914-
icon: "gtceu:hv_mixer"
915914
id: "05ABC370D7153350"
916915
subtitle: "{quests.high_voltage.hv_mixer.subtitle}"
917916
tasks: [{
@@ -923,6 +922,7 @@
923922
"ftbfiltersystem:filter": "or(item(gtceu:hv_mixer)item(greate:stainless_steel_mechanical_mixer))"
924923
}
925924
}
925+
title: "{quests.tasktype.item.any}"
926926
type: "item"
927927
}]
928928
title: "{quests.high_voltage.hv_mixer.title}"
@@ -1008,6 +1008,7 @@
10081008
"4AD686D18247315E"
10091009
"72BD27FEEB34C7B0"
10101010
]
1011+
dependency_requirement: "one_completed"
10111012
description: ["{quests.high_voltage.rocket_t1.desc}"]
10121013
icon_scale: 2.0d
10131014
id: "3FBDC8552F7D8008"

config/ftbquests/quests/chapters/queststfc_tips.snbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@
11851185
Count: 1
11861186
ForgeCaps: {
11871187
"tfc:food": {
1188-
creationDate: 53316000L
1188+
creationDate: -9223372036854775808L
11891189
traits: [ ]
11901190
}
11911191
}

config/waves-common.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ waveSpawnDistanceFromShoreMin = 4.0
2525
waveSpriteCount = 5
2626
#How great should the chance for waves to deposit blocks be? Lower value = higher chance.
2727
#Range: > 1
28-
waveBlockDepositChance = 1
28+
waveBlockDepositChance = 1000
2929
#How often the waves should make a sound. Higher value = rarer.
3030
#Range: > 0
3131
waveBreakingSoundChance = 50

0 commit comments

Comments
 (0)