Jean Roberto de Souza e35c34040d Migmatite conflict fix (#1153) ... * Migmatite conflict fixe Tbh I can hardly call this a good fix, but tbh with Stonecutter coming back this might even be meaningless Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Update Migmatite Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Update recipes.rocks.js Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> --------- Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>		2025-06-16 11:03:14 -05:00
..
events.js	- Fixed pill behavior with cheats off (#1084)	2025-05-28 08:26:25 +01:00
json_tool.armor_trim.js	- Added support for armor trims + new materials	2025-04-25 01:38:06 -05:00
loot_tables.js	- Added loot table to piglin disguise and updated its texture. (#1123)	2025-06-02 22:17:52 +01:00
recipes.collapse.js	Alpha Release: 0.9.0 (#849)	2025-04-15 23:27:17 +05:00
recipes.converting.js	Alpha Release: 0.9.0 (#849)	2025-04-15 23:27:17 +05:00
recipes.fishing_nets.js	- Added support for armor trims + new materials	2025-04-25 01:38:06 -05:00
recipes.js	- Added support for armor trims + new materials	2025-04-25 01:38:06 -05:00
recipes.medicine.js	added an early way to get gregtech medicine, and added some more plants for medicines	2025-04-24 23:33:12 +01:00
recipes.miscellaneous.js	added recipes for tfc-lunchbox!	2025-06-10 16:32:43 +01:00
recipes.molds.js	Merge branch 'dev' into dev	2025-05-13 01:25:09 -05:00
recipes.paper.js	Alpha Release: 0.9.0 (#849)	2025-04-15 23:27:17 +05:00
recipes.rocks.js	Migmatite conflict fix (#1153)	2025-06-16 11:03:14 -05:00
recipes.supports.js	Fixes and features (#987)	2025-05-12 12:29:10 +01:00
recipes.terrariums.js	fixed obsidian dust recipe for enderarium	2025-04-22 18:37:43 +01:00
tags.facades.js	gregtech facade crafting (#1145)	2025-06-09 16:56:02 +01:00
tags.js	gregtech facade crafting (#1145)	2025-06-09 16:56:02 +01:00
tags.veins.js	updated ore vein tags so they're now all in one auto-generated file	2025-05-29 13:00:15 +01:00