From 4c139c110fe3e1ebc9590645a4e8bd57ac6ed5a8 Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Thu, 24 Feb 2022 00:55:58 +0800
Subject: [PATCH 1/8] Create en_us.json

---
 .../1.16/assets/floral-flair/floral_flair/en_us.json   | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 projects/1.16/assets/floral-flair/floral_flair/en_us.json

diff --git a/projects/1.16/assets/floral-flair/floral_flair/en_us.json b/projects/1.16/assets/floral-flair/floral_flair/en_us.json
new file mode 100644
index 000000000000..ef3a977fe4ce
--- /dev/null
+++ b/projects/1.16/assets/floral-flair/floral_flair/en_us.json
@@ -0,0 +1,10 @@
+{
+    "block.floral_flair.foxnip": "Foxnip",
+    "block.floral_flair.frosted_foxnip": "Frosted Foxnip",
+    "block.floral_flair.pulse_petal": "Pulse Petal",
+    "block.floral_flair.fairy_blossom": "Fairy Blossom",
+
+    "block.floral_flair.potted_foxnip": "Potted Foxnip",
+    "block.floral_flair.potted_frosted_foxnip": "Potted Frosted Foxnip",
+    "block.floral_flair.potted_pulse_petal": "Potted Pulse Petal"
+}

From 848599d09488f99a2922116f13a292caf04e4b3e Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Thu, 24 Feb 2022 00:59:53 +0800
Subject: [PATCH 2/8] Add files via upload

---
 .../1.16/assets/floral-flair/floral_flair/zh_cn.json   | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 projects/1.16/assets/floral-flair/floral_flair/zh_cn.json

diff --git a/projects/1.16/assets/floral-flair/floral_flair/zh_cn.json b/projects/1.16/assets/floral-flair/floral_flair/zh_cn.json
new file mode 100644
index 000000000000..9795e616662d
--- /dev/null
+++ b/projects/1.16/assets/floral-flair/floral_flair/zh_cn.json
@@ -0,0 +1,10 @@
+{
+    "block.floral_flair.foxnip": "狐金香",
+    "block.floral_flair.frosted_foxnip": "霜狐金香",
+    "block.floral_flair.pulse_petal": "脉动花",
+    "block.floral_flair.fairy_blossom": "精灵花",
+
+    "block.floral_flair.potted_foxnip": "狐金香盆栽",
+    "block.floral_flair.potted_frosted_foxnip": "霜狐金香盆栽",
+    "block.floral_flair.potted_pulse_petal": "脉动花盆栽"
+}
\ No newline at end of file

From 28d53a0e2772ab134b8fa774af9bc59559c5806a Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Thu, 24 Feb 2022 01:08:40 +0800
Subject: [PATCH 3/8] Rename
 projects/1.16/assets/floral-flair/floral_flair/en_us.json to
 projects/1.16/assets/floral-flair/floral_flair/lang/en_us.json

---
 .../1.16/assets/floral-flair/floral_flair/{ => lang}/en_us.json   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename projects/1.16/assets/floral-flair/floral_flair/{ => lang}/en_us.json (100%)

diff --git a/projects/1.16/assets/floral-flair/floral_flair/en_us.json b/projects/1.16/assets/floral-flair/floral_flair/lang/en_us.json
similarity index 100%
rename from projects/1.16/assets/floral-flair/floral_flair/en_us.json
rename to projects/1.16/assets/floral-flair/floral_flair/lang/en_us.json

From 4bc9c285e36ff7f406d98981de6228d5a69d3aca Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Thu, 24 Feb 2022 01:08:54 +0800
Subject: [PATCH 4/8] Rename
 projects/1.16/assets/floral-flair/floral_flair/zh_cn.json to
 projects/1.16/assets/floral-flair/floral_flair/lang/zh_cn.json

---
 .../1.16/assets/floral-flair/floral_flair/{ => lang}/zh_cn.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename projects/1.16/assets/floral-flair/floral_flair/{ => lang}/zh_cn.json (97%)

diff --git a/projects/1.16/assets/floral-flair/floral_flair/zh_cn.json b/projects/1.16/assets/floral-flair/floral_flair/lang/zh_cn.json
similarity index 97%
rename from projects/1.16/assets/floral-flair/floral_flair/zh_cn.json
rename to projects/1.16/assets/floral-flair/floral_flair/lang/zh_cn.json
index 9795e616662d..6ff76c282c41 100644
--- a/projects/1.16/assets/floral-flair/floral_flair/zh_cn.json
+++ b/projects/1.16/assets/floral-flair/floral_flair/lang/zh_cn.json
@@ -7,4 +7,4 @@
     "block.floral_flair.potted_foxnip": "狐金香盆栽",
     "block.floral_flair.potted_frosted_foxnip": "霜狐金香盆栽",
     "block.floral_flair.potted_pulse_petal": "脉动花盆栽"
-}
\ No newline at end of file
+}

From d8b155568df52473af5c190906402f91fe6b229a Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Thu, 24 Feb 2022 12:52:34 +0800
Subject: [PATCH 5/8] Create en_us.json

---
 .../floral-flair/floral_flair/lang/en_us.json | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 projects/1.18/assets/floral-flair/floral_flair/lang/en_us.json

