Commit graph

184 commits

Author SHA1 Message Date
Pyritie
4ac7cc16a2 added perfect OC to the elec greenhouse 2025-06-04 12:30:58 +01:00
Pyritie
1ae52e5506 removed brittle charcoal 2025-06-01 23:36:29 +01:00
Pyritie
0c2a7164b5 Merge branch 'dev' into feature/create-6 2025-05-21 21:00:20 +01:00
Pyritie
ae4abcadec merge 2025-05-21 20:59:36 +01:00
Pyritie
c6d30fb0f8 removed small black steel gear 2025-05-18 22:42:48 +01:00
Pyritie
6fd8da5557 remove netherite tools 2025-05-18 18:00:56 +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
9f0c8a35ca removed gt compressed clay, fixed assembler recipe for clay bricks 2025-05-11 17:05:32 +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
908fb8112c swapped colors of nickel and platinum, so nickel more closely matches the tfc textures 2025-05-04 11:28:24 +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
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
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
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
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
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
41044519cb once again I am changing the rotation speed controller recipe 2025-04-23 23:46:39 +01:00
Pyritie
6025d81c23 hid mv+ solar panels 2025-04-23 23:10:28 +01:00
Pyritie
87b3937768 cast iron tools are (mostly) gone! 2025-04-23 01:08:57 +01:00
Pyritie
c692d52fd6 bismuth item pipes are now really slow 2025-04-22 13:24:11 +01:00
Pyritie
bfb2cd17b8 oh so that's why you have two constants 2025-04-22 12:59:33 +01:00
Pyritie
9b73dad3b7 why does gt have two constants files? 2025-04-22 12:34:38 +01:00
Pyritie
175c158264 added some recipes to craft gt's marble 2025-04-22 01:24:25 +01:00
Pyritie
bf0d05a633 apparently iron tools need to exist otherwise GTM shits itself 2025-04-22 01:05:34 +01:00
Pyritie
6fd8dc7c6b fixed bug with enderarium forming 2025-04-21 23:21:00 +01:00
Pyritie
89ec25bb3d removed cast iron tools 2025-04-21 22:25:57 +01:00
Pyritie
af16b2d63c granitic/basaltic mineral sand now melts into cast iron 2025-04-21 15:27:51 +01:00
Pyritie
daeaebd48a changed rotation speed controller to need black steel instead of an electron tube 2025-04-20 20:54:10 +01:00
Pyritie
fa22cd98fc Removed firmalife sprinklers, since now you can put gt pipes through walls 2025-04-18 20:51:37 +01:00
Pyritie
189f5aebce
Alpha Release: additions 0.9.0 (#880)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Signed-off-by: Adora <adoradyne.58@gmail.com>
Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
Signed-off-by: CaitlynMC <135169224+CaitlynMC@users.noreply.github.com>
Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Nebby <78170922+Nebby1999@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: aidie8 <aidenvanzuilen@gmail.com>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
Co-authored-by: Adora <adoradyne.58@gmail.com>
Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
Co-authored-by: julia <97713533+juliakity@users.noreply.github.com>
Co-authored-by: GamerDadDave <gamerdaddave@gmail.com>
Co-authored-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
Co-authored-by: CaitlynMC <135169224+CaitlynMC@users.noreply.github.com>
Co-authored-by: SverhRazum-Nah <leon.trol@mail.ru>
Co-authored-by: Redeix <59435925+Redeix@users.noreply.github.com>
Co-authored-by: Nebby1999 <nebby131999@gmail.com>
2025-04-18 14:49:56 +05:00
Pyritie
ec2e3cd3c4
Alpha Release: 0.9.0 (#849)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Nebby <78170922+Nebby1999@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: aidie8 <aidenvanzuilen@gmail.com>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
2025-04-15 23:27:17 +05:00
Pyritie
568da8c60a
Update recipe_types.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-23 21:56:02 +00:00
Pyritie
bed0cad994
Update machines.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-18 00:10:49 +00:00
Pyritie
4fa9500701
Update machines.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-18 00:01:13 +00:00
Pyritie
5ad9f00f5a
Update items.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 23:57:37 +00:00
Pyritie
324ac1adda
Merge branch 'main' into create-additions
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 22:10:34 +00:00
Pyritie
594b7ad758
Update items.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 11:48:14 +00:00
Pyritie
d2f64a1bcc
Update machines.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 11:44:16 +00:00
Pyritie
943e7f2e02
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 15:47:18 +00:00
Pyritie
a04f0cd439
Update constants.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:31:03 +00:00