* 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
* 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
* 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>
* updated primitive creatures, and figured out how to make them not spawn randomly any more
* tags and items and recipes
* tweak
* langs
* adding loot
* mod ID rename
* langs
* more loot tweaks
* loot tweaks
* Added the crop stuff I made so far
* I think thiss should be fine?
* I litteraly have no idea what I am doing
* I hope this fixes everything
---------
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
* fixed rabbit houses not spawning, put them in every biome but reduced the weight a bit
* changed moon rocks to be based off noise instead of biomes
* climate stuff
* back on that moon decoration grindset
* Rocket craft
* lunar foliage
* New crafting process for the Tier 1 Rocket (#971)
* Rocket craft
* fix name for asbestos
Signed-off-by: TomPlop <tomdidome@gmail.com>
* fix asbestos name
Signed-off-by: TomPlop <tomdidome@gmail.com>
* remove wires for rocket alloy and fix asbestos
Signed-off-by: TomPlop <tomdidome@gmail.com>
---------
Signed-off-by: TomPlop <tomdidome@gmail.com>
* removed kjs moon plants since they're in tfg-core now
* chorus plants!
* lang update
* moon biome/feature updates, added chorus plants
* this fucking lang that I hate
* added proper loose rock, rock pile, and rock delta features for all the moon rock types, added coral features, retextured warped vines
* added spikes for all ad astra rocks
* finished adding spikes for all rocks
* fixed moon rabbit houses
* HV Quests in eng and fixes for others quests and HV integration (#998)
* moved moonbase structure to the last step of worldgen so it doesn't get stuff placed on top of it
* langs for biomes
* tweaks for moon spikes and warped vines, added asurine biome decoration
* updated langs
* tweak to placement of loose moon stones
* spikes should now only generate underground
* craters...? not a huge fan of these tbh
* never mind, those craters looked bad
* loot tables for new moon blocks
* loot tables for "meteorites" and quartz blocks
* craters but for realsies this time
* Fixes for quests (#1000)
* ad astra configs
* added recipes for the oxygen loader
* started a tfg space recipes file, moved the air collector ones there
* Bedrock miner for the moon (#1021)
* bedrock vein moon
* Bedrock miner implementation
* adding mica vein and fixing vein id with tfg
* fix for id mica vein
* Fix Electrolyzing lang formate for moon update (#1032)
* changed moon worldgen depth from -64 to 0
* pakku
* figured out how to make pakku actually add the old version of ad astra we want
* added giselle-addon back for now
* fixed merge
* existing greenhouse recipes now require to be on earth
* moved these into a different file
* retextured raw iron block / raw iron ore, changed ad astra sky stone to look like more of a meteorite, langs
* removed brittle charcoal
* removed dead firmalife event
* added sand layer blocks
* added sand piles, added new sandy biome that replaces lunar_plains sometimes
* removed moon spikes
* oops fixed the spikes
* added loose rocks back to lunar_sands
* biome lang
* forgor to add lunar sands to the moon biome list
* changed stone layers so they all follow the same noise (easier to understand since that's how tfc does it too, more or less)
* ad astra recipe tweaks
* started recipes for some deco blocks
* updated ore field guide
* moonbase structure legs (I hate jigsaws!)
* tweaks to the asurine geode because it seems to cause chunk errors sometimes
* added rabbits to all neutral/sparse biomes, removed from all dense ones
* remove cheese block
* mobs for moon biomes
* loot tables and tags for moon endermen
* item sizes for ad astra
* yumy popped chorus fruit (needs a cooking recipe)
* biome tweaks again
* biome mob tweaks again
* more work on deco blocks, needs checking
* fixed rabbit spawns
* rabbit spawn tweaks, removed endermites because they're screwing with other mob spawns
* we got our own moon carvers now! that don't put lava underground any more!
* ad astra recipe tweaks and finishing up
* removed duplicate white flag recipe
* solar panel tweaks
* langs
* what if we just added recipes for these?
* added recipes for ae2 deco blocks, stone dust centrifuge recipes for the moon
* ash pile always gives ash
* chorus flower loot table
* desh raw ore block change
* ore vein updates
* oh yeah there's no etrium ore
* langs
* tfc-ambiental tooltips for space suits
* more recipe tweaks
* we love material unification
* fixed ad astra's lamps so they actually emit light lmao
* removed FE cables 💔
* adjusted the brightness of the generated raw ore textures
* langs
* mysterious cube recipe
* cc recipe tweaks
* langs
* asurine dust + centrifuge recipes
* does this fix the weird squares with structures?
* moon noise tweaks
* chorus/lightbloom stuff
* remove ad-astra-giselle-addon, tweak netherite spacesuit recipes
* revert new raw iron texture
* forgor one of the giselle recipes
* removed giselle quest
* langs
* compressed airs!
* whatever this is
* antigravity! and zip gun tags
* lang
* rearranged food recipes into hopefully a good format?
* custom gregtech machines and logic to handle TFC recipes (#1160)
* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
* Add placeholder assets for food machines (copied from gtceu)
* remove greenhouse definition from kubejs
* change greenhouse recipe
* Rework recipes file
---------
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
* pakku updates
* update greenhouse quest
* update greenhouse tooltip
* comment out coconut milk
* langs
* tooltip fix
* wrong food lang
* recipe fixes
* started work on rewriting the readme
* Update pakku-lock.json for lunchbox fix (#1164)
* - Update pakku-lock.json for lunchbox fix
* - Update pakku-lock.json
* Update pakku-lock.json
* bump
* Add some more food recipes (#1166)
* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
* Add placeholder assets for food machines (copied from gtceu)
* remove greenhouse definition from kubejs
* change greenhouse recipe
* Rework recipes file
* Modify food recipes
* Add some more recipes
* add more recipes and tidy up food recipe file
* change incorrect string
---------
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
* - Food changes
* - Updated texture for aqueous accumulator
* Update README.md
Signed-off-by: Pyritie <pyritie@gmail.com>
* - Updated texture for aqueous accumulator (#1168)
* - Food changes (#1167)
* fixes#1165
* removed gems tag from flint
* fixes#1162
* Migmatite conflict fix (#1153)
* Migmatite conflict fixe
Tbh I can hardly call this a good fix, but tbh with Stonecutter coming back this might even be meaningless
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
* Update Migmatite
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
* Update recipes.rocks.js
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
---------
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
* fixed some VI/rolling mill recipes that were still generating for removed items
* tweaked zinc color, added new plated block color
* nerfed durability of wooden tongs, slightly tweaked their recipe
* changelog
* quest updates, langs
* Adding glow ink recipe (#1171)
* Adding glow ink recipe
* config test
* changing to chem bath and 'glowing dye'
---------
Co-authored-by: Xikaro <os.valerievich@ya.ru>
* fixed ice capsule recipe not filling it up completely
* material and rose quartz stuff
* Bump softprops/action-gh-release in the dependencies group (#1172)
Bumps the dependencies group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release).
Updates `softprops/action-gh-release` from 2.2.2 to 2.3.2
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v2.2.2...v2.3.2)
---
updated-dependencies:
- dependency-name: softprops/action-gh-release
dependency-version: 2.3.2
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: dependencies
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* updated dimension marker for the beneath, new ones for other planets
* langs
* mushroom blocks now drop way less mushroom
* Active/food (#1176)
* rearranged food recipes into hopefully a good format?
* custom gregtech machines and logic to handle TFC recipes (#1160)
* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
* Add placeholder assets for food machines (copied from gtceu)
* remove greenhouse definition from kubejs
* change greenhouse recipe
* Rework recipes file
---------
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
* update greenhouse quest
* update greenhouse tooltip
* comment out coconut milk
* langs
* tooltip fix
* wrong food lang
* recipe fixes
* Add some more food recipes (#1166)
* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
* Add placeholder assets for food machines (copied from gtceu)
* remove greenhouse definition from kubejs
* change greenhouse recipe
* Rework recipes file
* Modify food recipes
* Add some more recipes
* add more recipes and tidy up food recipe file
* change incorrect string
---------
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
* - Food changes
---------
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
* Revert "Active/food (#1176)" (#1177)
This reverts commit 6c3fce648b.
* Revert "merge"
* - Fixed brining and smoking recipes and added drying recipes. (#1181)
* fixed ISPRecipeLogic path
* langs
* fixed magnetic neodymium material set inconsistency
* updated veins
* removed dioside, fayalite, enstatite
* removed old refrigerator, added conversion to new one
* whoops, conversion recipe was the wrong way around
* added some text to the food recipes!
* fixed vat having the wrong fluid for dyes, added other dye fluids
* whoops that removed the magnet icon from magnetic neodymium
* fix duplicate dyes
* firmalife moment
* did I forget to save this last night or something...?
* added a second recipe for leather water flask sides
* people are gonna hate me for this
* lang
* balance tweak?
* oh so that's why
* chicken
* dyes
* Whitelisted molds and pumps for Beneath Hellforge (#1183)
Signed-off-by: Indi <JEngelmannPE@gmail.com>
* fix refrigerator in structure
* species stuff and loot tables
* emi categories
* langs for bedrock ores
* trying to get the moon rabbit houses to not put squares on the ground
* birt stuff
* is this ever going to work?
* mob changes in moon biomes since we have birts and surface limpets now
* reduce the spawning of limpets
* loot table for birt dwelling
* the other egg tag for the birt egg
* I think that's how you do emissive textures?
* aircraft configs
* fix birt dwelling model
* - Merge current Venus progress (#1185)
* one of the mud hut structures had an old gregtech zinc ingot
* hid the netherite space suit recipes, tweaked the normal space suit a little
* cleaned up some of the tfc data files, also added moon meat!
* nerfed lava aqueous accumulator a bit
* fixed a few other steel items being extractable in LV
* changelog
* reorganized stone dusts, nerfed them a bit more
* changelog
* changelog, added blood lily to klayze loot
* changelog
* removed burpflower field guide page
* changelog
* comments
* changed rhyolite to use moon sand instead of white sand
* - Lots of food stuff (#1196)
* - Lots of food stuff
* Updated Changelog
* changed dry ice and calorie paste recipes (#1201)
* - Lots of food stuff
* Updated Changelog
* Changed dry ice and calorie paste recipes
* Update recipes.miscellaneous.js
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
---------
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
* lunchbox update into Pakku (#1200)
* Refactored KubeJS recipes for GT compatibility
lunchbox update into Pakku
* Refactored KubeJS recipes for GT compatibility
lunchbox update into Pakku
fixed bowl bug
fixed dupe food bug
* whitelisted glue for wood buckets/barrels
* removed better foliage again + visual workbench (doesn't handle recipes with greg tools very well)
* ABS glowstone recipe (#1202)
* Added ABS glowstone recipe
Idk how useful this is but I want it
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
* Update recipes.js
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
---------
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
* whoops
* no circuit needed here
* added dry ice to calorie paste recipe
* added space suit fabric
* fixed some models needing particles
* fixed recipe conflict with mushroom blocks
* tweaked glowstone, added purpur recipes, changelog
* changed clay bricks to extruder/curving press instead of assembler
* changelog
* Liquid burning (#1204)
* Added ABS glowstone recipe
Idk how useful this is but I want it
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
* Update recipes.js
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
* Update recipes.js
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
* Added the straw
TomTomTom gave it to me to copy paste it here so the straw is all his work
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
* Now it's tin alloy fluid pipe as per pyritie's wishes
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
* Added Tom's anvil recipe for the straw
Also added comments to make it a clear region
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
* Tier 5 now for straw
Tom edited the message after I saw it .
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
* Tom's changes to anvil recipe , now tier 3 and plate instead of pipe
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
---------
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
* Updated some recipes (Andesite table cover, chain conveyor, bound cardboard)
* Create logistics quests draft
* Nerfed rose quartz glacier spawn rate a bit by setting explicit temp ranges
---------
Signed-off-by: TomPlop <tomdidome@gmail.com>
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Indi <JEngelmannPE@gmail.com>
Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Redeix <59435925+Redeix@users.noreply.github.com>
Co-authored-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Indi <JEngelmannPE@gmail.com>
Co-authored-by: Thomasx0 <153584223+Thomasx0@users.noreply.github.com>
Co-authored-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
* AE2 Rework
* Adding a universal Requester recipe
* Lower tier of ME Requester
* Fix ME Requester again
* Fix for terminals Eu Tier
* Adding fluix dust to the AE2 Cables
* Add redstone to smart cable
* Change for Processor, Cryo Fluix in the Vac and new Fluix Crystal method
* Nerf moon processors
* Fixes to resolve PR
* Adding Pack/Unpack for colored cables
* Adding Accumulation Press Recipe and fix Molecular Assembler
* ignore .vs
* initial commit of ~space~
* fixed planets in config
* adding ore blocks to anorthite, renamed moon deepslate to dunite
* added moon ore veins, adjusted earth ones, added separate rock blocks
* added new buds for the new minerals, adjusted veins again
* forgot to add titanium to the moon!
* added moon zombies
* adjusted veins + added endermites
* first step to the moon
Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
* change sky colors back to black
* added ad astra ores
* add desh veins to the moon
* added missing certus clusters
* adding desh veins/loc
* adding meteors + rabbit houses
* cheeeeeeese
* replaced meteor concrete with sky stone
* burying the meteors a little more
* initial commit of ores to field guide tool
* updated mineral data with new space ores
* fixed trapdoor orientation
* added anorthite rocks/bricks, changed names of cut deepslate, made cut deepslate + asurine visible
* changed average moon temp
* First Push
* split 'for' value into arrays, added russian
* pillars are stone, not metal
* adjusting spawns (again)
* oh so that's how charge and energy budget work
* added recipes for the create decoration blocks
* bricks and rocks
* remove ad astra recipes
* added limpets to the moon
* Landing on Mars
Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
* Man thats a lot
* added translations for vein types, rock types, and added ukranium
* rabbit adjustments
* removed cooking anorthite cobble into raw
* Pushin P
* Parity
* Move translation tokens to the language tokens JSON
* Remove bin and obj
* Update .gitignore
* Update .gitignore
Signed-off-by: Pyritie <pyritie@gmail.com>
* moon mobs again
* Ore Index being Written
* More PRogress
* Improve string formatting
* toned down realgar
* structures! shulkers! oh my!
* Some progress on the vein index writing
* replace obsidian with scorchia in meteors
* meteor adjustments
* Actual vein index
* add globes to loot table
* Project Completed
* added solar power values
* adjusted ad astra recipes, hid some of the items, added bedrock ores
* more fiddling with structures
* made the rover a bit cheaper
* comply with review
* anorthite dust
* retextured shulkers
* disabled stuff from species/endermanoverhaul
* texture tweak
* recipe tweak
* fixed space rocks being invisible on the map for some reason
* removed earth bauxite vein
* mars rock
* mars stuff
* starting work on mars biome generation
* put biomes in folders
* climate stuff
* more mars worldgen
* added carve tag to space blocks
* move to correct folder
* removed veins
* added armalcolite to the moon
* anorthite -> anorthosite
* plagioclase -> syenite
* dunite -> basanite
* what is climate
* climates again
* mars rock layers
* fixed the temps!
* Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
* Add a Solution file
* adding this back
* remove tools folder since it was moved to a different repo
* some stuff that didn't merge
* updates
* merges
* merges
---------
Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: SverhRazum-Nah <leon.trol@mail.ru>
Co-authored-by: Nebby1999 <nebby131999@gmail.com>
