Commit graph

119 commits

Author SHA1 Message Date
Pyritie
21173d5711 langs 2025-09-20 11:54:10 +01:00
Pyritie
024440e645 shifted up some of the new dust icons by 1px 2025-09-15 14:38:48 +01:00
Pyritie
49f91732d3 langs 2025-09-13 15:35:59 +01:00
Pyritie
fc1e53f99f langs 2025-09-11 08:32:12 +01:00
Pyritie
efe6d0c7dc crackrack now uses netherrack dust 2025-09-09 23:30:48 +01:00
Pyritie
93b7518278 merge langs 2025-09-09 11:25:01 +01:00
Pyritie
7bc1376348 langs 2025-09-08 00:44:14 +01:00
Pyritie
d595adad95 langs 2025-09-05 01:53:18 +01:00
Pyritie
4ccad6a580 langs! including russian! wow! 2025-09-04 21:37:45 +01:00
Pyritie
4a9b92c350 langs 2025-09-03 23:15:00 +01:00
Redeix
957da2cbba
bioreactor stuff (#1742)
* bioreactor stuff

* Update recipes.js

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>

---------

Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-09-03 11:56:36 -05:00
Pyritie
63a85f1777 langs 2025-09-03 02:12:04 +01:00
Pyritie
0a98ad4449 added some underground mobs, martian raptor still needs a reskin 2025-09-03 01:40:30 +01:00
Pyritie
54c01208cb langs 2025-09-02 02:25:51 +01:00
Pyritie
04df604943 langs 2025-08-31 02:26:37 +01:00
Pyritie
bb59f9040b new chinese translation! 2025-08-29 23:50:30 +01:00
Pyritie
bc7e3122d0 lang 2025-08-27 21:38:49 +01:00
Pyritie
4812aa5634 langs 2025-08-23 22:01:57 +01:00
Pyritie
8d7abd4cf7 langs 2025-08-23 21:54:21 +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
b87c42be06 langs 2025-08-22 23:11:35 +01:00
Pyritie
e76bed1b25 langs 2025-08-22 21:59:42 +01:00
Pyritie
55b56630eb changelist for tom, also removed all the redundant dusty_raw_ore item models and the old bedrock ore function 2025-08-22 12:49:53 +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
cdd8213bed langs 2025-08-21 22:29:55 +01:00
Pyritie
5a5c5040fd fixed dust secondary texture 2025-08-09 23:57:23 +01:00
Pyritie
44acd49485 added more icon sets for dusts and rods 2025-08-09 21:56:24 +01:00
Pyritie
3b9b80f52d lang updates 2025-08-09 15:47:43 +01:00
Gustavo
7eda76d0c4 run lang merger 2025-08-09 08:30:27 +10:00
Pyritie
7af3303fe9 rapeseed -> canola 2025-08-07 22:56:28 +01: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
Pyritie
eb6cd8080b langs, pakku 2025-08-03 12:55:23 +01:00
Pyritie
73575f1ed3 langs 2025-08-02 18:51:08 +01:00
Pyritie
6e860ccb52 langs 2025-08-02 17:32:29 +01:00
Pyritie
7cbdf75a5f circuit tag models! 2025-08-02 16:11:12 +01:00
Pyritie
1e34e098bb langs + cl 2025-08-02 12:20:13 +01:00
Pyritie
e22ea96353 ukranian langs 2025-08-01 21:35:11 +01:00
Pyritie
246b1ad94e langs 2025-07-31 21:59:23 +01:00
Pyritie
077190e902 initial commit for mars crops 2025-07-31 00:53:53 +01: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
bea7603db6 langs 2025-07-28 23:59:03 +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
22af9eda3e gregnant man emoji 2025-07-28 23:10:23 +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
ee5a610194 langs 2025-07-28 13:20:47 +01: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
Pyritie
822746efdf langs 2025-07-23 20:29:50 +01:00
Pyritie
41b9ebab98 gas pressurizer recipes + langs 2025-07-18 22:53:30 +01:00
Pyritie
8db3266ada langs, disabled unused casings 2025-07-11 22:39:35 +01:00