150 files changed, 60 insertions, 59 deletions

diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 364031d6ca..34df98fc55 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -226,11 +226,11 @@ public enum ItemList implements IItemContainer {
     Large_Fluid_Cell_Osmium,
     Large_Fluid_Cell_Neutronium,
     ThermosCan_Empty,
-    ThermosCan_Dark_Coffee,
-    ThermosCan_Dark_Cafe_au_lait,
     ThermosCan_Coffee,
-    ThermosCan_Cafe_au_lait,
-    ThermosCan_Lait_au_cafe,
+    ThermosCan_Sweet_Coffee,
+    ThermosCan_Latte,
+    ThermosCan_Sweet_Latte,
+    ThermosCan_Sweet_Jesus_Latte,
     ThermosCan_Dark_Chocolate_Milk,
     ThermosCan_Chocolate_Milk,
     ThermosCan_Tea,
diff --git a/src/main/java/gregtech/common/items/IDMetaItem02.java b/src/main/java/gregtech/common/items/IDMetaItem02.java
index a67e22545c..5766feec23 100644
--- a/src/main/java/gregtech/common/items/IDMetaItem02.java
+++ b/src/main/java/gregtech/common/items/IDMetaItem02.java
@@ -3,11