Commit graph

382 commits

Author SHA1 Message Date
Pyritie
bdf2bd7691 merging dev into create-6 2025-06-24 01:40:08 +01:00
AirRice
2d94c67645
Create 6 work on my end (#1214)
* 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>
2025-06-24 01:32:17 +01:00
Pyritie
6ff62d3f9e started rearranging the ore processing chapter 2025-06-24 00:27:02 +01:00
Pyritie
c463ca6c59 quest updates, langs 2025-06-23 22:48:51 +01:00
Pyritie
3d1e167387 quest merging 2025-06-23 22:41:04 +01:00
Pyritie
e38425d597 removed old refrigerator, added conversion to new one 2025-06-17 14:47:42 +01:00
Pyritie
c13edcabdc merge food branch into space branch 2025-06-17 12:12:43 +01:00
Redeix
50ad90af2a
Merge branch 'active/food' into revert-3-feature/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-17 00:57:55 -05:00
Redeix
2e5295614c
Revert "merge" 2025-06-17 00:56:25 -05:00
Redeix
fb90ef6666
Merge branch 'dev' into active/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-16 23:54:43 -05:00
Pyritie
bc61d06232 merge 2025-06-17 01:02:15 +01:00
Pyritie
7f11bed7eb quest updates, langs 2025-06-16 18:37:24 +01:00
Pyritie
8b18a4c7a6 update greenhouse quest 2025-06-12 21:52:37 +01:00
Pyritie
b7cc04f188 merge 2025-06-12 13:33:44 +01:00
Pyritie
4d492e261d added lunchbox quest 2025-06-10 17:06:45 +01:00
Pyritie
c91f8efe0e changed LV optional quests to correctly have the heart icon 2025-06-10 17:06:14 +01:00
Pyritie
faa21ecbab removed giselle quest 2025-06-09 23:33:14 +01:00
Pyritie
9c41fe262f merge 2025-06-09 21:15:19 +01:00
Pyritie
1a5867d956 fixes #1107 2025-06-09 18:59:05 +01:00
TomPlop
e4014d1d6e
Small fixes for Empty Jar, Beekeeper quest and Assembler Chute (#1142)
* Fix Chute Assembler recipe

* Fix quest tips beekeper

* Fix for wine and jar alloy smelter conflicting recipe

* fix to fit #1141

* mistakes were made

* Fix jetpack 1 quest mv

* Mistake again

* Revert the fix on chute
2025-06-08 22:22:01 +01:00
Pyritie
04a57e48db Merge branch 'dev' into feature/space 2025-06-07 11:24:51 +01:00
Pyritie
80fff75580 fixes #1130 2025-06-05 21:44:37 +01:00
Pyritie
263a9dfab7 merge 2025-06-05 12:24:32 +01:00
TomPlop
955a838aca
Quests work (Langfile, WIP) (#1126) 2025-06-04 23:24:40 +01:00
Pyritie
076775bfc5 Merge branch 'dev' into feature/space 2025-06-02 23:07:47 +01:00
Spicy Noodles
52dcc54089
Add Optional Bacon Quest (#1122)
* Add bacon quest

* Fix merging issue

* Changelog

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-02 15:45:47 -05:00
ofoxsmith
c87af7bf16
Change lv chem reactor quest to require any container with rubber instead of a rubber bucket (#1116)
Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
2025-06-02 11:07:24 -05:00
Pyritie
a79652844d merge 2025-06-01 21:18:02 +01:00
Pyritie
050c90ae35 I finally found that pesky "combatting lag" quest 2025-05-31 19:35:02 +01:00
Pyritie
3f0206f35c ore processing chapter tweaks 2025-05-31 19:34:49 +01:00
Pyritie
0b47224d98 added better aqueous accumulator machine textures, added a quest for it, rearranged LV a bit because it was getting cramped 2025-05-31 15:14:03 +01:00
Redeix
e0cbe907f4
Trowel item (#1106)
* - Changed the weird assembler piston recipe.

* - Updated Changelog

* - Added Trowel tool.
- Increased size of piglin disguise to prevent texture clipping.

* - Updated Changelog
2025-05-31 11:35:36 +01:00
Pyritie
1305d713f4 merge 2025-05-29 21:01:25 +01:00
Pyritie
7a0c4b02d7 quests 2025-05-28 22:32:06 +01:00
Pyritie
c8c0c06a1e I know tom wants to overhaul the ae2 quests with space but we might as well fix the broken ores one in the meantime 2025-05-28 22:31:47 +01:00
Pyritie
fbbac7b70b quests 2025-05-27 22:41:48 +01:00
Pyritie
bc49d77568 quests 2025-05-27 21:28:52 +01:00
Pyritie
5eccb4e4a3 quests 2025-05-27 20:45:54 +01:00
Pyritie
0467750da5 quests 2025-05-27 20:14:33 +01:00
Pyritie
928e6084c1 Merge branch 'dev' into feature/space 2025-05-27 19:52:59 +01:00
Deneth Weerasinghe
7cf7778ed0
re-organise boat quests, added horse and astikor quests, misc. positioning (#1077)
Signed-off-by: Deneth Weerasinghe <11477150+deneth-weerasinghe@users.noreply.github.com>
2025-05-27 11:05:14 -05:00
Pyritie
d3ea33096b Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-22 13:14:54 +01:00
Pyritie
e9da541595 changed double ingot quests to only need a single item instead of 7 2025-05-22 13:14:51 +01:00
Redeix
e3c11b1e88
Added Piglin disguise. (#1058)
* - Added piglin disguise.

* - Updated Changelog
2025-05-22 10:18:16 +01:00
Pyritie
ae4abcadec merge 2025-05-21 20:59:36 +01:00
Pyritie
35ff6141f0 few more quest tweaks 2025-05-19 02:19:48 +01:00
Pyritie
30c8a05036 credit crafting 2025-05-18 20:11:49 +01:00
TomPlop
c6a2206d9e
Fixes for MV Quest (#1031)
* Fix quest for electrolyzer in MV

* Fix for MV quest
2025-05-18 18:51:55 +01:00
Pyritie
8fed595b82 some quest tweaks 2025-05-18 18:00:43 +01:00
Pyritie
b72c9fbeaa merge 2025-05-18 12:24:48 +01:00