Commit graph

586 commits

Author SHA1 Message Date
Pyritie
3dffb8e93e remove ender eye, added vitrified ender pearl 2025-07-09 00:49:02 +01:00
Pyritie
31b41e703d firmalife quests 2025-07-08 15:25:00 +01:00
Pyritie
bf0dfe24ba quests 2025-07-08 14:58:11 +01:00
Nebby1999
ad3683a9bc Add recipe for Bamboo Hopper. Add quest for it too 2025-07-07 21:28:19 -04:00
Pyritie
ce94fac844 changed the repeatable quest to a separate one, so new players still get the books on spawn 2025-07-07 19:23:05 +01:00
Pyritie
f2a2eabf6c quests 2025-07-07 18:55:07 +01:00
Redeix
c6a26d49b0
Hide wild crops and forgot to push some quest stuff (#1252)
* - 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.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

* - Quests re-ordering and some new ones

* - Hide wild crops from emi

* - Hide wild crops from emi

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-07 01:20:51 +01:00
Pyritie
54f01fbff0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-07 00:40:10 +01:00
Pyritie
4113da26c1 tweaks to default keybinds 2025-07-07 00:40:09 +01:00
Redeix
d0ad38a901
Quest changes (#1251)
* - 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.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

* - Quests re-ordering and some new ones

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-07 00:36:56 +01:00
Pyritie
2847652763 this stupid quest that I hate 2025-07-06 15:13:38 +01:00
Pyritie
aa85b679c7 added bio fuel quests, more biodiesel recipes 2025-07-06 14:08:25 +01:00
Redeix
035d55ffd5
Biodiesel Stuff (#1249)
* - 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.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-06 11:56:14 +01:00
Pyritie
54a6a90868 changelog 2025-07-05 20:00:58 +01:00
Pyritie
1a8efac05f made the space station quest optional 2025-07-05 19:47:11 +01:00
Pyritie
8f6edd922a langs n quests 2025-07-05 19:41:01 +01:00
Pyritie
afa435898f I think that's the ore processing chapter sorted 2025-07-05 16:19:45 +01:00
Pyritie
0e34f7295f added create factory logistics 2025-07-05 15:01:08 +01:00
Redeix
c16af2c440
Updated more textures for ad-astra stuff + new panorama (#1247)
* - 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.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-05 12:12:45 +01:00
Pyritie
6bf2ad74cd
Mechanical press (#1243)
* welcome back, mechanical press

* EMI category order

* langs

* quests

* emi categories

* quests

* greate stress settings for the mech press

* I got distracted so I guess these are on this branch now

* removed welding recipes from the pressurizer

* recipe additions and changes for the mech press!

* let's go gambling!

* added flux to the mech press "welding" recipes
2025-07-05 01:41:03 +01:00
Redeix
2c834b527d
Updated stromatolite textures + some new venus foliage (#1234)
* - 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.

* - Updated stromatolite textures
- Added some more WIP venus foliage

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-01 12:04:14 +01:00
Pyritie
43277f195e
removed forgiving world, added simply stacked dimensions, added configs (#1233) 2025-06-30 17:51:10 +01:00
Pyritie
b693394a9a disabled the correct planets 2025-06-30 00:23:14 +01:00
Pyritie
892b8d4d3f the moon and orbits are now silent 2025-06-30 00:22:53 +01:00
Pyritie
dc9c200a8f fixed ethane quest requiring plant ball route 2025-06-30 00:14:25 +01:00
Pyritie
360a7ccabd don't need you 2025-06-29 23:34:23 +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
Xikaro
04e80fe4d1 update: config 2025-06-29 07:03:51 +05:00
Pyritie
6d971bead8 quest tweaks 2025-06-28 00:57:10 +01:00
Redeix
ed41d542aa
- Lots of ui updates. And a couple fixes. (#1221)
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-27 11:49:46 +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
cb8a5e6df9 hide all the error messages from ae2's ingame guide, see GuideMe#58 2025-06-24 17:54:37 +01:00
Pyritie
b350b0a16d included some default options for resource packs, turning off narrator, volume 2025-06-24 17:26:48 +01:00
Pyritie
172886f0f0 redo of 8bc9247 2025-06-24 14:54:53 +01:00
Pyritie
4dce92912f quest changes for create logistics 2025-06-24 14:06:39 +01:00
Pyritie
9984b86daf quest + recipe tweaks 2025-06-24 13:45:28 +01:00
Pyritie
fe565ca094 quest 2025-06-24 13:10:54 +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
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
4ae60492d4 aircraft configs 2025-06-18 01:27:34 +01:00
Pyritie
ddf9851a42 chicken 2025-06-17 20:07:59 +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