Commit graph

97 commits

Author SHA1 Message Date
Pyritie
43277f195e
removed forgiving world, added simply stacked dimensions, added configs (#1233) 2025-06-30 17:51:10 +01:00
Pyritie
7bf9cfbd19 updated entityjs, everycomp, moonlight, packetfixer, vintageimprovements 2025-06-30 13:18:05 +01:00
Redeix
f7ec600f13
Modern markings integration (#1228)
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-29 20:02:42 +01:00
Pyritie
8cc6b86f45 updated kubejs-tfc 2025-06-28 23:39:15 +01:00
Pyritie
51e3725748 removed ae2-things 2025-06-27 00:54:25 +01:00
Pyritie
1696806401 updated steam n rails, added entityjs 2025-06-25 22:55:21 +01:00
Pyritie
0a7ea3e6ab added resource pack for the old create copper textures, reverted the new models of the greate pumps 2025-06-24 18:00:17 +01:00
Pyritie
f41f02c41a update tfg-core in pakku 2025-06-24 15:08:56 +01:00
Pyritie
fdd3d50383 pakku 2025-06-24 13:16:12 +01:00
Pyritie
dc21750233 bumped forge version 2025-06-24 13:10:40 +01:00
aidie8
a721bda6e1
Updated more mods (#1215) 2025-06-24 11:34:41 +01:00
Pyritie
caacbd111c pakku 2025-06-24 02:25:50 +01:00
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
82312a6dec updated kubejs-tfc in pakku, fixed climate stuff to work with the new api changes 2025-06-24 00:45:55 +01:00
Redeix
e2a04c8c25
Revert "Dev -> space sync" 2025-06-22 00:46:22 -05:00
Redeix
2138a8b0dc
Merge branch 'feature/space' into dev
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-22 00:40:02 -05:00
Pyritie
5d5479d02a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-20 21:03:29 +01:00
Pyritie
9d0d152fb9 removed better foliage again + visual workbench (doesn't handle recipes with greg tools very well) 2025-06-20 21:03:27 +01:00
Thomasx0
54f30d5cc6
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
2025-06-20 18:33:02 +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
Xikaro
c8203a17ce Update pakku-lock.json 2025-06-13 22:09:57 +05:00
Redeix
77d981c5fa
Update pakku-lock.json for lunchbox fix (#1164)
* - Update pakku-lock.json for lunchbox fix

* - Update pakku-lock.json
2025-06-13 11:43:34 -05:00
Pyritie
db1907f1a5 pakku updates 2025-06-12 20:38:22 +01:00
Pyritie
b7cc04f188 merge 2025-06-12 13:33:44 +01:00
Pyritie
3dd247ab7e pakku updates 2025-06-11 20:58:52 +01:00
Redeix
390bdc3cba
Update pakku-lock (#1157)
* - Added loot table to piglin disguise and updated its texture.
- Reformated lootjs file

* - Update pakku-lock.json
2025-06-11 01:30:43 -05:00
Pyritie
f53fb9b51b added tfc-lunchbox to pakku too 2025-06-10 16:33:07 +01:00
Pyritie
bfc4a46f68 remove ad-astra-giselle-addon, tweak netherite spacesuit recipes 2025-06-09 23:21:36 +01:00
Pyritie
04a57e48db Merge branch 'dev' into feature/space 2025-06-07 11:24:51 +01:00
Pyritie
e8c9346f8a added computercraft/advanced peripherals resource pack 2025-06-07 11:12:01 +01:00
Pyritie
1942321b1c added clean-swing-through-grass mod 2025-06-05 21:48:45 +01:00
Pyritie
6a06c5298a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-05 21:44:39 +01:00
Pyritie
263a9dfab7 merge 2025-06-05 12:24:32 +01:00
Xikaro
c2b330acf0 Update pakku-lock.json 2025-06-05 12:53:22 +05:00
Pyritie
0d5c176d3a added a resource pack that makes some animals look nicer 2025-06-05 00:26:09 +01:00
Pyritie
d8c4713247 pakku moment 2025-06-04 22:36:54 +01:00
Pyritie
076775bfc5 Merge branch 'dev' into feature/space 2025-06-02 23:07:47 +01:00
Pyritie
b1187d43ef removed ftb-quests-optimizer because it's causing problems with quests not completing 2025-06-02 10:30:47 +01:00
Pyritie
a79652844d merge 2025-06-01 21:18:02 +01:00
Pyritie
dcd975a430 added tfc anvil helper resource pack 2025-06-01 16:47:29 +01:00
Pyritie
76064bd8d2 reverted the modernfix revert, added changelog #1102 2025-06-01 15:58:21 +01:00
Pyritie
7b5e3ab204 changed modernfix back to an older version because it was removing tooltips and jade information. Also added back better-foliage 2025-06-01 15:32:53 +01:00
Pyritie
996d3cccd4 Revert "pakku updates"
This reverts commit 6f550a8daa.
2025-06-01 00:05:20 +01:00
Pyritie
6f550a8daa pakku updates 2025-06-01 00:04:53 +01:00
Pyritie
1d2a9125da remove betterfoliage (it is not, in fact, better) 2025-05-31 23:55:55 +01:00
Pyritie
0828126688 removed spark because it makes macos crash (fixes #1096) 2025-05-30 14:55:21 +01:00
Xikaro
ef3fe83260 pakku 2025-05-30 02:56:54 +05:00
Pyritie
1305d713f4 merge 2025-05-29 21:01:25 +01:00