* everything should be fine
* Balance early power (#6)
* balance update
* Add textures
* last balance tweaks
* more balance
* Fix conflicts
* Balance early power (#8)
* balance update
* Add textures
* last balance tweaks
* Oupsi
* more fixes
* add changed quests
* push latest balance
* fix tallow
* add btx
* Update quests
* Oups
* Adding some nuclear stuffs so I can merge my branches
* Isotopic solvent stuff (#10)
* push
* fix iconset issue
* adding all the textures change
* add more stuffs
* Push recipes
* new stuffs
* add stuffs
* more changes
* add textures and some recipes
* tons of change
* fix texture
* add textures and other stuffs
* more recipes
* add recycling for fission rods
* more recipes
* fix fluid textures
* comment out FLiBe again and balance rods
* fix fluids
* some latest fix
* fix more texture
* more recipe changes
* more recipes
* some last minute balance changes
* add quests
* fix conflict
* more fixes
* fix components
* var to const
---------
Co-authored-by: Spicy Noodles <93035068+SpicyNoodle5@users.noreply.github.com>
* artisan table merging (#2766)
* these should be good
* Update recipes.miscellaneous.js
* little typo
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
* fix typo, my bad gang
* fix charnia
* fixed recycling issues from the material rewrite, updated everything to the new recycling helper method
* I'll move these eventually
---------
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
* artisan table assets
* asset update
* Update recipes.artisan_table.js
* asset update
* lang
* tag refactor
* waiter! more assets please
* recipes
* done?
* I forgor
---------
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
* blocks
* more textures
* more textures more textures
* blocks
* more textures
* more textures more textures
* blocks
* more textures
* more textures more textures
* blocks
* more textures
* more textures more textures
* firmalife gh stuff
* chloroplasts and brick regex
* gh recipes
* pisciculture fishery
* I am going insane
* more casings = more gooder
* rotten voiding cover
* greenhouse glory
* Is this it chat
* not needed
Signed-off-by: Redeix <redeix.m@gmail.com>
* missed in conflicts
Signed-off-by: Redeix <redeix.m@gmail.com>
* consumerism
* re-add tag import
* remove unused object map
* id normalizer function
---------
Signed-off-by: Redeix <redeix.m@gmail.com>
* Add materials and multiblock
* try to fix conflict
* Fix conflict
* Fix conflict
* Rework tungsten line (#5)
* fix materials
* Update Ostrum to core
* Fix conflict
* fix conflict
* Fix fucking conflict
* Upload more changes
* Add more things
* Introduce new gas fuel
* Add Anthracite
* Add Syngas early game and more modifications
* More fixes
* Add textures to fluid
* initial pass of venus stuff
* more
* typo
* venus mob hp/armor? adjustments
* temp biomes to figure out where everything is, starting work on noises
* almost there
* fix glacio visibility on the menu
* more beachy
* biome renames
* biomes in the constant
* had to turn off cheese caves cuz they kept fucking up the terrain
* added random y rotation to all cobble/gravel/hardened
* ok I think I'm done with noise for now, caves still need work
* bare bones
* snow piled tag
* added climate restriction to quicksand, added powder snow up north
* better tagging
* langs
* assets
* missed feature in deep desert
* remove waves from mars
* climate tweaks
* icicles and dry ice stuff
* langs
* 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>
* - 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>