diff --git a/projects/1.18/assets/floral-flair/floral_flair/lang/en_us.json b/projects/1.18/assets/floral-flair/floral_flair/lang/en_us.json
new file mode 100644
index 000000000000..bf9ec8914742
--- /dev/null
+++ b/projects/1.18/assets/floral-flair/floral_flair/lang/en_us.json
@@ -0,0 +1,21 @@
+{
+    "block.floral_flair.foxnip": "Foxnip",
+    "block.floral_flair.frosted_foxnip": "Frosted Foxnip",
+    "block.floral_flair.pulse_petal": "Pulse Petal",
+    "block.floral_flair.fairy_blossom": "Fairy Blossom",
+    "block.floral_flair.gem_of_the_jungle": "Gem of the Jungle",
+    "block.floral_flair.rose": "Rose",
+    "block.floral_flair.sunset_poppy": "Sunset Poppy",
+    "block.floral_flair.muscari": "Muscari",
+    "block.floral_flair.purpureum": "Purpureum",
+    "block.floral_flair.scilla": "Scilla",
+
+
+    "block.floral_flair.potted_foxnip": "Potted Foxnip",
+    "block.floral_flair.potted_frosted_foxnip": "Potted Frosted Foxnip",
+    "block.floral_flair.potted_pulse_petal": "Potted Pulse Petal",
+    "block.floral_flair.potted_gem_of_the_jungle": "Potted Gem of the Jungle",
+    "block.floral_flair.potted_rose": "Potted Rose",
+    "block.floral_flair.potted_sunset_poppy": "Potted Sunset Poppy",
+    "block.floral_flair.potted_scilla": "Potted Scilla"
+}

From d1f9285cb823e6e5699bdbc497c8b33b24abf964 Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Thu, 24 Feb 2022 12:52:50 +0800
Subject: [PATCH 6/8] Add files via upload

---
 .../floral-flair/floral_flair/lang/zh_cn.json | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json

diff --git a/projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json b/projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json
new file mode 100644
index 000000000000..01b74e9638e9
--- /dev/null
+++ b/projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json
@@ -0,0 +1,21 @@
+{
+    "block.floral_flair.foxnip": "狐金香",
+    "block.floral_flair.frosted_foxnip": "霜狐金香",
+    "block.floral_flair.pulse_petal": "脉动花",
+    "block.floral_flair.fairy_blossom": "精灵花",
+    "block.floral_flair.gem_of_the_jungle": "丛林之珍",
+    "block.floral_flair.rose": "玫瑰",
+    "block.floral_flair.sunset_poppy": "晚霞虞美人",
+    "block.floral_flair.muscari": "葡萄风信子",
+    "block.floral_flair.purpureum": "紫托马斯木",
+    "block.floral_flair.scilla": "绵枣儿",
+
+
+    "block.floral_flair.potted_foxnip": "狐金香盆栽",
+    "block.floral_flair.potted_frosted_foxnip": "霜狐金香盆栽",
+    "block.floral_flair.potted_pulse_petal": "脉动花盆栽",
+    "block.floral_flair.potted_gem_of_the_jungle": "丛林之珍盆栽",
+    "block.floral_flair.potted_rose": "玫瑰盆栽",
+    "block.floral_flair.potted_sunset_poppy": "晚霞虞美人盆栽",
+    "block.floral_flair.potted_scilla": "绵枣儿盆栽"
+}
\ No newline at end of file

From 260caed830f4b90a1ba09f074bfeaf1ee0f23ade Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Fri, 25 Feb 2022 01:18:33 +0800
Subject: [PATCH 7/8] Update
 projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json

Co-authored-by: mamaruo <37480168+mamaruo@users.noreply.github.com>
---
 projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json b/projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json
index 01b74e9638e9..c380925eaff2 100644
--- a/projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json
+++ b/projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json
@@ -7,7 +7,7 @@
     "block.floral_flair.rose": "玫瑰",
     "block.floral_flair.sunset_poppy": "晚霞虞美人",
     "block.floral_flair.muscari": "葡萄风信子",
-    "block.floral_flair.purpureum": "紫托马斯木",
+    "block.floral_flair.purpureum": "暗紫纸毡麻",
     "block.floral_flair.scilla": "绵枣儿",
 
 

From afa8636d383d80bccb1524d5a3552a6f2c695edd Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Fri, 25 Feb 2022 01:21:33 +0800
Subject: [PATCH 8/8] Update zh_cn.json

---
 .../1.18/assets/floral-flair/floral_flair/lang/zh_cn.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json b/projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json
index c380925eaff2..05896dac454a 100644
--- a/projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json
+++ b/projects/1.18/assets/floral-flair/floral_flair/lang/zh_cn.json
@@ -7,7 +7,7 @@
     "block.floral_flair.rose": "玫瑰",
     "block.floral_flair.sunset_poppy": "晚霞虞美人",
     "block.floral_flair.muscari": "葡萄风信子",
-    "block.floral_flair.purpureum": "暗紫纸毡麻",
+    "block.floral_flair.purpureum": "紫红纸毡麻",
     "block.floral_flair.scilla": "绵枣儿",
 
 
@@ -18,4 +18,4 @@
     "block.floral_flair.potted_rose": "玫瑰盆栽",
     "block.floral_flair.potted_sunset_poppy": "晚霞虞美人盆栽",
     "block.floral_flair.potted_scilla": "绵枣儿盆栽"
-}
\ No newline at end of file
+}