Commit graph

4118 commits

Author SHA1 Message Date
Pyritie
5582be75d2 fixes #1476 2025-07-29 17:47:24 +01:00
Pyritie
ed8bb14822 EMI categories for the new fission machines 2025-07-29 17:43:34 +01:00
Pyritie
764f149423 fixed wire cutter head extruder mold typo 2025-07-29 17:39:32 +01:00
Pyritie
c94418447d removed tfc stone -> vanilla stone conversion via rods 2025-07-29 12:36:13 +01:00
Pyritie
6eb61fd9c7 biome adjustments 2025-07-29 12:07:40 +01:00
Pyritie
75461a6496 oh so THAT's how you remove material properties 2025-07-29 11:55:53 +01:00
Pyritie
5b92048fe0 grass tags 2025-07-29 02:41:07 +01:00
Pyritie
3f97561bd8 added a few entities to mars for fun 2025-07-29 02:13:55 +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
da865ae6f1 model fixes, and now you can place the ad astra mushrooms on dirt again 2025-07-29 00:16:29 +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
bea7603db6 langs 2025-07-28 23:59:03 +01:00
Pyritie
9d305664ce does this work? 2025-07-28 23:52:42 +01:00
Zippity
5f151cdab2
Forge, Anvil Tweaks (#1417)
* rearrange anvil sequences to match convention

* add heating and melting to basic forgeable gears

* another anvil tweak

* Update changelog

* typo!

* refactor heating and forging of small gears

* refactor gear forging to use built-in material forge tier

* one last fix

---------

Signed-off-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
Co-authored-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-28 23:43:54 +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
Pyritie
a607627d98 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-28 23:10:32 +01:00
Pyritie
a6bdb3d5b4 more water tags 2025-07-28 23:10:29 +01:00
Pyritie
22af9eda3e gregnant man emoji 2025-07-28 23:10:23 +01:00
Pyritie
fd209eb5bf fixed some old asset references that were showing up in the log 2025-07-28 22:40:19 +01:00
Pyritie
3f47f0b48b water tags 2025-07-28 22:39:50 +01:00
Pyritie
e804a8a9dd added fluid parameter to the greenhouse recipe builder 2025-07-28 21:04: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
e83833bcf5 changed all fluid tags to the new format 2025-07-28 15:46:18 +01:00
Pyritie
3119919a47 changelog 2025-07-28 15:20:58 +01:00
Pyritie
8dae355fe0 typo 2025-07-28 15:20:49 +01:00
Pyritie
6886bc8d3a leaves 2025-07-28 15:20:39 +01:00
Pyritie
cfbd82e595 moon wood stuff 2025-07-28 15:20:25 +01:00
Pyritie
0a0ed055ba langs 2025-07-28 15:18:52 +01:00
Pyritie
49864a2cb6 added hot ingots to the hotornot whitelist 2025-07-28 14:26:13 +01:00
Pyritie
54d44ea0a4 added shapeless recipes for matches #1449 2025-07-28 14:18:50 +01:00
Pyritie
050ac49fd9 removed gregtech stonecutter recipe #1464 2025-07-28 14:11:37 +01:00
Pyritie
a948355b7e added recipes for backpack feeding upgrade #1462 2025-07-28 14:09:59 +01:00
Pyritie
ace7d20690 fix for rocks 2025-07-28 14:06:31 +01:00
Pyritie
f197a08195 fixed cobalt brass/potin double plate being unobtainable early 2025-07-28 14:06:18 +01:00
Pyritie
0e1f43b888 fixed inconsistencies with forge hammer rock recipes 2025-07-28 13:52:36 +01:00
Pyritie
a65449520e changed shaft recipes to shapeless #1453 2025-07-28 13:52:17 +01:00
Pyritie
0d282b18a8 updates for latest primitive creatures 2025-07-28 13:51:55 +01:00
Pyritie
2119a3bfe1 finally gt fixed this typo 2025-07-28 13:39:43 +01:00
Pyritie
9f62549467 changelog 2025-07-28 13:28:56 +01:00
Pyritie
ee5a610194 langs 2025-07-28 13:20:47 +01:00
Pyritie
589f1fc985 possible fix for #1447 2025-07-28 13:14:38 +01:00
Pyritie
5b7349afae updated pakku, fixed some version mismatches 2025-07-28 13:02:17 +01:00
Pyritie
6cd63cedda added missing fox cooking recipe 2025-07-28 10:38:36 +01:00
Redeix
9d2e5518a7
More multiblock fixes (#1470)
* Casing recipe changes

* Render fixes for greenhouse and railgun controllers
2025-07-28 10:10:11 +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
GameStar
d0af2cd96f
Update recipes.misc.js (#1460)
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-27 14:30:52 -05:00