From 9e1d3c7d8b2441ffdf332c78208f10522f1bfe54 Mon Sep 17 00:00:00 2001
From: DStrand1 <dane@strandboge.com>
Date: Thu, 27 Jan 2022 23:44:27 -0600
Subject: [PATCH] 2.1.0

---
 CHANGELOG.md                                | 51 +++++++++++++++++++++
 src/main/java/gregtech/GregTechVersion.java |  4 +-
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3800c28b100..7a417cb31fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,56 @@
 ## Changelog
 
+### 2.1.0
+BETA RELEASE
+
+Featured Changes:
+
+* Fluid Rigs
+    * New Multiblocks capable of draining Fluids from in-world data
+    * Each 8x8 chunk area of a Dimension can have a Fluid Vein in it (not in-world)
+    * Rigs at MV, EV, and LuV for harvesting these fluids
+    * "Veins" can be specified similarly to Ore Veins in the config JSON files
+
+* CraftTweaker Changes
+    * In Creative Mode, there is now a button on a RecipeMap JEI Page to copy the CT script to remove that recipe to the clipboard
+    * Fix IconSet changes not working in CraftTweaker
+    * Fix rare issues with adding properties to materials in CraftTweaker
+
+* Fix Fluid Pipes having half the intended transfer rate
+* Fix issues with pipe/cable connections with GT6StylePipesCables OFF
+* Fix power transfer in cables randomly failing
+* Fix Z-Fighting with covers on pipes and cables
+* Fix issues with painting Pipes and Cables
+* Fix rendering and performance issues with the Clipboard
+* Fix Overclock Button not working in some cases
+* Fix machine default color not applying to Machine Casings, Hermetic Casings
+* Fix issues with changing machine default color in-game
+* Fix Item Magnets working in Spectator Mode
+* Fix Coke Oven Hatch being sharable between Coke Ovens
+* Fix crash with Tricorders when scanning dimensions with no fluid veins
+* Fix Creative Energy Emitter tier button not updating from a manually entered voltage
+* Fix issues with UI's staying open after TileEntities are removed
+* Fix Compressor and Forge Hammer recipes sometimes using the wrong amount of items for Blocks (Glowstone, Quartz, etc)
+* Fix Large Boilers burning for too long with fluid fuels
+* Fix circuit overlay in Assembling Machine
+* Fix Block Breaker, Coke Oven Hatch tooltips
+* Fix Large Fluid Cells not showing their fluid capacity in the tooltip
+* Move PGS processing to Centrifuge
+* Fix various issues with Solar Panel covers
+* Remove `dustRegular` OreDict, as its need is no more with the new Ore Dictionary Filter
+* Fix a few recipe problems (Fish Oil, Ender Pearl dust Mixer using O over N, Propene + Cl conflict, PBI fluid output amount)
+* Add Huge Item and Huge Restrictive Item Pipes
+* Add Fluid Temperature and State tooltips to more places
+* Add Config to automatically remove Furnace smelting recipes for EBF Metals added by other mods (excluding CraftTweaker)
+* Add Advancement for Primitive Pump
+* Rebalance Steel Processing (PBF is slightly slower, as is EBF, drastically reduce Oxygen amount for EBF)
+* Buff Oilsands processing time
+* Fix Beacon recipe with harder recipe configs enabled
+* Add many, many new harder recipes to the harder recipe configs
+* Add many new Vanilla item recycling recipes
+* Change behavior of machine explosions with the config off
+* Internal: Converted MetaPrefix item to use `MetaValueItem` instead of its own handwoven Map
+
 ### 2.0.6
 BETA RELEASE
 
diff --git a/src/main/java/gregtech/GregTechVersion.java b/src/main/java/gregtech/GregTechVersion.java
index 55101748537..432c13a5abb 100644
--- a/src/main/java/gregtech/GregTechVersion.java
+++ b/src/main/java/gregtech/GregTechVersion.java
@@ -4,9 +4,9 @@ public final class GregTechVersion {
 
     public static final int MAJOR = 2;
     //This number is incremented every major feature update
-    public static final int MINOR = 0;
+    public static final int MINOR = 1;
     //This number is incremented every time the feature is added, or bug is fixed. resets every major version change
-    public static final int REVISION = 6;
+    public static final int REVISION = 0;
     //This String is for additional info on the release version if needed (like alpha, beta, rc). Comment out when unused
     public static final String EXTRA = "beta";
     //This is the String formatted version, used in builds