From c20854df231a7c7fea761ac35624a0b4892d371e Mon Sep 17 00:00:00 2001
From: Mikerooni <139889766+mikerooni@users.noreply.github.com>
Date: Tue, 30 Apr 2024 19:21:38 +0200
Subject: [PATCH 1/2] chore: version & changelog

---
 CHANGELOG.md      | 40 +++++++++++++++++++++++++++++++++++-----
 gradle.properties |  2 +-
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d7bb07118..de00770519 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,43 @@
 # ChangeLog
 
-Version: 1.2.0.a
+Version: 1.2.1
 
 ### ADDITIONS:
+- Added filtering to Output Hatches
+- Added several utility functions to KJS
+- Added more ore generator types (Classic & Cuboid)
+- Added partial NBT support for recipe inputs
+- Added Wood Cutter recipes
 
 ### CHANGES:
+- Reworked Bedrock Ores
+  - Note that it is now entirely up to pack developers to register Bedrock Ore Veins!
+- Added certain fluid blocks to the minecraft:replaceable tag
+- Updated Russian translation
 
 ### FIXES:
-- Fixed some components not requiring data
-- Fixed assembly line recipes with no data not working
-- Fixed data module recipe being missing
-- Fixed tiered multiblock builders not working
\ No newline at end of file
+- Fixed some Multiblock builders not working in KJS
+- Fixed Turbine Rotors not being damaged
+- Fixed Shutter Covers not being registered
+- Fixed missing Multiblock Tank recipes
+- Fixed GCyM Multiblocks using Perfect Overclocking
+- Fixed crash related to the Network Switch Multiblock
+- Fixed Data Bank chaining
+- Fixed HPCA energy consumption for energy that wasn't input recently
+- Fixed Kinetic Output Boxes never stopping
+- Fixed World Accelerators using too much energy and always accelerating Block Entities
+- Fixed connectivity for Long Distance Pipes
+- Fixed Item Collector (now works after reload, no longer requires KJS, fixed tooltip)
+- Fixed Research items not rendering in JEI when playing on a server
+- Fixed recipes randomly not working after server restarts
+- Fixed recipes for ABS & Large Electrolyzer using the wrong wires
+- Fixed sounds for Arc Furnace & Boilers not being registered properly
+- Fixed Parallel Control Hatch behavior when the recipe voltage matches the machine voltage
+- Fixed Wrench interactions in certain situations
+- Fixed recipe for Treated Wood
+- Fixed KJS Research recipes not registering
+- Fixed machines and pipes causing excessive updates to neighboring blocks
+- Fixed language entry for Iron III Chloride
+- Fixed recycling recipe for Titanium Fluid Cells
+- Fixed recipe for Engine Intake Casing
+- Fixed any custom recipe capabilities being removed when KJS is installed
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 8643ac3386..5c497b3926 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx6G
 # Mod Info
 mod_id = gtceu
 mod_name = GregTech
-mod_version = 1.2.0.a
+mod_version = 1.2.1
 mod_description = GregTech CE Unofficial, ported from 1.12.2
 mod_license = LGPL-3.0 license
 mod_url = https://github.com/GregTechCEu/GregTech-Modern/

From a936d68a28b3b5ffbd18eb69245fd3b95f78598c Mon Sep 17 00:00:00 2001
From: Mikerooni <139889766+mikerooni@users.noreply.github.com>
Date: Tue, 30 Apr 2024 22:15:41 +0200
Subject: [PATCH 2/2] chore: add decorative blocks to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de00770519..b67fc68b86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 Version: 1.2.1
 
 ### ADDITIONS:
+- Ported decorative blocks from 1.12
 - Added filtering to Output Hatches
 - Added several utility functions to KJS
 - Added more ore generator types (Classic & Cuboid)