Merge remote-tracking branch 'origin/main' into dev

2025-05-06 01:45:19 +05:00
parent 276bc05efe 7d4d2a281b
commit 3b34dd634a
2 changed files with 2 additions and 2 deletions
--- a/kubejs/server_scripts/gregtech/constants.js
+++ b/kubejs/server_scripts/gregtech/constants.js
@@ -33,4 +33,4 @@ global.GTCEU_TOOLTYPES_WHICH_HAS_TFC_DUPS = {
 	"tfc:knives": GTToolType.KNIFE,
 	"tfc:saws": GTToolType.SAW,
 	"tfc:scythes": GTToolType.SCYTHE
-};
+};
--- a/kubejs/server_scripts/tfc/tags.js
+++ b/kubejs/server_scripts/tfc/tags.js
@@ -605,4 +605,4 @@ const registerTFCPlacedFeatures = (event) => {
 	event.add('tfc:in_biome/underground_decoration', 'tfg:glow_lichen')
 	event.add('tfc:in_biome/underground_decoration', 'tfg:earth/sulfur_patch')
 }
-//#endregion
+//#endregion