Commit graph

4084 commits

Author SHA1 Message Date
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
Pyritie
2480711abe pakku update tfc, afc, firmalife, sophisticated core 2025-07-27 18:29:37 +01:00
Vazde
b59a4e8136
Universal compost items (#1451)
* Added universal compost

* Universal compost changes from comments
2025-07-27 11:21:26 -05:00
Pyritie
b6fc3e9fee Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-27 14:50:19 +01:00
dependabot[bot]
556d2c75bf
Bump WcAServices/markdown-template-action in the dependencies group (#1458)
Bumps the dependencies group with 1 update: [WcAServices/markdown-template-action](https://github.com/wcaservices/markdown-template-action).


Updates `WcAServices/markdown-template-action` from 1.1.0 to 1.1.1
- [Release notes](https://github.com/wcaservices/markdown-template-action/releases)
- [Commits](https://github.com/wcaservices/markdown-template-action/compare/v1.1.0...v1.1.1)

---
updated-dependencies:
- dependency-name: WcAServices/markdown-template-action
  dependency-version: 1.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-07-27 17:39:13 +05:00
Xikaro
2e657abc11 workflows 2025-07-27 17:37:44 +05:00
Xikaro
aada247c9c Update README.md 2025-07-27 02:29:32 +05:00
Pyritie
9c09341baf maybe not the ingot one 2025-07-26 17:21:42 +01:00
Pyritie
cc65088782 cl 2025-07-26 17:10:28 +01:00
Pyritie
76001f0fc4 fixed cobalt brass buzzsaws not being obtainable until mv 2025-07-26 17:10:06 +01:00
Pyritie
f117c73e5d fixed error with mars water block state 2025-07-26 14:59:42 +01:00
Pyritie
25c53b77b3 fixed noodle caves going through bedrock on mars 2025-07-26 14:13:07 +01:00
Pyritie
061a6d2a06 added missing cobblestone recipes to the rock breaker 2025-07-26 12:57:16 +01:00
Pyritie
d3b3feed73 cl 2025-07-26 12:50:35 +01:00
Pyritie
d451d49800 added recipes for middle tier compost in mixer, added compostable tag to vanilla moss 2025-07-26 12:48:43 +01:00
Pyritie
0ca052548c fixed kjs error with red granite cobble 2025-07-26 12:48:09 +01:00
Pyritie
cb67e97ef8 nerfed speed of VI machines a little 2025-07-26 12:47:56 +01:00
Pyritie
7375946439 added mixer recipes for medium composts 2025-07-26 12:44:20 +01:00
Pyritie
4e5256aafd clarified info on the solar panel tooltip 2025-07-26 01:30:04 +01:00
Pyritie
8040ff120e Merge branch 'main' into dev 2025-07-26 01:15:36 +01:00
Pyritie
75129d0421 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-26 01:09:41 +01:00
Pyritie
39c74a1d6f water tags and rock breaker recipes 2025-07-25 23:20:25 +01:00
Xikaro
2ecbb7e3ce Update test.yml 2025-07-26 03:01:11 +05:00
Xikaro
c04d8d2f87 Update test.yml 2025-07-26 02:59:47 +05:00
Xikaro
db652a609b Update test.yml 2025-07-26 02:58:40 +05:00
Xikaro
c4773c69d3 Update test.yml 2025-07-26 02:57:30 +05:00
Xikaro
8fc11c07ba Update test.yml 2025-07-26 02:54:25 +05:00
Xikaro
154671aa95 Update test.yml 2025-07-26 02:51:46 +05:00
Xikaro
1c1683e365 Update test.yml 2025-07-26 02:49:31 +05:00
Xikaro
0e07bce7b9 Create test.yml 2025-07-26 02:48:18 +05:00
Xikaro
88ef885074
Merge pull request #1443 from TerraFirmaGreg-Team/dev
Release: 0.10.4
2025-07-26 02:37:01 +05:00
Xikaro
fa0a9d870c Update build.yml 2025-07-26 02:34:22 +05:00
Pyritie
188f52cdc1 release 2025-07-25 22:27:06 +01:00
Pyritie
2af4a2304b revert, apparently this isn't possible 2025-07-25 22:23:14 +01:00
Pyritie
4ba64772c8 changelog 2025-07-25 22:15:42 +01:00