diff --git a/build.gradle b/build.gradle
index 32916d3a..7c7b2762 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ targetCompat = JavaVersion.VERSION_1_8
 minecraft {
     version = "1.12-14.21.1.2404"
     runDir = "run"
-    mappings = "snapshot_20170708"
+    mappings = "stable_39"
     makeObfSourceJar = false
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e20bb789..4b5b6ba9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue May 16 17:06:48 EEST 2017
+#Wed Apr 24 07:11:59 CDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/baubles/api/IBauble.java b/src/main/java/baubles/api/IBauble.java
index 43e63da8..feb15d0b 100644
--- a/src/main/java/baubles/api/IBauble.java
+++ b/src/main/java/baubles/api/IBauble.java
@@ -24,6 +24,8 @@ public interface IBauble {
 	public default void onWornTick(ItemStack itemstack, EntityLivingBase player) {		
 	}
 
+	String getUnlocalizedName(ItemStack par1ItemStack);
+
 	/**
 	 * This method is called when the bauble is equipped by a player
 	 */
diff --git a/src/main/java/baubles/api/cap/BaubleItem.java b/src/main/java/baubles/api/cap/BaubleItem.java
index 47285f94..bf2e5ac7 100644
--- a/src/main/java/baubles/api/cap/BaubleItem.java
+++ b/src/main/java/baubles/api/cap/BaubleItem.java
@@ -16,4 +16,9 @@ public BaubleItem(BaubleType type) {
 	public BaubleType getBaubleType(ItemStack itemstack) {
 		return baubleType;
 	}
+
+	@Override
+	public String getUnlocalizedName(ItemStack par1ItemStack) {
+		return null;
+	}
 }
diff --git a/src/main/java/baubles/common/items/ItemRing.java b/src/main/java/baubles/common/items/ItemRing.java
index 31a9c3bb..a47e2d1c 100644
--- a/src/main/java/baubles/common/items/ItemRing.java
+++ b/src/main/java/baubles/common/items/ItemRing.java
@@ -41,7 +41,7 @@ public ItemRing()
 
 	@SubscribeEvent
 	public static void registerItems(RegistryEvent.Register<Item> event) {
-		event.getRegistry().register((new ItemRing()).setUnlocalizedName("Ring").setRegistryName("ring"));
+		event.getRegistry().register((new ItemRing()).setTranslationKey("Ring").setRegistryName("ring"));
 	}
 
 	@Override
@@ -93,7 +93,7 @@ public EnumRarity getRarity(ItemStack par1ItemStack) {
 	@Override
 	public String getUnlocalizedName(ItemStack par1ItemStack)
 	{
-		return super.getUnlocalizedName() + "." + par1ItemStack.getItemDamage();
+		return super.getTranslationKey() + "." + par1ItemStack.getItemDamage();
 	}
 
 	@Override
diff --git a/src/main/resources/assets/baubles/lang/ar_sa.lang b/src/main/resources/assets/baubles/lang/ar_sa.lang
index 692ffac2..6407841d 100644
--- a/src/main/resources/assets/baubles/lang/ar_sa.lang
+++ b/src/main/resources/assets/baubles/lang/ar_sa.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=خاتم التعدين
+item.Ring.name=خاتم التعدين
 #
 # GUI
 button.normal=عادى
diff --git a/src/main/resources/assets/baubles/lang/bg_bg.lang b/src/main/resources/assets/baubles/lang/bg_bg.lang
index ea61fb6c..c4681140 100644
--- a/src/main/resources/assets/baubles/lang/bg_bg.lang
+++ b/src/main/resources/assets/baubles/lang/bg_bg.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Пръстенът на миньора
+item.Ring.name=Пръстенът на миньора
 #
 # GUI
 button.baubles=Дрънкулки
diff --git a/src/main/resources/assets/baubles/lang/cs_cz.lang b/src/main/resources/assets/baubles/lang/cs_cz.lang
index e84f48c5..5f5af84d 100644
--- a/src/main/resources/assets/baubles/lang/cs_cz.lang
+++ b/src/main/resources/assets/baubles/lang/cs_cz.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Horníkův prsten
+item.Ring.name=Horníkův prsten
 #
 # GUI
 button.baubles=Cetky
diff --git a/src/main/resources/assets/baubles/lang/da_dk.lang b/src/main/resources/assets/baubles/lang/da_dk.lang
index 89dfb129..abfd37c2 100644
--- a/src/main/resources/assets/baubles/lang/da_dk.lang
+++ b/src/main/resources/assets/baubles/lang/da_dk.lang
@@ -1,3 +1,3 @@
 #
 # ITEMS
-item.Ring.0.name=Minearbejders Ring
+item.Ring.name=Minearbejders Ring
diff --git a/src/main/resources/assets/baubles/lang/de_de.lang b/src/main/resources/assets/baubles/lang/de_de.lang
index 507511df..aab56948 100644
--- a/src/main/resources/assets/baubles/lang/de_de.lang
+++ b/src/main/resources/assets/baubles/lang/de_de.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Bergarbeiterring
+item.Ring.name=Bergarbeiterring
 #
 # GUI
 button.baubles=Baubles
diff --git a/src/main/resources/assets/baubles/lang/el_gr.lang b/src/main/resources/assets/baubles/lang/el_gr.lang
index 32d91f40..fd1d6b95 100644
--- a/src/main/resources/assets/baubles/lang/el_gr.lang
+++ b/src/main/resources/assets/baubles/lang/el_gr.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Δαχτυλίδι Μεταλλωρύχου
+item.Ring.name=Δαχτυλίδι Μεταλλωρύχου
 #
 # GUI
 button.baubles=Μπιχλιμπίδια
diff --git a/src/main/resources/assets/baubles/lang/en_us.lang b/src/main/resources/assets/baubles/lang/en_us.lang
index 5dce114e..7fffefd5 100644
--- a/src/main/resources/assets/baubles/lang/en_us.lang
+++ b/src/main/resources/assets/baubles/lang/en_us.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Miner's Ring
+item.Ring.name=Miner's Ring
 #
 # GUI
 button.baubles=Baubles
diff --git a/src/main/resources/assets/baubles/lang/es_es.lang b/src/main/resources/assets/baubles/lang/es_es.lang
index b6e3e5cd..89bcbd2a 100644
--- a/src/main/resources/assets/baubles/lang/es_es.lang
+++ b/src/main/resources/assets/baubles/lang/es_es.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Anillo de Minero
+item.Ring.name=Anillo de Minero
 #
 # GUI
 button.baubles=Ornamentos
diff --git a/src/main/resources/assets/baubles/lang/et_ee.lang b/src/main/resources/assets/baubles/lang/et_ee.lang
index b9364180..85f85237 100644
--- a/src/main/resources/assets/baubles/lang/et_ee.lang
+++ b/src/main/resources/assets/baubles/lang/et_ee.lang
@@ -2,7 +2,7 @@
 # Translated by tambre
 
 # ITEMS
-item.Ring.0.name=Kaevandaja sõrmus
+item.Ring.name=Kaevandaja sõrmus
 
 # GUI
 button.baubles=Baublid
diff --git a/src/main/resources/assets/baubles/lang/fi_fi.lang b/src/main/resources/assets/baubles/lang/fi_fi.lang
index 4e51f12f..24fee4d3 100644
--- a/src/main/resources/assets/baubles/lang/fi_fi.lang
+++ b/src/main/resources/assets/baubles/lang/fi_fi.lang
@@ -1,3 +1,3 @@
 #
 # ITEMS
-item.Ring.0.name=Kaivosmiehen Sormus
+item.Ring.name=Kaivosmiehen Sormus
diff --git a/src/main/resources/assets/baubles/lang/fr_ca.lang b/src/main/resources/assets/baubles/lang/fr_ca.lang
index 889c5ba9..b0f9895f 100644
--- a/src/main/resources/assets/baubles/lang/fr_ca.lang
+++ b/src/main/resources/assets/baubles/lang/fr_ca.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Anneau de mineur
+item.Ring.name=Anneau de mineur
 #
 # GUI
 button.baubles=Bébelles
diff --git a/src/main/resources/assets/baubles/lang/fr_fr.lang b/src/main/resources/assets/baubles/lang/fr_fr.lang
index 52aceab5..7c139348 100644
--- a/src/main/resources/assets/baubles/lang/fr_fr.lang
+++ b/src/main/resources/assets/baubles/lang/fr_fr.lang
@@ -1,6 +1,6 @@
 # 
 # ITEMS 
-item.Ring.0.name=Anneau du mineur 
+item.Ring.name=Anneau du mineur
 # 
 # GUI 
 button.baubles=Bibelots 
diff --git a/src/main/resources/assets/baubles/lang/it_it.lang b/src/main/resources/assets/baubles/lang/it_it.lang
index eff0d8ca..dc30a11d 100644
--- a/src/main/resources/assets/baubles/lang/it_it.lang
+++ b/src/main/resources/assets/baubles/lang/it_it.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Anello del minatore
+item.Ring.name=Anello del minatore
 #
 # GUI
 button.baubles=Accessori
diff --git a/src/main/resources/assets/baubles/lang/ko_kr.lang b/src/main/resources/assets/baubles/lang/ko_kr.lang
index 41e9126b..ba64ce1b 100644
--- a/src/main/resources/assets/baubles/lang/ko_kr.lang
+++ b/src/main/resources/assets/baubles/lang/ko_kr.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=광부의 반지
+item.Ring.name=광부의 반지
 #
 # GUI
 button.baubles=버블즈
diff --git a/src/main/resources/assets/baubles/lang/nl_nl.lang b/src/main/resources/assets/baubles/lang/nl_nl.lang
index ff5ea656..ee6a8eb4 100644
--- a/src/main/resources/assets/baubles/lang/nl_nl.lang
+++ b/src/main/resources/assets/baubles/lang/nl_nl.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Mijnwerkers Ring
+item.Ring.name=Mijnwerkers Ring
 #
 # GUI
 button.baubles=Baubles
diff --git a/src/main/resources/assets/baubles/lang/no_no.lang b/src/main/resources/assets/baubles/lang/no_no.lang
index 1cb82f0e..15ad744e 100644
--- a/src/main/resources/assets/baubles/lang/no_no.lang
+++ b/src/main/resources/assets/baubles/lang/no_no.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Gruvearbeiders Ring
+item.Ring.name=Gruvearbeiders Ring
 #
 # GUI
 button.baubles=Smykker
diff --git a/src/main/resources/assets/baubles/lang/pl_pl.lang b/src/main/resources/assets/baubles/lang/pl_pl.lang
index c312d8fb..e70c6d83 100644
--- a/src/main/resources/assets/baubles/lang/pl_pl.lang
+++ b/src/main/resources/assets/baubles/lang/pl_pl.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Pierścień Górnika
+item.Ring.name=Pierścień Górnika
 #
 # GUI
 button.baubles=Baubles
diff --git a/src/main/resources/assets/baubles/lang/pt_br.lang b/src/main/resources/assets/baubles/lang/pt_br.lang
index 6f01756e..3d74832e 100644
--- a/src/main/resources/assets/baubles/lang/pt_br.lang
+++ b/src/main/resources/assets/baubles/lang/pt_br.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Anel do Minerador
+item.Ring.name=Anel do Minerador
 #
 # GUI
 button.baubles=Baubles
diff --git a/src/main/resources/assets/baubles/lang/ru_ru.lang b/src/main/resources/assets/baubles/lang/ru_ru.lang
index 392a715c..aebca97e 100644
--- a/src/main/resources/assets/baubles/lang/ru_ru.lang
+++ b/src/main/resources/assets/baubles/lang/ru_ru.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Кольцо шахтёра
+item.Ring.name=Кольцо шахтёра
 #
 # GUI
 button.baubles=Baubles
diff --git a/src/main/resources/assets/baubles/lang/tr_tr.lang b/src/main/resources/assets/baubles/lang/tr_tr.lang
index edb2099e..a0dde608 100644
--- a/src/main/resources/assets/baubles/lang/tr_tr.lang
+++ b/src/main/resources/assets/baubles/lang/tr_tr.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=Madenci'nin Yüzüğü
+item.Ring.name=Madenci'nin Yüzüğü
 #
 # GUI
 button.baubles=Baubles
diff --git a/src/main/resources/assets/baubles/lang/uk_ua.lang b/src/main/resources/assets/baubles/lang/uk_ua.lang
index 71fb625f..ccc3378d 100644
--- a/src/main/resources/assets/baubles/lang/uk_ua.lang
+++ b/src/main/resources/assets/baubles/lang/uk_ua.lang
@@ -1,6 +1,6 @@
 #
 # Речі
-item.Ring.0.name=Перстень шахтаря
+item.Ring.name=Перстень шахтаря
 #
 # GUI
 button.baubles=Baubles
diff --git a/src/main/resources/assets/baubles/lang/zh_cn.lang b/src/main/resources/assets/baubles/lang/zh_cn.lang
index dcdf1329..5b877274 100644
--- a/src/main/resources/assets/baubles/lang/zh_cn.lang
+++ b/src/main/resources/assets/baubles/lang/zh_cn.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=矿工指环
+item.Ring.name=矿工指环
 #
 # GUI
 button.baubles=饰品
diff --git a/src/main/resources/assets/baubles/lang/zh_tw.lang b/src/main/resources/assets/baubles/lang/zh_tw.lang
index 2ee092c0..92d1025e 100644
--- a/src/main/resources/assets/baubles/lang/zh_tw.lang
+++ b/src/main/resources/assets/baubles/lang/zh_tw.lang
@@ -1,6 +1,6 @@
 #
 # ITEMS
-item.Ring.0.name=礦工戒指
+item.Ring.name=礦工戒指
 #
 # GUI
 button.baubles=配件裝備欄