From 0cc94ff33f1a662c43aa65ceaec8a18256e35151 Mon Sep 17 00:00:00 2001
From: Vedant Madane <6527493+VedantMadane@users.noreply.github.com>
Date: Mon, 24 Aug 2026 02:28:28 +0530
Subject: [PATCH 1/2] fix: fix: remove duplicate cacti tag

- remove duplicate tag station-vanilla-fix-v0\src\main\resources\data\c\stationapi\tags\blocks\cacti.json
- remove duplicate tag station-vanilla-fix-v0\src\main\resources\data\c\stationapi\tags\items\cacti.json

Fixes #281

Signed-off-by: Vedant Madane <6527493+VedantMadane@users.noreply.github.com>
---
 COMMITMSG                                                 | 8 ++++++++
 .../resources/data/c/stationapi/tags/blocks/cacti.json    | 5 -----
 .../resources/data/c/stationapi/tags/items/cacti.json     | 5 -----
 3 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 COMMITMSG
 delete mode 100644 station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/cacti.json
 delete mode 100644 station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/items/cacti.json

diff --git a/COMMITMSG b/COMMITMSG
new file mode 100644
index 000000000..8ce13dfaa
--- /dev/null
+++ b/COMMITMSG
@@ -0,0 +1,8 @@
+fix: fix: remove duplicate cacti tag
+
+- remove duplicate tag station-vanilla-fix-v0\src\main\resources\data\c\stationapi\tags\blocks\cacti.json
+- remove duplicate tag station-vanilla-fix-v0\src\main\resources\data\c\stationapi\tags\items\cacti.json
+
+Fixes #281
+
+Signed-off-by: Vedant Madane <6527493+VedantMadane@users.noreply.github.com>
diff --git a/station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/cacti.json b/station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/cacti.json
deleted file mode 100644
index 2624ccf24..000000000
--- a/station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/cacti.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "values": [
-    "minecraft:cactus"
-  ]
-}
\ No newline at end of file
diff --git a/station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/items/cacti.json b/station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/items/cacti.json
deleted file mode 100644
index 2624ccf24..000000000
--- a/station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/items/cacti.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "values": [
-    "minecraft:cactus"
-  ]
-}
\ No newline at end of file

From 06f7cb47faddf1103a53aa4d0a183136fb2bac5d Mon Sep 17 00:00:00 2001
From: Vedant Madane <6527493+VedantMadane@users.noreply.github.com>
Date: Mon, 24 Aug 2026 02:31:01 +0530
Subject: [PATCH 2/2] chore: drop accidental COMMITMSG from PR branch

Signed-off-by: Vedant Madane <6527493+VedantMadane@users.noreply.github.com>
---
 COMMITMSG | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 COMMITMSG

diff --git a/COMMITMSG b/COMMITMSG
deleted file mode 100644
index 8ce13dfaa..000000000
--- a/COMMITMSG
+++ /dev/null
@@ -1,8 +0,0 @@
-fix: fix: remove duplicate cacti tag
-
-- remove duplicate tag station-vanilla-fix-v0\src\main\resources\data\c\stationapi\tags\blocks\cacti.json
-- remove duplicate tag station-vanilla-fix-v0\src\main\resources\data\c\stationapi\tags\items\cacti.json
-
-Fixes #281
-
-Signed-off-by: Vedant Madane <6527493+VedantMadane@users.noreply.github.com>