Commit graph

260 commits

Author SHA1 Message Date
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
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
75461a6496 oh so THAT's how you remove material properties 2025-07-29 11:55:53 +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
2119a3bfe1 finally gt fixed this typo 2025-07-28 13:39:43 +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
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
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
Gustavo
3d89d59d4d use strict 2025-07-21 13:52:18 +10:00
Redeix
611f5d9199
Recipes, Tags, Assets+ for railgun (#1394)
* - 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

---------

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-20 11:59:30 +01:00
GameStar
d068b91bae
Changed firmalife greenhouse to prevent exploits (#1371)
* Update tags.js

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

* Update tag_prefixes.js

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

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-19 10:34:24 +01:00
Nebby
f323e46e22
Pink Thorium (#1378) 2025-07-19 01:42:14 +01:00
Pyritie
9de6557326
nugget material fix, changelog (#1332) 2025-07-14 21:34:23 +01:00
Redeix
911ede670a
Created utility function to add circuit numbers to pre-existing recipes (#1320)
* - 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>

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-14 10:10:37 +01:00
GameStar
f9ece44a81
Bug fix/Adding in some missing recipes (#1319)
* kelp + seaweed dry

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

* add assembler 45-70

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

* fixed afc wood stomping barrel recipes

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

* give lead tfc properties

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

* give lead nuggets an anvil recipe

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

* Update CHANGELOG.md

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

* Update CHANGELOG.md

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-14 10:06:47 +01:00
Pyritie
30f50f2e97
Merging guns branch (#1283)
* Feature/ulv ev guns (#1280)

* update pakku mods

* mod config stuff

* Port over of current guns

* ae2 gun recipes

* nitrocellulose and other stuff

* more recipes

* gun packs

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

* Update pakku-lock.json

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

---------

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

* LICENSE

* changed powderbarrel to use lumber instead of wood boards

* lang

* gunpowder unification

* emi categories

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-13 12:31:39 +01:00
Pyritie
a571779997 fixed naming of casing blocks 2025-07-11 23:20:30 +01:00
TomPlop
092d03fbd5
Adding recipe type for LSP (#1277)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-07-11 21:19:16 +01:00
TomPlop
d7443ed9ba
Adding the LSP Structure (#1276)
Oups

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-07-11 21:19:09 +01:00
Nebby
208b2ece88
Bronze variant Mortars (#1270) 2025-07-11 08:28:33 +01:00
Pyritie
423da664fe fucking gregtech 2025-07-09 22:58:04 +01:00
Pyritie
9e60fb584a fixed some damascus steel stuff still showing up 2025-07-09 21:33:51 +01:00
Pyritie
3dffb8e93e remove ender eye, added vitrified ender pearl 2025-07-09 00:49:02 +01:00
GameStar
48d4475f6b
wire cutter mold and Hypertube compat (#1258)
* Update constants.js

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

* Update recipes.molds.js

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

* Create hypertube.png

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

* Add files via upload

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

* Create recipes.js

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

* Add files via upload

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

* Add files via upload

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

* Update main_server_script.js

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

* Update recipes.js

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-08 00:12:46 +01:00
Pyritie
8b9da9c142 no idea if this is fixed in GT7 or not, but the nano/quark armor has actual armor points now 2025-07-07 21:51:04 +01:00
Pyritie
df173e17ab more unification for #898, also a workaround for #963 maybe? 2025-07-07 18:54:55 +01:00