Commit graph

776 commits

Author SHA1 Message Date
Pyritie
8a26bb1ff1 hammer loot tables for ad astra stone types 2025-05-05 23:17:07 +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
38219fdb98 Merge branch 'dev' into feature/space 2025-05-05 16:08:00 +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
85a8456b8f doubled capacity of greate shafts! also adjusted the alternator to match 2025-05-04 11:53:11 +01:00
Pyritie
a80ec277df better recipe for the universal wireless terminal 2025-05-04 00:35:25 +01:00
Pyritie
88324bb30d some more ae2 tweaking 2025-05-03 23:48:24 +01:00
Pyritie
35a52fa0f2 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-03 22:55:16 +01:00
Pyritie
2d147b0107 the nether now has a gas collector recipe 2025-05-03 22:55:14 +01:00
Pyritie
744ea4824a coke and coal are no longer gems, and moss is no longer dirt 2025-05-03 22:47:06 +01:00
Pyritie
8fae20f556 - the other ae2 wireless terminals are now all in late EV
- MEGA ae2 stuff now requires naq instead of a singularity
2025-05-03 22:46:46 +01:00
AirRice
49f0704298
Allow red/tin alloy double ingot piles, add textures (#948) 2025-05-03 20:44:02 +01:00
Pyritie
e5647535d0 fixes #932 2025-05-03 20:18:47 +01:00
Pyritie
292536bcfa nerfed stone dust centrifuging, added a basic tape recipe that uses tfc glue 2025-05-03 18:51:17 +01:00
Pyritie
ee629ad1b9 fixed tfc tool tags 2025-05-02 15:46:44 +01:00
Pyritie
506faeafd3 added a potential fix for #944 suggested by ghosti, cleaned up some other abuses of it in tag events so now it's just indicators that still have to use it 2025-05-02 01:05:01 +01:00
Pyritie
3db90471cd clay decomposition now requires HV 2025-05-01 23:45:26 +01:00
Pyritie
2feb2f9540 remove brick duping 2025-05-01 23:37:32 +01:00
Pyritie
a7960d1bd1 greate buffs 2025-05-01 22:58:27 +01:00
Pyritie
6bf68d1cd0 merge 2025-05-01 18:26:52 +01:00
Pyritie
1441dbee1b fixed some incorrect assembler recipes for create items 2025-05-01 18:25:38 +01:00
Redeix
b276adafbe - Fixed supports 2025-04-30 11:59:43 -05: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
88b8cf7ba1 got the game booting! 2025-04-29 23:25:20 +01:00
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
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
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
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
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
a9faa552f4 missed a removal 2025-04-26 18:47:10 +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
Pyritie
b15a700cfe
Merge branch 'dev' into dev
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-26 15:34:35 +01:00
Pyritie
294c4ed59d slime now smelts into glue 2025-04-26 14:00:58 +01:00
Pyritie
54cc12e9e1 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-04-26 11:50:45 +01:00
Pyritie
576820b667 fixed a few recipes that were consuming the needle 2025-04-26 11:50:43 +01:00
TomPlop
45e22aa38c
Add Brine/Vinegar to GT Machines and Fix Olive Oil recipe to fit with VAT recipe (#916)
* adding vinegar and brine recipes for GT machines

Signed-off-by: TomPlop <tomdidome@gmail.com>

* create const for alcohol vinegar recipe

Signed-off-by: TomPlop <tomdidome@gmail.com>

---------

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-04-26 11:34:57 +01:00
Redeix
3422fbf08a Merge remote-tracking branch 'origin/dev' into dev 2025-04-26 02:35:27 -05:00
Redeix
fba935817e - Added handcart recipe
- Allowed more blocks to be used as oven, forge, and bloomery insulation
- Fixed lang error with treated wood planks recipe
- Forgot to add fishing net functionality before
2025-04-26 02:35:02 -05:00
Redeix
29bf80dba4
Merge branch 'dev' into dev
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-04-25 22:49:01 -05:00
TomPlop
66b40daf7d
Fix Curdled milk recipes to be the same as the barrel
Barrel is 2B Milk 1 renet for 2B Curdled in the barrel so fixed to be the same

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-04-25 21:44:55 -04:00
Pyritie
00862f3049 file rename 2025-04-26 01:22:13 +01:00
Pyritie
d78b5346aa fixed tag issue with powdered obby 2025-04-26 00:55:30 +01:00
Pyritie
9ba3729765 changed the etched external image thingy to not need an ender eye 2025-04-25 23:50:24 +01:00
Pyritie
58fce401ff
Merge branch 'dev' into dev
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-25 17:04:25 +01:00