Commit graph

686 commits

Author SHA1 Message Date
TomPlop
fd182dfddd
First fixes for Mars Fission (#1978)
* First fixes for Mars Fission

* Fix ShapeInfo
2025-10-07 22:43:16 +01:00
Pyritie
153ae76522
Feature/mars piles and layers (#1975)
* changes for some sand layer/pile stuff

* Martian wind (#1883)

* add texture for wind

* add multiple martian wind types

* fix semiheavy concurrent with tfg core

* rename wind to match convention

* fix blockstate registration error

* why is this even turned on by default

* translate code regions + placeholder bundle recipe

* add mars climate controller

* add debug stick functions

* cleanup

* add layer block models

* add jsons

* cleanup

---------

Signed-off-by: Zippity <i.wa.anderson.86@gmail.com>

* refactor

* undo bundle

* added a bunch of missing snow pile tags

* item model changes

* more snow piled tags

* add dust storm severity biome tags

* some cleanup

---------

Signed-off-by: Zippity <i.wa.anderson.86@gmail.com>
Co-authored-by: Zippity <i.wa.anderson.86@gmail.com>
2025-10-07 18:22:41 +01:00
GameStar
03e382702d
more cooling tower stuff (#1971)
* stuff

* eh

* stuff

* stuff to save

* stuff

* texture stuff

* lang
2025-10-07 11:34:59 +01:00
Pyritie
3fb490fe04 a bunch of small tweaks 2025-10-07 01:20:10 +01:00
Pyritie
7973b44cba and this isn't? 2025-10-06 21:37:58 +01:00
Pyritie
142b938902 why is this disabled? 2025-10-06 21:37:50 +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
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
58da363b09 fixed the plutonium ore crash on new worlds, removed all the other plutonium recipes 2025-10-05 15:54:58 +01:00
Pyritie
4eb2c49cbf remove collision from mars saplings 2025-10-04 23:58:24 +01:00
GameStar
302c394a47
cooling tower particles (#1954)
* stuff

* eh

* stuff

* stuff to save
2025-10-04 13:01:23 -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
bcbf7664f4 langs, updated changelog, basic mv circuits now need sequenced assembly 2025-10-04 15:26:06 +01:00
Pyritie
d68c0550f9 various crop related things 2025-10-03 01:20:03 +01:00
GameStar
38eb2d70e5
Fission Insulations (#1943)
* stuff

* eh
2025-10-02 18:32:04 +01:00
Redeix
031ffffa62
formula crash and autoclave sterilization (#1936)
* fix formula crash

* changed autoclave sterilization to use perTick
2025-09-30 23:20:47 -05:00
Pyritie
1a93e8b881 mini versions of the mars trees for tree farms 2025-09-30 23:58:49 +01:00
Pyritie
a1d3a889c1 new iodine line 2025-09-30 23:00:23 +01:00
Pyritie
16ae9167a8
mars snow (#1931)
* bare bones

* snow piled tag

* added climate restriction to quicksand, added powder snow up north

* better tagging

* langs

* assets

* missed feature in deep desert

* remove waves from mars

* climate tweaks

* icicles and dry ice stuff

* langs
2025-09-30 18:15:35 +01:00
Pyritie
a02390b89d merge 2025-09-30 12:49:41 +01:00
Pyritie
a5ed4d8803
quickie (#1932) 2025-09-30 16:39:46 +05:00
TomPlop
3d3795f828
Adding Nuclear Fission (#1926)
* Fix Chute Assembler recipe

* Fix quest tips beekeper

* Fix for wine and jar alloy smelter conflicting recipe

* fix to fit #1141

* mistakes were made

* Fix jetpack 1 quest mv

* Mistake again

* Revert the fix on chute

* Adding compatibility for nuclear Vazde mod

* Add textures to fission rods

* Updating fission with Vazde mod

* more fixes and add new rotor bismuth

* More changes

* switch recipes for fission reactor

* More fixes for nuclear mod

* more fixes

* Disable tbu

* Nerf Heavy Water cost

* Fix alloy
2025-09-29 11:26:32 -05:00
Redeix
d4f759f4f5
Recipes for the growth chamber (#1927) 2025-09-29 13:16:09 +01:00
Redeix
4c0f2c5428
Growth Chamber (#1924)
* growth_chamber

* growth_chamber blocks

* more textures

* more casing stuff

* sterilizing pipes

* forgor

* monitor light

* emissives and casings!

* checkpoint

* final call
2025-09-29 00:53:42 +01:00
GameStar
933cb23fc5
Some more blocks for cooling tower (#1923)
* yes

* yes

* some stuff

* blocks
2025-09-28 14:05:55 -05:00
Adrien Vidal
c856ec9398
[Molden] Stone TFGfication p3 - Aqueducts, Supports + Cutting and Grinding fixes (#1919)
* Aqueducts + move stone characs to constants

* Supports

Supports for all stones
Remapped to the original textures rather than copies (all removed)

* Support tooltips

+ recipe rocks regions added

* Macerator Recipes

- Add Macerator missing grinding recipes
- Change the TFC stone Macerator recipes to the same ratios

* aqueduct recipes + stonecutting fixes

* Remove redundant tags

---------

Signed-off-by: Adrien Vidal <vidal.adrien2@gmail.com>
2025-09-28 12:10:33 -05:00
Pyritie
1a8172e27a added mars dirt path, moved mars dirt/grass blocks to java, fixed snowy variants and made the clay/kaolin blocks have proper connected textures 2025-09-28 18:00:31 +01:00
Pyritie
32447550ba removed deuterium and carbon monoxide from mars air distillation since other air recipes are only like 5-7 tall, not 9 2025-09-28 01:35:52 +01:00
Pyritie
15a3ae7d0b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-28 00:34:46 +01:00
Pyritie
a59038c911 no more blaze 2025-09-28 00:31:19 +01:00
Pyritie
dd566d3820 goodbye, terrariums, you will be missed 2025-09-28 00:12:32 +01:00
Pyritie
3bf4bc7d96 some of these hitboxes were weird 2025-09-28 00:09:29 +01:00
TomPlop
3171c386c4
Update Ostrum Linear Accelerator with Ostrum casings (#1916)
* Fix Chute Assembler recipe

* Fix quest tips beekeper

* Fix for wine and jar alloy smelter conflicting recipe

* fix to fit #1141

* mistakes were made

* Fix jetpack 1 quest mv

* Mistake again

* Revert the fix on chute

* Change Ostrum Factory Casings
2025-09-27 20:20:35 +01:00
Pyritie
a34605ba3d remove mega patprov/interface since they have no recipes 2025-09-27 18:37:25 +01:00
Pyritie
7785f88940 dimension-wide biome tags 2025-09-27 17:17:42 +01:00
TomPlop
772ffc14ef
tungsten_line (#1910)
* add tungsten line

* add timer to tungsten line

* fix apt
2025-09-27 00:18:26 -05:00
GameStar
951023fb35
crafting stuff (#1911)
* yes

* yes

* some stuff
2025-09-26 23:19:48 -05:00
GameStar
04fa4cd9db
cooling tower blocks (#1909) 2025-09-26 21:47:54 -05:00
Pyritie
ea965716fb red granite + other stone dusts + t2 rocket alloy 2025-09-27 00:39:50 +01:00
Pyritie
030db1280c I think this should show all the commented out mars content? 2025-09-26 23:37:23 +01:00
Pyritie
0b1c7af4d9 so long, deprecated items 2025-09-26 23:06:59 +01:00
Pyritie
5b6ea16c9d remove commented out evaporation_tower 2025-09-26 21:42:16 +01:00
TomPlop
df86f11eb5
add evaporation tower and nuclear turbine (#1887) 2025-09-26 21:41:48 +01:00
Redeix
f76596b3d1
couple fixes (#1900)
* needle fix

* furnace minecart textures
2025-09-25 23:42:09 -05:00
Jason Nash
8b7186bc3b
rebalance sns hiking boots (#1894)
* rebalance sns hiking boots

* fix accidental nerf

* Revert "fix accidental nerf"

This reverts commit 2c970ef1ac04e93e4c5b76dac35d8a4069bcab69.

* commit wrong file...
2025-09-25 17:48:34 +01:00
Pyritie
a67a0902ac updated casting mold const with new pipe molds, simplified the tag for VI curving press heads 2025-09-23 20:21:57 +01:00
Redeix
70fd1f6e55
last minute additions (#1877)
* fuel_rods

* flower tags

* more mealbag stuff
2025-09-23 02:17:46 -05:00
Pyritie
2372f41394 goodbye, VI lathe, you jank piece of crap 2025-09-23 00:02:49 +01:00
Pyritie
b64a7dfc59 never mind 2025-09-22 21:15:50 +01:00
Pyritie
2fbd2a42ff changed chemical formula of deuterium/tritium (why aren't they like this in the first place?) 2025-09-22 20:59:56 +01:00