Commit graph

301 commits

Author SHA1 Message Date
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
Pyritie
58641ad8db moon biome/feature updates, added chorus plants 2025-05-10 15:00:09 +01:00
Pyritie
ad10795d7c chorus plants! 2025-05-10 02:32:19 +01:00
Pyritie
dfa3ccd967 removed kjs moon plants since they're in tfg-core now 2025-05-09 21:16:36 +01:00
Pyritie
461cb8912b Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space 2025-05-09 21:14:43 +01:00
TomPlop
6ff217e21b
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>
2025-05-09 17:51:57 +01:00
Pyritie
73fe3f160c lunar foliage 2025-05-08 23:42:53 +01:00
Pyritie
f0adb029c3 back on that moon decoration grindset 2025-05-07 01:30:12 +01:00
Pyritie
d366f42302 climate stuff 2025-05-06 22:55:30 +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
4c34d40689 turn climates back on 2025-05-06 13:01:14 +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
Pyritie
85a8456b8f doubled capacity of greate shafts! also adjusted the alternator to match 2025-05-04 11:53:11 +01:00
Pyritie
908fb8112c swapped colors of nickel and platinum, so nickel more closely matches the tfc textures 2025-05-04 11:28:24 +01:00
Pyritie
88324bb30d some more ae2 tweaking 2025-05-03 23:48:24 +01:00
Pyritie
208557a382 fixed some icon sets 2025-05-03 22:47:15 +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
Pyritie
d8e9a59b52 fluix's displayed formula is now more accurate to its material composition 2025-05-03 18:32:54 +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
90d67d84b6 removed treated wood boats 2025-05-01 23:37:42 +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
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
7606ee85c6 changed realgar item set 2025-04-29 16:30:15 +01:00
Pyritie
70a9dfd920 Added recycling recipes for your old molds 2025-04-29 00:15:21 +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
f6121eb23c fixed crash when making a new world 2025-04-26 19:13:51 +01:00
Pyritie
b15a700cfe
Merge branch 'dev' into dev
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-26 15:34:35 +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
cd1292ca69
Update constants.js
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-04-25 11:33:06 -05:00
Pyritie
58fce401ff
Merge branch 'dev' into dev
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-25 17:04:25 +01:00
TomPlop
ba67357214
Universal circuits (#914)
* Adding Universal Circuits

* Fix for Universal Circuits recipes

* Adding Univercal Circuits to their respective files
2025-04-25 17:03:38 +01:00
Redeix
ee55e713b1 - Added support for armor trims + new materials
- Added fishing nets
- Added more cloth alternatives
2025-04-25 01:38:06 -05:00
Pyritie
f7a242462c basic belts now only accept rubber, but all belts are now half price! 2025-04-24 21:20:38 +01:00
Pyritie
ae03865762 removed create connected's hand cogwheels because they were another greate exploit, added recipes for its windows, enabled its copycat blocks 2025-04-24 21:17:59 +01:00
Pyritie
1a4ac7e0ca removed VI laser engraver 2025-04-24 20:57:22 +01:00
Pyritie
41044519cb once again I am changing the rotation speed controller recipe 2025-04-23 23:46:39 +01:00
Pyritie
f48052afd6 missed a rod 2025-04-23 23:10:35 +01:00
Pyritie
6025d81c23 hid mv+ solar panels 2025-04-23 23:10:28 +01:00
Pyritie
b2e3097cc4 fixed recipes for glass panes, hid most of create:connected for crimes against greate 2025-04-23 23:10:07 +01:00
Pyritie
058a3ae103 added recipe for vanilla campfire, for people who like smoke particles (me) 2025-04-23 22:15:57 +01:00
Pyritie
87dc55582d removed adjustable chain gearshift because you could get around greate with it 2025-04-23 22:15:23 +01:00
Pyritie
1ca74a8769 hot or not fixes! goodbye, blowpipe exploit 2025-04-23 22:13:25 +01:00
Pyritie
87b3937768 cast iron tools are (mostly) gone! 2025-04-23 01:08:57 +01:00
Pyritie
d7ab34649a forgot to unhide this 2025-04-22 18:44:57 +01:00
Pyritie
f509a3a846 fixed raw ore item textures for a bunch of gem materials 2025-04-22 13:54:15 +01:00