cherrypick 1.2.2.a

CHANGELOG.md

@@ -1,31 +1,11 @@
 # ChangeLog
 
-Version: 1.2.2
+Version: 1.2.2.a
 
 ### ADDITIONS:
-- Ported Powder Barrels, Industrial TNT and Dynamite from 1.12
-- Ported Armor from 1.12
+- added NO_ORE_SMELTING material flag for stopping ore/raw ore -> dust/ingot/gem smelting
 
 ### CHANGES:
-- Updated Russian translation
-- Moved coils, filters, PSS battery maps out of GTBlocks, to make it easier for addons to add to them
 
 ### FIXES:
-- Made natural decor blocks obtainable
-- Fixed compression recipes being generated for ignored materials
-- Fixed fluid locking
-- Fixed items being voided when Multiblock auto-building fails
-- Fixed missing drops for Laser Pipes and Optical Pipes
-- Fixed missing harder chest recipes
-- Fixed setting the dimension for Bedrock Ore Veins and Fluid Veins in KJS
-- Fixed energy transfer display in the Portable Scanner
-- Fixed parallel issues, multi smelter not overclocking
-- Fixed Overclocking display for ULV in recipe viewers
-- Fixed parallel processing for steam machines
-- Fixed machine controllers not working for indirectly powered blocks
-- Fixed raw ores being smeltable into ingots even with the NO_SMELTING flag
-- Fixed language entries for treated/rubber wood signs
-- Fixed sign rendering
-- Fixed wire throughput counting
-- Fixed chainsaw durability usage
-- Fixed recipe conflict between mud and fertilizer recipes
+- Fixed raw diamonds not being smeltable into diamonds, raw coal not being smeltable into coal

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx6G
 # Mod Info
 mod_id = gtceu
 mod_name = GregTech
-mod_version = 1.2.2
+mod_version = 1.2.2.a
 mod_description = GregTech CE Unofficial, ported from 1.12.2
 mod_license = LGPL-3.0 license
 mod_url = https://github.com/GregTechCEu/GregTech-Modern/

src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialFlags.java

@@ -172,6 +172,13 @@ public String toString() {
             .requireProps(PropertyKey.DUST)
             .build();
 
+    /**
+     * Add to material if it's impossible to smelt it from an ore.
+     */
+    public static final MaterialFlag NO_ORE_SMELTING = new MaterialFlag.Builder("no_ore_smelting")
+        .requireProps(PropertyKey.DUST)
+        .build();
+
     /**
      * Add this to your Material if you want to have its Ore Calcite heated in a Blast Furnace for more output. Already listed are:
      * Iron, Pyrite, PigIron, WroughtIron.

src/main/java/com/gregtechceu/gtceu/data/recipe/generated/OreRecipeHandler.java

@@ -431,7 +431,7 @@ public static void processPureDust(TagPrefix purePrefix, Material material, OreP
     }
 
     private static boolean doesMaterialUseNormalFurnace(Material material) {
-        return !material.hasProperty(PropertyKey.BLAST) && !material.hasFlag(MaterialFlags.NO_SMELTING);
+        return !material.hasProperty(PropertyKey.BLAST) && !material.hasFlag(MaterialFlags.NO_ORE_SMELTING);
     }