* 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
* more fixes to nuclear line
* test to increase output
* 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>
* 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
* - 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>
* 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>
