Commit graph

187 commits

Author SHA1 Message Date
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
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
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
GameStar
951023fb35
crafting stuff (#1911)
* yes

* yes

* some stuff
2025-09-26 23:19:48 -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
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
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
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
TomPlop
8ee9e38786
fix the harvesters with 4A and 16A energy hatch (#1874) 2025-09-22 16:41:02 +01:00
Pyritie
fc52d2f60a maybe the ender redstone link cover is fine 2025-09-22 15:53:22 +01:00
Pyritie
c353936c7a changed sounds of the dust harvesters because good lord 2025-09-22 14:15:01 +01:00
GameStar
b06e59db31
Feature/new emi categories (#1862)
* stuff

* all the stuff

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-09-20 11:51:56 +01:00
Pyritie
355535daf4 removed stone rods + stone gears 2025-09-18 01:11:47 +01:00
Pyritie
a1446cc3a0 removes new ender covers from gt 7.2 2025-09-14 14:52:50 +01:00
Pyritie
5e97244193 fixed millstone tier for black bronze #1786 2025-09-13 23:56:01 +01:00
KonSola5
033b411363
Item sizes (#1778)
* Item sizes and some helpful tags

* Try putting item sizes in a KJS script (NOT TESTED)

* Move Greate tags to KJS, add sizes for various pipes and cables

* Whoops, accidentally overrode tiny pipe size

* Air duct sizes

* Prettier config and tags moved to JS
- Added `.prettierrc` file, which configures the tab width and code wrapping point for the Prettier formatter.
- Moved remaining tags from JSON to JS files.

* Delete floating carpet tag JSON

Signed-off-by: KonSola5 <125081901+KonSola5@users.noreply.github.com>

---------

Signed-off-by: KonSola5 <125081901+KonSola5@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-09-13 13:46:20 -05:00
Pyritie
efe6d0c7dc crackrack now uses netherrack dust 2025-09-09 23:30:48 +01:00
GameStar
2b16e1a623
eating uranium (#1758)
* eat nuggets

* Update pakku-lock.json
2025-09-07 17:53:13 -05:00
TomPlop
ad67a00027
Ostrum line (#1734)
* Adding the Ostrum Line

* fix comment and add geysers to blacklist

* Remove muffler hatch

* Adding the Ostrum Line

* fix comment and add geysers to blacklist

* Remove muffler hatch

* fix tfg for id recipe

* Fix fucking Git

* change a line
2025-09-02 18:40:16 +01:00
Pyritie
5bec53e7cd spice stuff! 2025-08-26 00:00:43 +01:00
Pyritie
d15290b9de make the deposit size a little bigger 2025-08-25 21:56:27 +01:00
TomPlop
2ebfaf2e3a
Board rework (#1679)
* fix board

* remove from tag

* more update

* last changes

* Add new quests

* fix the weird file

* Fixes

* fix quest optional
2025-08-23 14:13:07 -05:00
Pyritie
ac99b9db87
Solar tweaks (#1678)
* solar tweaks

* langs
2025-08-23 18:30:27 +01:00
TomPlop
6eb2de0220
Mars ressources (#1569)
* stupid git again

* First entry for the mars ore line

* Adding the Ostrum Harvester in its first version

* Adding new casings

* Adding the complete Mars Ore Line

* Bugs again

* Add ores and textures

* More changes

* Changes to heavy and semi water and more fluid veins

* Adding more crafting recipes

* More recipes

* weird

* nerf ores

* fix thorium

* Adding dusty ores

* More circuits change to gate IV at the end of Mars

* Fix multiblocks

* Changes to AE2

* Unified Pattern Provider and Interface

* Removing Bedrock

* Fully remove Bedrock Miner

* Disable many stuffs until Mars

* More fixes until Mars is out

* Requested changes

* Cleaning kubejs files

* Adding Moon Ore Line

* Change Mars water to Centrifuge

* Fix duplicate
2025-08-22 12:41:27 +01:00
Pyritie
a341470cee removed cobalt oxide's meltability #1634 2025-08-15 23:30:14 +01:00
Pyritie
f0466e53bd finally killed off all damascus steel recipes 2025-08-14 20:28:16 +01:00
Pyritie
99ce711397 fix 2025-08-12 10:53:10 +01:00
TomPlop
de8fe6ce78
Rebalance LSA (#1591)
* Balance LSA

* Add changelog

* Add Parallel Hatch ability

* Trying to fix changelog

* Try again
2025-08-11 21:44:22 +01:00
Redeix
2c5658a185
Reflector block and some other fixes (#1575)
* Reflector block and some other fixes

* Updated Changelog
2025-08-10 11:39:10 +01:00
Pyritie
655ef68697 fixed a duplicate fluix block, also tweaked the fluix material a little 2025-08-09 17:43:08 +01:00
TomPlop
feec2487ef
Fix infinite energy with Large Solar Arrays (#1563)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-08-08 14:01:55 -05:00
Pyritie
cbad72ecf8 added potin, cobalt, and cobalt brass as tfc metals, fixed ratios of tfc brass/bronze 2025-08-07 00:39:42 +01:00
Gustavo
c349aa4ad7 revert commit to actually put them in lang files 2025-08-06 19:58:21 +10:00
Gustavo
cdf57686ba rename extruder molds 2025-08-06 19:31:02 +10:00
TomPlop
91e0d36fa0
Rework of Large Solar Array (#1511)
* Rework of Large Solar Array

* Add quests

* Fix Ad Astra to use the T1 photocell
2025-08-02 23:09:49 -05:00
Redeix
2cee1a2cdb
Baskets and fixes (#1510)
* - Added grape bushes to harvest basket tags

* - More LSP fixes

* - updated changelog
2025-08-02 15:24:23 -05:00
Pyritie
1820e8256d solar panel stuff 2025-08-02 18:51:05 +01:00
Pyritie
78e40b4369 regular thorium is now also radioactive 2025-08-02 14:22:39 +01:00
Redeix
2d6edff7ea
-Receiver casing fix and large solar panel tiers (#1505) 2025-08-02 11:29:52 +01:00
TomPlop
e700c45062
Quests for railguns and fixes (#1495)
* Adding quests to the railgun

* Adding all the quests for the Railgun

* Fix Mixer HV

* more fixes for quest

* Add an input bus to the Steam Bloomery #1481

* Add lang file to railgun

* Change for Energy Chapter
2025-08-01 23:08:41 +01:00
Pyritie
937b2ac3cd
tfc invar (#1502) 2025-08-01 23:06:38 +01:00
Gustavo
28e2ffcf0c hide 2025-07-31 08:49:28 +10:00
Gustavo
5577d59041 remove tool disables 2025-07-31 08:48:37 +10:00