Commit graph

423 commits

Author SHA1 Message Date
Pyritie
17e7981da7 merge 2025-05-31 13:22:08 +01:00
Pyritie
2ceba8b259 aqueous accumulator recipes 2025-05-31 13:21:37 +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
8a283343e4 Merge branch 'dev' into feature/create-6 2025-05-29 21:01:44 +01:00
Pyritie
1305d713f4 merge 2025-05-29 21:01:25 +01:00
Pyritie
ca354a55a9 updated ore vein tags so they're now all in one auto-generated file 2025-05-29 13:00:15 +01:00
Redeix
e3dd2e8e2d
- Fixed pill behavior with cheats off (#1084)
* - Fixed pill behavior with cheats off

* - Updated Changelog
2025-05-28 08:26:25 +01:00
Pyritie
59d2fa64a1 added some more medicine plants 2025-05-27 21:48:21 +01:00
Pyritie
c58f1ee5e5 fixes #1063 2025-05-27 20:42:13 +01:00
Pyritie
928e6084c1 Merge branch 'dev' into feature/space 2025-05-27 19:52:59 +01:00
Pyritie
d7fb2981fc Merge branch 'dev' into feature/create-6 2025-05-27 19:52:43 +01:00
Redeix
e3c11b1e88
Added Piglin disguise. (#1058)
* - Added piglin disguise.

* - Updated Changelog
2025-05-22 10:18:16 +01:00
Pyritie
0c2a7164b5 Merge branch 'dev' into feature/create-6 2025-05-21 21:00:20 +01:00
Pyritie
0e6b6d5998 added chisel recipes for stone walls 2025-05-18 22:06:29 +01:00
Pyritie
b72c9fbeaa merge 2025-05-18 12:24:48 +01:00
Pyritie
c3994e36f0 Merge branch 'dev' into feature/create-6 2025-05-18 12:22:27 +01:00
Pyritie
077ebdaf83 hid the new space tfg blocks 2025-05-15 23:21:48 +01:00
Pyritie
448ea6f60b started a tfg space recipes file, moved the air collector ones there 2025-05-15 01:19:39 +01:00
Pyritie
13adbc189f craters but for realsies this time 2025-05-14 01:19:17 +01:00
Pyritie
9262133484 merge 2025-05-13 10:55:31 +01:00
Pyritie
9069b4c1a6 Merge branch 'dev' into feature/create-6 2025-05-13 10:53:57 +01:00
Pyritie
4aee3b2f51 added proper loose rock, rock pile, and rock delta features for all the moon rock types, added coral features, retextured warped vines 2025-05-13 10:53:11 +01:00
Redeix
a097ec6174
Merge branch 'dev' into dev
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-13 01:25:09 -05:00
Redeix
a2ed5209c2 - Revert mold changes from #987 2025-05-13 01:19:09 -05:00
Zack
f1fadb4e99
Add wrought iron alternatives for early game cast iron recipes (#985)
* Add wrought iron alternatives for early game cast iron recipes

* Change doulbe iron ingots tag to use #forge item tags
2025-05-12 11:02:11 -05:00
Redeix
cf54f584b4
Fixes and features (#987)
* - Fixed hide duping recipes.
- Added quest book and field guide instances for fishing nets.
- Fixed rebar support recipe crash.
- Fixed red steel flask dupe.
- Fixed red alloy recipe inconsistency.

* - Fixed blue steel backpack block lang

* - Added max vessel fluid warning to small vessels.

* - Moved red steel flask recipe

* - Fixed fishing nets event function

* Update queststfc_tips.snbt

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* Update en_us.json

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added item to summon armor stands with arms

* - Added recipes to empty vessels and molds

* - Added recipes for extracting/ forming magma blocks.

* - Added recipes for extracting/ forming magma blocks.

* - Nerfed steel support recipe output.

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-05-12 12:29:10 +01:00
Redeix
1b3e4c98db - Nerfed steel support recipe output. 2025-05-11 23:33:00 -05:00
Redeix
0d96bc775a - Added recipes for extracting/ forming magma blocks. 2025-05-11 23:22:30 -05:00
Redeix
7176adfc8d - Added recipes to empty vessels and molds 2025-05-11 22:49:16 -05:00
Redeix
9564090c1b - Added item to summon armor stands with arms 2025-05-11 22:15:31 -05:00
Redeix
e47e591c02 - Fixed fishing nets event function 2025-05-11 21:14:36 -05:00
Pyritie
594fd5ee16 oh so THAT's why the recycling recipes weren't working... 2025-05-11 17:52:01 +01:00
Pyritie
c26883efce fixed chiseling non-tfc blocks into slabs was only returning 1 slab instead of both 2025-05-09 00:31:25 +01:00
Pyritie
ec576813c2 Merge branch 'dev' into feature/space 2025-05-08 22:15:15 +01:00
Pyritie
415b8f6779 fixes #955 2025-05-07 21:56:00 +01:00
Redeix
6b364bcf01
Quick Fixes (#962)
* - Fixed hide duping recipes.
- Added quest book and field guide instances for fishing nets.
- Fixed rebar support recipe crash.
- Fixed red steel flask dupe.
- Fixed red alloy recipe inconsistency.

* - Fixed blue steel backpack block lang

* - Added max vessel fluid warning to small vessels.

* - Moved red steel flask recipe
2025-05-07 09:26:11 +01:00
Pyritie
96d318d3b0 loose/brick rock textures, knapping textures, missing rock recipes, fixed rock sounds 2025-05-06 16:01:39 +01:00
Pyritie
673ce4fc51 forgot to remove some logging 2025-05-06 14:18:47 +01:00
Pyritie
0256ece0dd added loose stone, bricks, and recipes for all the different ad astra stone types 2025-05-05 20:08:42 +01:00
Pyritie
2c0d2cbd24 big rock naming overhaul -- keeping to the ad astra naming scheme, then using lang files to give them funny rock names 2025-05-05 17:41:36 +01:00
Pyritie
fdebad6f76 Merge branch 'dev' into feature/create-6 2025-05-05 16:10:07 +01:00
Pyritie
38219fdb98 Merge branch 'dev' into feature/space 2025-05-05 16:08:00 +01:00
Pyritie
2d147b0107 the nether now has a gas collector recipe 2025-05-03 22:55:14 +01:00
Pyritie
f682c3f561 made the features for the rose quartz geodes, though their rarity will need some tweaking and the buds need a waterlogged property 2025-05-01 21:51:03 +01:00
Pyritie
187e5a2f5f fixed a crash when tping to the moon lol 2025-04-30 00:29:53 +01:00
Pyritie
88b8cf7ba1 got the game booting! 2025-04-29 23:25:20 +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
b15a700cfe
Merge branch 'dev' into dev
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-26 15:34:35 +01:00
Pyritie
576820b667 fixed a few recipes that were consuming the needle 2025-04-26 11:50:43 +01:00
Redeix
3422fbf08a Merge remote-tracking branch 'origin/dev' into dev 2025-04-26 02:35:27 -05:00