Commit graph

5145 commits

Author SHA1 Message Date
Pyritie
a64614c7f1 item tag model for softwood 2025-10-05 19:23:32 +01:00
Pyritie
8b8150d641 even less! 2025-10-05 19:23:04 +01:00
Pyritie
3d41493f8e fix most of the horrible windswept mountain noise 2025-10-05 19:15:07 +01:00
Pyritie
9de693d489 more climate tweaks because I forgot that the climate was a sine wave and not linear 2025-10-05 17:50:06 +01:00
Pyritie
240e336752 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-05 17:09:57 +01:00
Pyritie
577b19910d change nuclear fuel rods to use metal rods, adjust machine input slots/sounds/progress bars 2025-10-05 17:09:54 +01:00
Pyritie
9edd0c6277 fix whisk duping 2025-10-05 17:09:20 +01:00
dependabot[bot]
f093bc3c0d
Bump the dependencies group with 2 updates (#1930)
Bumps the dependencies group with 2 updates: [roamingowl/template-output-with-eta](https://github.com/roamingowl/template-output-with-eta) and [actions/cache](https://github.com/actions/cache).


Updates `roamingowl/template-output-with-eta` from 1.13.0 to 2.0.0
- [Release notes](https://github.com/roamingowl/template-output-with-eta/releases)
- [Commits](https://github.com/roamingowl/template-output-with-eta/compare/v1.13.0...v2.0.0)

Updates `actions/cache` from 4.2.4 to 4.3.0
- [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/v4.2.4...v4.3.0)

---
updated-dependencies:
- dependency-name: roamingowl/template-output-with-eta
  dependency-version: 2.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: actions/cache
  dependency-version: 4.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-10-05 20:37:40 +05:00
Pyritie
58da363b09 fixed the plutonium ore crash on new worlds, removed all the other plutonium recipes 2025-10-05 15:54:58 +01:00
Pyritie
6b7d743ea2 fix #1956 2025-10-05 14:29:54 +01:00
Pyritie
468d1d0e01 added mars trees to the tree chop mod
loot tables for mars "leaves", recipes for plant balls/biomass
2025-10-04 23:59:19 +01:00
Pyritie
4eb2c49cbf remove collision from mars saplings 2025-10-04 23:58:24 +01:00
Pyritie
db8b26fefd pakku 2025-10-04 23:13:38 +01:00
Pyritie
f818677b2e reduced amount of loot in illages 2025-10-04 22:59:15 +01:00
Pyritie
7ba5abe636 increased illage mobs, decreased loot chests in the ruins 2025-10-04 22:58:28 +01:00
GameStar
302c394a47
cooling tower particles (#1954)
* stuff

* eh

* stuff

* stuff to save
2025-10-04 13:01:23 -05:00
Pyritie
7c077cfadb whoops 2025-10-04 18:44:41 +01:00
Pyritie
75addd072b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-10-04 18:39:21 +01:00
Pyritie
92dea1de9f let's try this 2025-10-04 18:39:17 +01:00
TomPlop
184d1ace7e
Remove Plutonium ore loot table and add a bad mixer recipe for bio diesel (#1955) 2025-10-04 11:51:38 -05:00
TomPlop
744f34cda3
Finishing adding the Fission Reactor to TFG (#1951)
* Some cleaning

* Some multiblocks change

* more changes

* More changes to nuclear line adding coolant

* Graphite line

* Last changes to Fission Line

* Finishing the nuclear line

* add impure moderator

* fix removal of plutonium

* fix Tag Prefix
2025-10-04 16:44:53 +01:00
Pyritie
7c3f3b29a1 cl 2025-10-04 16:31:27 +01:00
Pyritie
00117661d5 low tech liquid concrete! 2025-10-04 16:30:58 +01:00
Pyritie
c079ce8cca changed mixer glowstone recipe to circuit 8 2025-10-04 16:30:49 +01:00
Pyritie
7a86a85f4f remove the example dea fission recipes/items 2025-10-04 15:55:58 +01:00
Pyritie
9e868ce862 deployers now have a recycling recipe, fixed not being able to develop colored film 2025-10-04 15:36:33 +01:00
Pyritie
bcbf7664f4 langs, updated changelog, basic mv circuits now need sequenced assembly 2025-10-04 15:26:06 +01:00
Pyritie
0a30ac5797 fix #1933 2025-10-04 15:02:08 +01:00
Pyritie
f6b0cd4d67 added plant ball recipes for misc plants #1886
added plant ball recipes and biomass recipes for moon/mars plants
2025-10-04 14:59:35 +01:00
Pyritie
d2b26afb29 tag for sylvite ore 2025-10-04 14:56:13 +01:00
Pyritie
749d39e537 ore vein index update 2025-10-04 14:42:29 +01:00
Pyritie
0aa921066b langs 2025-10-04 14:40:01 +01:00
Pyritie
d123b515a3 pakku 2025-10-04 13:08:50 +01:00
GameStar
8c691a3b08
change the fission component block model (#1948)
* stuff

* eh

* stuff
2025-10-03 12:25:34 -05:00
Pyritie
d68c0550f9 various crop related things 2025-10-03 01:20:03 +01:00
Pyritie
abaca75e1e patchouli updates 2025-10-03 01:19:39 +01:00
Pyritie
89a1b81dc0 added mars stuff to space survival chapter, added new card to ae2 chapter, added rockets/planets to progression chapter 2025-10-02 22:57:45 +01:00
Pyritie
a7eba83d81 add mars liquid ice vein just for variety's sake 2025-10-02 22:48:20 +01:00
Pyritie
548d58ad2c change bulbkin pie to require wraptor sugar 2025-10-02 22:47:58 +01:00
Johannes
fc7b7372bf
Bugfix/fix birch and maple sugar recipe conflict (#1944)
* Removed crafting recipe for turning suryp into sugar directly

* Added sealed barrel recipe for turning syrup into sugar

* Removed added lines from lang file
2025-10-02 21:19:58 +01:00
GameStar
38eb2d70e5
Fission Insulations (#1943)
* stuff

* eh
2025-10-02 18:32:04 +01:00
Kolja
9c25217b08
animated wireless card (#1942) 2025-10-01 18:55:47 -05:00
Pyritie
7d4c66c2e7 fixed some more dupes with tool heads 2025-10-02 00:22:51 +01:00
Pyritie
5e5b2bd4fd forgot a lang 2025-10-01 23:39:15 +01:00
Pyritie
af9ca62bd9 assets and recipes for new wireless card! 2025-10-01 23:38:13 +01:00
Pyritie
c7198c9cb6 langs 2025-10-01 23:37:27 +01:00
Pyritie
f91f0e1d3b ok how about now 2025-10-01 22:12:51 +01:00
Pyritie
18a8007ec1 fixed universal wireless terminal upgrade 2025-10-01 22:09:17 +01:00
Pyritie
54d97bf632 fixed lantern not being breakable 2025-10-01 20:32:04 +01:00
The Compendium System / The Atlassian Collective
cddc6683db
Sorta fixed the basil leaves food processor recipe and also fixed the food processor shredded cheese scam (#1940) 2025-10-01 11:33:40 -05:00