Commit graph

120 commits

Author SHA1 Message Date
Pyritie
076775bfc5 Merge branch 'dev' into feature/space 2025-06-02 23:07:47 +01:00
Pyritie
da452c88e3 fixed some field guide pages 2025-06-02 21:15:32 +01:00
Pyritie
a79652844d merge 2025-06-01 21:18:02 +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
f7e8efdd7c added more precise kaolin data to the field guide 2025-05-29 20:31:08 +01:00
oogabooga-dev
899663b64f
Merge pull request #1074 from oogabooga-dev/feature/hammer_ru_questbook_fix
fix ore basics questbook ru translation
2025-05-28 16:47:57 +05:00
Pyritie
aec3ee50e3 removed double mention of piglin disguise in changelog 2025-05-27 22:20:20 +01:00
Pyritie
3f87252d2e langs, changelog 2025-05-27 21:43:10 +01:00
Pyritie
447a572edd langs 2025-05-27 20:13:01 +01:00
Pyritie
81871eb773 langs 2025-05-27 19:53:47 +01:00
Pyritie
928e6084c1 Merge branch 'dev' into feature/space 2025-05-27 19:52:59 +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
054a27977b added default keybinds for ftb-chunks, updated field guide and quests for it 2025-05-18 21:08:20 +01:00
Pyritie
f569ded46d fishing net field guide typo 2025-05-18 20:50:02 +01:00
Pyritie
b72c9fbeaa merge 2025-05-18 12:24:48 +01:00
Pyritie
4cf0aa8b6b langs, quest tweaks, updated field guide for sprinklers 2025-05-15 23:21:20 +01:00
Risuga
165cc8d2cd
Some recipe changes (#1003)
* misc recipes

* add saw to jar lid recipe

* revert table salt name changing that didn't work
2025-05-14 19:42:32 +01:00
Pyritie
96aae3ae33 finished adding spikes for all rocks 2025-05-13 16:24:00 +01:00
Pyritie
e102e89f09 added spikes for all ad astra rocks 2025-05-13 15:48:30 +01:00
Pyritie
9262133484 merge 2025-05-13 10:55:31 +01:00
Pyritie
43560cb1c3 this fucking lang that I hate 2025-05-13 10:52:15 +01:00
Pyritie
8f67db7554 langs 2025-05-11 16:59:07 +01:00
Pyritie
b9af0c3afe quest fixes, lang strings 2025-05-11 15:55:19 +01:00
Pyritie
0130abd232 lang update 2025-05-10 14:59:40 +01:00
Risuga
91185360db
Field guide updates (#973) 2025-05-09 08:31:25 +01:00
Pyritie
ec576813c2 Merge branch 'dev' into feature/space 2025-05-08 22:15:15 +01:00
Pyritie
a8c6033f7b langs 2025-05-07 21:54:12 +01:00
Pyritie
315aaeb078 langs 2025-05-07 21:40:46 +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
0dbc1f0fee moon veins 2025-05-06 18:42:41 +01:00
Pyritie
f3d64e320f forgor a knapping texture 2025-05-06 16:38:33 +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
cd6abb5df5 langs 2025-05-06 13:01:30 +01:00
Pyritie
fb9988f5f6 Merge branch 'dev' into feature/space 2025-05-06 12:36:09 +01:00
Pyritie
840485bfd8 fixed fluid source block misinformation 2025-05-06 12:35:31 +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
38219fdb98 Merge branch 'dev' into feature/space 2025-05-05 16:08:00 +01:00
Pyritie
6e405d4a45 langs 2025-05-04 17:16:55 +01:00
Pyritie
972b24c32f updated langs 2025-05-04 15:07:22 +01:00
AirRice
f92a1becf1
Rubber processing recipes audit (#949)
* Rubber recipe changes
- Latex can now be extracted from rubber trees' logs, saplings, leaves via the vacuum chamber (ULV) or extractor(LV)
- values: 1000mB per log, 100mB per sapling, 50mB per leaves; Extractor recipes do this in bulk and output 1000mB per operation
- Dandelions and goldenrods can, with added sodium hydroxide, be turned into latex in a chem reactor
- Sticky resin recipes (from both conifer pitch and latex) require wood ash now instead of sulfur
- Latex -> Vulcanized latex recipe now requires sulfur instead of wood ash
- Vulcanized latex now becomes raw rubber pulp in a solidifier or vacuum chamber at a rate of 250mB/raw pulp
- Latex soaked glove recipe now is a barrel recipe that takes 50 seconds instead of a vat recipe

* Correctly set latex soaked gloves recipe to 50 seconds (was 100 seconds in previous commit)

* Quest/patchouli book updates
- Tried to catch every mention of the old rubber making recipes.

* Revert Latex-soaked gloves recipe change as it didn't need to change
- Originally I wanted to make vulc latex -> raw rubber a Vat recipe, this isn't the case anymore so there is no reason to change this recipe.

* Rebalanced recipe values
- Logs now only give 250mB of latex
- Increase overall in time required vacuumizing directly into latex (now roughly takes 150 seconds per 1000mB, logs slightly faster)
- Gregtech fluid extraction recipes for these have been rebalanced to be around 4x faster and in bulk (roughly 37.5 seconds per 1000mB, logs slightly faster)
- Made vacuum chamber recipes use kubejs tag: field for allowing tags in recipe

* Lang & Quest updates
- Changed rubber ingot quest dependency to be on vacuum chamber instead of extractor
- Removed LV circuit quest dependency on rubber (this hasn't required rubber for a while)
- Lang changes - fix ambiguous wording, typos, titles too long for book
2025-05-04 15:05:50 +01:00
Pyritie
3e7a3b35c6 removed beneath's cursecoal and sylvite veins, made tfg ones instead so they're added to the field guide 2025-05-04 13:41:01 +01:00
Pyritie
90d67d84b6 removed treated wood boats 2025-05-01 23:37:42 +01:00
Nebby
00d37d99d9
Fix tips quest issues (#937) 2025-04-30 01:07:03 +01:00
Pyritie
187e5a2f5f fixed a crash when tping to the moon lol 2025-04-30 00:29:53 +01:00
Pyritie
c74339adb7 tweaks 2025-04-29 23:54:56 +01:00
Pyritie
f18ab76620 langs 2025-04-29 23:25:57 +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