Commit graph

6418 commits

Author SHA1 Message Date
Pyritie
13bc6a26e6
Merge branch 'main' into dev 2026-01-23 21:36:34 +00:00
Pyritie
8a9ecd9fdf Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-23 21:33:39 +00:00
Pyritie
e4fe7ee8ea 0.11.18 2026-01-23 21:33:36 +00:00
Pyritie
a844e50284 drinkable concrete 2026-01-23 21:31:48 +00:00
Pyritie
8d17dca5c6 move saltpeter chem reactor to a circuit 2026-01-23 21:12:18 +00:00
Pyritie
8fba57695e fix drinks giving too much hydration 2026-01-23 21:10:24 +00:00
Petr211071
1581cd3b1a
Field guide improvments (#2829)
* add read_by_default

* Add TFG crops

* Fruits and crops translation

* Earth and Mars indexes

* Create drinks.json
2026-01-23 14:34:24 -06:00
Pyritie
2167fcdb6a fix #2827
Related Work Items: #28
2026-01-23 20:22:29 +00:00
Pyritie
a183ed64f2 fix mossy cobble not collapsing 2026-01-23 20:16:41 +00:00
Pyritie
a23919d54b fix broken field guide, skull emoji 2026-01-23 20:11:34 +00:00
Pyritie
9b4adec5a0 langs 2026-01-23 19:46:47 +00:00
Pyritie
53ab136758 add create stock bridge, add missing recipes for certus/fluix deco blocks 2026-01-23 01:43:41 +00:00
Pyritie
6ce28447f5 bump up moon animal spawns a bit 2026-01-23 00:49:57 +00:00
Pyritie
046b8f464f let's buff horsepower because fuck water wheels 2026-01-22 23:54:50 +00:00
Pyritie
5f064b841f make gt oreproc much faster (except the thermafuge) 2026-01-22 23:01:36 +00:00
Pyritie
0838fab0bd pakku, changelog 2026-01-22 22:42:59 +00:00
Pyritie
2ee4a8cf3c tweak oil textures 2026-01-22 22:42:50 +00:00
Pyritie
3412188f58 langs 2026-01-22 21:12:47 +00:00
Pyritie
cc8dc5d12a #2803
Related Work Items: #20
2026-01-22 21:04:17 +00:00
Pyritie
65daa7cddb remove any other stone dust recipes 2026-01-22 20:57:47 +00:00
Pyritie
40fedfa17e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-22 20:37:28 +00:00
Pyritie
960d0cc2df remove tuff dust 2026-01-22 20:37:25 +00:00
Pyritie
feda51f459 some glass alloy smelter unification 2026-01-22 20:32:06 +00:00
TreyR9
acf86208c6
Add files via upload (#2812)
Adjusted saturation outline to be golden rather than red, for increased visibility and similarity to AppleSkin. Also adjusted some of the nutrition icons for slightly higher contrast with said outlines.

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>
2026-01-22 13:51:52 -06:00
thederpysockdude123
07058f77e7
added Ad Astra airlock to valid cleanroom doors (#2808)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-22 19:02:59 +00:00
thederpysockdude123
df03ccbeb7
removed netherrack dust centrifuging that doesn't actually exist (#2804)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-22 17:54:23 +00:00
Pyritie
0e916944e5 russian ore vein tooltips 2026-01-22 00:31:03 +00:00
Pyritie
ac72729cad tweak colors of oils and greate things 2026-01-22 00:30:06 +00:00
Pyritie
2f90e7ad2b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-21 23:30:20 +00:00
Pyritie
48d2e0b479 delete sylvite 2026-01-21 23:30:13 +00:00
Pyritie
1e42ed442a
. (#2796) 2026-01-21 22:40:31 +00:00
Pyritie
f93e33ab8e fix pitcher plants and torchflowers self destructing on mars 2026-01-21 22:36:54 +00:00
Pyritie
a5d858319c reduced the frequency of ambient biome additions sounds 2026-01-21 22:24:24 +00:00
Pyritie
0c146a673f buff mars greenhouses so they output the same amount of logs as earth trees 2026-01-21 22:22:40 +00:00
Pyritie
6c9418949f fix casting into ingot molds #2794 #2789 2026-01-21 22:00:07 +00:00
Pyritie
a1c0270267 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-21 21:26:51 +00:00
Pyritie
08ef126b34 fixed road speeds #2790, fixed water wheels #2791 2026-01-21 21:26:48 +00:00
thederpysockdude123
fd76389591
re-added glass dust recipe for glass tubes (#2795)
Signed-off-by: thederpysockdude123 <thederpysockdude123@gmail.com>
2026-01-21 21:16:25 +00:00
Pyritie
6294607616 change hellbricks recipe to match new texture 2026-01-21 21:05:55 +00:00
Pyritie
1d9b2c391a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2026-01-21 20:32:57 +00:00
Pyritie
efb87cfb14 fixed geodes causing collapses 2026-01-21 20:32:53 +00:00
Pyritie
2ef32a6fe0 update changelog 2026-01-21 13:31:12 +00:00
Mqrius
6382aab842
Update CHANGELOG.md waves config
Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2026-01-21 09:12:04 +01:00
Redeix
d680aa3e8c changelog 2026-01-21 00:40:21 -06:00
Redeix
8ea2c45d77 Merge remote-tracking branch 'origin/dev' into dev 2026-01-21 00:35:35 -06:00
Redeix
682788970c pisciculture rebalance 2026-01-21 00:35:11 -06:00
dependabot[bot]
103a7fd6f7
Bump actions/cache from 5.0.1 to 5.0.2 in the dependencies group (#2784)
Bumps the dependencies group with 1 update: [actions/cache](https://github.com/actions/cache).


Updates `actions/cache` from 5.0.1 to 5.0.2
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v5.0.1...v5.0.2)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: 5.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-01-20 23:48:09 +00:00
Mqrius
c70fe1c1ea
Fix waves beach block deposits config
Set to 1000 instead of the default 100. Either would be better than the current value of 1, which is a 100% chance of blocks.

Signed-off-by: Mqrius <Nuntius.Marii@Gmail.com>
2026-01-21 00:36:22 +01:00
Pyritie
4b35eef96c move pakku back to release so I don't forget. Also sorry for forgetting your spanish credit, niko 2026-01-20 16:52:14 +00:00
Xikaro
ac5d6a2a50
Merge pull request #2786 from TerraFirmaGreg-Team/dev
Release: 0.11.17
2026-01-20 21:26:38 +05:00