Commit graph

516 commits

Author SHA1 Message Date
Pyritie
78e40b4369 regular thorium is now also radioactive 2025-08-02 14:22:39 +01:00
Pyritie
a3b1fac817 changed the other thoriums to pink 2025-08-02 14:22:06 +01:00
Pyritie
1aaa124013 kubejs-tfc updates, pakku 2025-08-02 14:03:35 +01:00
Pyritie
9a6c760fcc merge 2025-08-02 12:21:21 +01:00
Pyritie
5f187c605e added recipes for other kinds of train tracks 2025-08-02 12:19:53 +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
Pyritie
25ef6bbb5e forgot to actually remove this 2025-08-01 22:52:26 +01:00
Pyritie
c1f13c02ca banned some advanced peripherals for not being family friendly 2025-08-01 00:26:11 +01:00
Pyritie
246b1ad94e langs 2025-07-31 21:59:23 +01:00
Pyritie
db967e8ac9 who up tweakin they mars crops 2025-07-31 21:07:38 +01:00
Pyritie
1cdbd052cc 0 days without py breaking the build 2025-07-31 19:54:58 +01:00
Pyritie
6700a6022e more mars crop stuff 2025-07-31 12:49:35 +01:00
Pyritie
ed168a68d5 mars crop stuff 2025-07-31 12:25:53 +01:00
Pyritie
332754992f merge 2025-07-31 00:59:09 +01:00
Pyritie
077190e902 initial commit for mars crops 2025-07-31 00:53:53 +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
GameStar
125efd9ac1
Feature/tier3 rocket (#1483)
* stuff for rocket

* worm

* Revert "worm"

This reverts commit fa2f0fc74727a7c7f15cbaae2365b8147b2e9313.

* Update blocks.js

* rocket stuff

* Update constants.js

* More

* final stuff

* probably disalbed everything

* Delete options.txt

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

* Delete kubejs/startup_scripts/tfg/elements.js

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

* dry ice change

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

* vacuum freezer change

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-30 20:33:50 +01:00
Pyritie
0a0d793490 mars plants cleanup 2025-07-30 13:04:23 +01:00
Pyritie
903be368b2 fixes #1445, also added gt recipes to make alcohol for bio diesel 2025-07-29 18:44:20 +01:00
Nebby
cc4f15d6f7
Improved Etched Accessibility (#1473)
* Feature.

* I did not forget about the changelog this time.

* Comply with Review

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-29 16:30:57 +01:00
Pyritie
75461a6496 oh so THAT's how you remove material properties 2025-07-29 11:55:53 +01:00
Pyritie
d1c375c1ee mushrooms don't glow!! 2025-07-29 01:31:32 +01:00
Pyritie
8892faef5d easier dough recipes 2025-07-29 01:28:31 +01:00
Pyritie
ffe3d8f4de py go 5 seconds without breaking the build challenge (impossible) 2025-07-29 00:03:02 +01:00
Pyritie
0a908ab1a2 whoops 2025-07-29 00:00:48 +01:00
Pyritie
87f9d0cf6d
More Better End plants (#1471)
* github pls

* add initial textures + blockstates

* models

* started writing up the blocks

* model adjustments, added item models and textures

* cleanup

* git moment
2025-07-28 23:33:10 +01:00
TomPlop
3c72e94109
Adding Nuclear Line on Mars (#1467)
* Adding the Nuclear Line CPU Wafer

* merge

* Revert "merge"

This reverts commit b29b5e324f587042a7aad01a49cfdf63b33ab7b4.

* revert

* Revert "revert"

This reverts commit 38376879b37a1150bd84dfa524621c2ffe6350db.

* no change weird things happening to me

* add fluid textures

* Modification of nuclear line

* fix conflict for fluids

* first balance change

* fix conflict with recipes.rocks

* Nuclear Line

* Add the bromine line and more fixes

* Fully added back the bromine line

* Add nuclear energy line and more fixes

* fix conflit

* Add back the recipes change to gtceu for nuclear

* revert

* fix conflict

* One last try

* Adjust Reactor rates

* Added change to uranium dust commented out until Mars Update

* Remove long rod from nuclear pellet
2025-07-28 20:02:05 +01:00
Pyritie
6886bc8d3a leaves 2025-07-28 15:20:39 +01:00
Pyritie
a948355b7e added recipes for backpack feeding upgrade #1462 2025-07-28 14:09:59 +01:00
Pyritie
2119a3bfe1 finally gt fixed this typo 2025-07-28 13:39:43 +01:00
Pyritie
6cd63cedda added missing fox cooking recipe 2025-07-28 10:38:36 +01:00
Redeix
695b6c2451
WIP Venus Stuff (#1469)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

* - Treated chipboard composite barrel lang

* - Some Tacz fixes

* - Jar dupe fix

* - tacz data

* - updated changelog

* - we hate git

* - Loading screen and main menu optimizations

* - image push

* - I think I got the title screen looking good on all resolutions

* - Updated Changelog

* - Added scale fix to loading screen too

* - Fix pixel alignment

* - Recipes, tags, assets+ for railgun

* - Brick interaction events and new function for interacting with blocks

* - Added parameter boolean to decide if blockstate should be copied

* - Change for block interaction event constant that may fix linux crash

* - Moved global array to the events file and some linter fixes.

* - Updated Changelog

* - Some more model fixes and remove gtceu metal armor

* - always a stubborn file

* - Large Solar Panel Change

* - WIP venus stuff

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-28 00:16:29 -05:00
Redeix
f61a6615dd
More things (#1468)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

* - Treated chipboard composite barrel lang

* - Some Tacz fixes

* - Jar dupe fix

* - tacz data

* - updated changelog

* - we hate git

* - Loading screen and main menu optimizations

* - image push

* - I think I got the title screen looking good on all resolutions

* - Updated Changelog

* - Added scale fix to loading screen too

* - Fix pixel alignment

* - Recipes, tags, assets+ for railgun

* - Brick interaction events and new function for interacting with blocks

* - Added parameter boolean to decide if blockstate should be copied

* - Change for block interaction event constant that may fix linux crash

* - Moved global array to the events file and some linter fixes.

* - Updated Changelog

* - Some more model fixes and remove gtceu metal armor

* - always a stubborn file

* - Large Solar Panel Change

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-28 15:03:48 +10:00
Gustavo
f3dfa471ec
Refactor & update to gt7
* gt7 removed credits/coins

* port gregtech additions to java

* add eslint locally

* add style linting

* switch target ECMA standard

* run linter

* clean up a bunch of linter errors

* remove outdated greate API calls

* forgot about the TFC multi compat issue

* reverted greate recipe removals

* some more linting stuff

* fix some issues with greenhouse recipes

* fix up some material stuff

* fix recipe types

* - Fixed single block machine rendering (#1465)

* minor fixes and changes

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-28 12:27:06 +10:00
Vazde
b59a4e8136
Universal compost items (#1451)
* Added universal compost

* Universal compost changes from comments
2025-07-27 11:21:26 -05:00
Pyritie
cb67e97ef8 nerfed speed of VI machines a little 2025-07-26 12:47:56 +01:00
Pyritie
2af4a2304b revert, apparently this isn't possible 2025-07-25 22:23:14 +01:00
Pyritie
4984ddb14a fixes #1429 2025-07-25 21:51:56 +01:00
Redeix
668f86fcfc
Block interaction changes (#1434)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

* - Treated chipboard composite barrel lang

* - Some Tacz fixes

* - Jar dupe fix

* - tacz data

* - updated changelog

* - we hate git

* - Loading screen and main menu optimizations

* - image push

* - I think I got the title screen looking good on all resolutions

* - Updated Changelog

* - Added scale fix to loading screen too

* - Fix pixel alignment

* - Recipes, tags, assets+ for railgun

* - Brick interaction events and new function for interacting with blocks

* - Added parameter boolean to decide if blockstate should be copied

* - Change for block interaction event constant that may fix linux crash

* - Moved global array to the events file and some linter fixes.

* - Updated Changelog

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-25 09:17:21 +01:00
Pyritie
f860056940
Mars grass and water (#1437)
* mars grass and water and all that fun stuff

* removing the heavy water
2025-07-25 01:31:25 +01:00
Pyritie
2c28c1cfeb mars biomes constant 2025-07-24 12:05:24 +01:00
Pyritie
3d2ed09f9b added create sandpaper recipes for early game gems, unified observer recipes 2025-07-23 21:10:59 +01:00
Pyritie
1e7a234b88 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-23 20:31:43 +01:00
GameStar
96d24e7b14
Feature/tier2 rocket bugfixes (#1422)
* stuff for rocket

* worm

* Assets

* bugfix #1420

* bugfix for #1421

* rocket recipes

* color adjust fluix material

* startup rocket stuff

* everything disabling the stuff until ev

* Delete options.txt

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

* Update main_startup_script.js

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

* Delete kubejs/startup_scripts/tfg/elements.js

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

* Update CHANGELOG.md

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

* shhhhh

Signed-off-by: Pyritie <pyritie@gmail.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-23 10:58:27 +01:00
Pyritie
0cb6847915 enabling some species mushrooms 2025-07-22 22:58:46 +01:00
Pyritie
850dff3833 adding back warped/crimson wood 2025-07-22 22:57:48 +01:00
Redeix
9ec98b47bb
Brick interaction events and new function for interacting with blocks (#1416)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

* - Treated chipboard composite barrel lang

* - Some Tacz fixes

* - Jar dupe fix

* - tacz data

* - updated changelog

* - we hate git

* - Loading screen and main menu optimizations

* - image push

* - I think I got the title screen looking good on all resolutions

* - Updated Changelog

* - Added scale fix to loading screen too

* - Fix pixel alignment

* - Recipes, tags, assets+ for railgun

* - Brick interaction events and new function for interacting with blocks

* - Added parameter boolean to decide if blockstate should be copied

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-22 11:51:09 +01:00