Commit graph

2758 commits

Author SHA1 Message Date
Pyritie
fa1729b873 missing stone recipes 2025-04-29 20:07:47 +01:00
Pyritie
7c86ce53c0
Merging space stuff from my own fork into the main repo (#935)
* 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>
2025-04-29 19:38:01 +01:00
Pyritie
7606ee85c6 changed realgar item set 2025-04-29 16:30:15 +01:00
Pyritie
1c80c01d90 moved surface_kaolin to mechanics category 2025-04-29 16:22:11 +01:00
Pyritie
2e8f96c159 changed some create recipes to use bolts instead of nuggets, so they're available earlier 2025-04-29 16:09:02 +01:00
Pyritie
9339ef1146 updated changelog 2025-04-29 15:46:31 +01:00
Pyritie
1e8ea54fbe the placeholder programmed circuit recipe is now a stick + wrench, so it doesn't confuse new players as much 2025-04-29 15:45:57 +01:00
Redeix
7b678a5bef
- Added recipe to separate fertilizer into pure sources, and mix them back together. (#927)
- Added recipes to sew hides together and cut them apart.
2025-04-29 15:39:55 +01:00
Pyritie
b01a61335d remove caelum + tfc caelum #922 2025-04-29 15:37:30 +01:00
Pyritie
fc6857668d Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-04-29 15:16:33 +01:00
Pyritie
6a616662a9 toned down how many sticks were being placed in the nether 2025-04-29 15:16:31 +01:00
Pyritie
94d8004b02 big field guide update! all ore veins are now generated with our tool! 2025-04-29 15:16:09 +01:00
Pyritie
4a19732784 ore basics + hazards field guide entry tweaks 2025-04-29 13:26:22 +01:00
Xikaro
8c6d739830
Merge pull request #925 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-beb19bfee9
Bump actions/download-artifact from 4.2.1 to 4.3.0 in the dependencies group
2025-04-29 09:26:51 +05:00
Pyritie
34d18f5c58 more create SU adjustments 2025-04-29 00:47:41 +01:00
Pyritie
4fb23f4e94 will you leave me alone if I submit these, ftbquests? 2025-04-29 00:21:58 +01:00
dependabot[bot]
9e05ae7929
Bump actions/download-artifact in the dependencies group
Bumps the dependencies group with 1 update: [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/download-artifact` from 4.2.1 to 4.3.0
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4.2.1...v4.3.0)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: 4.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-28 23:18:51 +00:00
Pyritie
72f7349cfe Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-04-29 00:16:24 +01:00
Pyritie
389c6d4ef5 Added more details to ore hazards field guide entry 2025-04-29 00:16:16 +01:00
Pyritie
87f67c8be5 lowered recipe speed of bulk washing 2025-04-29 00:15:59 +01:00
Pyritie
70a9dfd920 Added recycling recipes for your old molds 2025-04-29 00:15:21 +01:00
Pyritie
79ac1b6799 Fixed nano legs buff from also removing speed buff, for now 2025-04-29 00:14:32 +01:00
Redeix
bcc6c9cbf6
Merge pull request #924 from Redeix/dev
Actual fix for astikor cart item size!
2025-04-28 14:07:33 -05:00
Redeix
26322a1550
Merge branch 'TerraFirmaGreg-Team:dev' into dev 2025-04-28 13:17:10 -05:00
Redeix
1d47b73d4d - Missed this commit last time oops 2025-04-28 13:16:17 -05:00
Redeix
9fac32f5d0
Merge pull request #923 from NobleWasTaken/patch-1
Update carryon-common.toml
2025-04-28 09:26:26 -05:00
NobleWasTaken
1a811cff18
Update carryon-common.toml
Carry On's config doesn't seem to work with tags (#), so I explicitly added the framedblocks chest and the tfc chests to the whitelist. I also removed storage drawers since they aren't in use.

Signed-off-by: NobleWasTaken <137561393+NobleWasTaken@users.noreply.github.com>
2025-04-28 05:33:32 -04:00
Pyritie
a69e32beac changed early game recipes to use small gears instead of large, to avoid duping, and make cogs easier 2025-04-27 17:12:25 +01:00
Pyritie
f16f525f05 fixed lang files for universal circuits 2025-04-27 17:11:41 +01:00
Pyritie
c1c9382d26 fixed stress levels on the rolling mill 2025-04-27 17:11:32 +01:00
Pyritie
323bd1d04f added caelum + tfc-caelum to pakku 2025-04-27 12:15:47 +01:00
Pyritie
745f5f26c0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-04-27 11:30:22 +01:00
Pyritie
7eeb258445 changed Caelum to be on the server too, since tfc-caelum is also a server mod 2025-04-27 11:30:20 +01:00
Xikaro
84014d405e Update build.yml 2025-04-27 12:49:52 +05:00
Xikaro
0cc983613f Update build.yml 2025-04-27 12:46:58 +05:00
Xikaro
8b9b009646 Update build.yml 2025-04-27 12:44:17 +05:00
Xikaro
10bf9482c7 Update build.yml 2025-04-27 12:42:36 +05:00
Xikaro
46634beabd Update build.yml 2025-04-27 12:34:13 +05:00
Xikaro
4ad8117e3f
Merge pull request #919 from TerraFirmaGreg-Team/dev
Alpha Release: 0.9.2
2025-04-27 12:20:56 +05:00
Xikaro
0c3b28549f update 2025-04-27 12:18:51 +05:00
Xikaro
c1aa2dc7b7 pakku-lock.json 2025-04-27 12:14:49 +05:00
Xikaro
fdd400c8aa Update mods 2025-04-27 12:09:28 +05:00
Xikaro
e831055770 Update CHANGELOG.md 2025-04-27 12:06:54 +05:00
Pyritie
f6121eb23c fixed crash when making a new world 2025-04-26 19:13:51 +01:00
Pyritie
9eccbdcfa3 added anvils to the progression chapter 2025-04-26 19:13:42 +01:00
Pyritie
5df8384508 added missing circuits to progression quest 2025-04-26 18:54:01 +01:00
Pyritie
a9faa552f4 missed a removal 2025-04-26 18:47:10 +01:00
Pyritie
f3aebd0bc8 deleted multiblock dilemma chapter 2025-04-26 18:39:57 +01:00
Pyritie
bc26664aa0 more glue for the glue gods 2025-04-26 18:23:41 +01:00
Pyritie
bff1604f5d added missing ULV bus/hatch recipes, fixed LV ones 2025-04-26 18:22:47 +01:00