Commit graph

82 commits

Author SHA1 Message Date
Redeix
50ad90af2a
Merge branch 'active/food' into revert-3-feature/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-17 00:57:55 -05:00
Redeix
2e5295614c
Revert "merge" 2025-06-17 00:56:25 -05:00
Redeix
fb90ef6666
Merge branch 'dev' into active/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-16 23:54:43 -05:00
Pyritie
bc61d06232 merge 2025-06-17 01:02:15 +01:00
Pyritie
242a31b515 tweaked zinc color, added new plated block color 2025-06-16 17:40:22 +01:00
ofoxsmith
f822289573
custom gregtech machines and logic to handle TFC recipes (#1160)
* Change lv chem reactor quest to require any container with rubber instead of a rubber bucket

Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>

* Add placeholder assets for food machines (copied from gtceu)

* remove greenhouse definition from kubejs

* change greenhouse recipe

* Rework recipes file

---------

Signed-off-by: ofoxsmith <77560533+ofoxsmith@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-06-12 13:32:10 +01:00
Pyritie
601e92427b more lunchbox stuff 2025-06-10 17:06:59 +01:00
Pyritie
75a6d3d875 fixed colored steel from having higher tier blast furnace recipes, now they can all just use the basic one too 2025-06-10 16:32:32 +01:00
Pyritie
3eebef1616 more greenhouse tweaks, added a recipe for grass blocks 2025-06-04 21:49:00 +01:00
Pyritie
e13960638f fixed greenhouse perfect OC 2025-06-04 21:14:15 +01:00
Pyritie
4ac7cc16a2 added perfect OC to the elec greenhouse 2025-06-04 12:30:58 +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
9f0c8a35ca removed gt compressed clay, fixed assembler recipe for clay bricks 2025-05-11 17:05:32 +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
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
Pyritie
dc0ed9001d
Merge branch 'main' into create-additions
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 14:25:41 +00:00
Pyritie
5a70837dd0
Update machines.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 13:29:13 +00:00