Merge branch 'patch-release' of https://github.com/adtpdn/tekton-enet into patch-release

2026-04-24 00:49:42 +08:00
parent f4b35582aa 2263841b1a
commit 3456c68354
2 changed files with 12 additions and 0 deletions
@@ -4,12 +4,20 @@
 	"releases": [
 		{
 			"version": "2.1.6",
+<<<<<<< HEAD
 			"date": "2026-04-24",
+=======
+			"date": "2026-04-23",
+>>>>>>> 2263841b1ab67052596ad5d6e68e3ed413660040
 			"pck_url": "https://raw.githubusercontent.com/adtpdn/tekton-updates/main/latest/patch.pck",
 			"pck_size": 0,
 			"changelog": [
 				"Added Gacha system with Star and Gold banners (1x & 10x pulls)",
+<<<<<<< HEAD
 				"Fragment Craft system — collect drops to craft exclusive skins",
+=======
+				"Fragment Craft system \u2014 collect drops to craft exclusive skins",
+>>>>>>> 2263841b1ab67052596ad5d6e68e3ed413660040
 				"Fixed boot screen stuck on \"Checking versions...\""
 			]
 		},