diff --git a/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang b/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang index 092a18a83..ef3ecd906 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang @@ -352,7 +352,6 @@ item.appliedenergistics2.material.FluixPearl.name=Fluixová perla item.appliedenergistics2.material.FormationCore.name=Formační jádro item.appliedenergistics2.material.GoldDust.name=Zlatý prach item.appliedenergistics2.material.IronDust.name=Železný prach -item.appliedenergistics2.material.IronNugget.name=Železná hrudka item.appliedenergistics2.material.LogicProcessor.name=Logický procesor item.appliedenergistics2.material.LogicProcessorAsm.name=Nedokončený logický procesor item.appliedenergistics2.material.MatterBall.name=Hmotný míč @@ -499,4 +498,4 @@ achievement.ae2.QNB.desc=Vyrob kvantové spojení stat.ae2.ItemsInserted=Předměty přidány do ME úložiště stat.ae2.ItemsExtracted=Předměty odebrány z ME úložiště -stat.ae2.TurnedCranks=Otočené kliky \ No newline at end of file +stat.ae2.TurnedCranks=Otočené kliky diff --git a/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang b/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang index 362eebf9d..3276c6d00 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang @@ -403,7 +403,6 @@ item.appliedenergistics2.material.FluixPearl.name=Fluixperle item.appliedenergistics2.material.FormationCore.name=Formationskern item.appliedenergistics2.material.GoldDust.name=Goldstaub item.appliedenergistics2.material.IronDust.name=Eisenstaub -item.appliedenergistics2.material.IronNugget.name=Eisennugget item.appliedenergistics2.material.LogicProcessor.name=Logikprozessor item.appliedenergistics2.material.LogicProcessorAsm.name=Unfertiger Logikprozessor item.appliedenergistics2.material.MatterBall.name=Materieball diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang index a62dc8682..e4bd6715b 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang @@ -425,7 +425,6 @@ item.appliedenergistics2.material.FluixPearl.name=Fluix Pearl item.appliedenergistics2.material.FormationCore.name=Formation Core item.appliedenergistics2.material.GoldDust.name=Gold Dust item.appliedenergistics2.material.IronDust.name=Iron Dust -item.appliedenergistics2.material.IronNugget.name=Iron Nugget item.appliedenergistics2.material.LogicProcessor.name=Logic Processor item.appliedenergistics2.material.LogicProcessorAsm.name=Unfinished Logic Processor item.appliedenergistics2.material.MatterBall.name=Matter Ball diff --git a/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang b/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang index 5e0025821..5fac3d939 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang @@ -335,7 +335,6 @@ item.appliedenergistics2.material.FluixPearl.name=Perla de Fluix item.appliedenergistics2.material.FormationCore.name=Núcleo de Formación item.appliedenergistics2.material.GoldDust.name=Polvo de Oro item.appliedenergistics2.material.IronDust.name=Polvo de Hierro -item.appliedenergistics2.material.IronNugget.name=Pepita de Hierro item.appliedenergistics2.material.LogicProcessor.name=Procesador Lógico item.appliedenergistics2.material.LogicProcessorAsm.name=Procesador Lógico sin Acabar item.appliedenergistics2.material.MatterBall.name=Bola de Materia diff --git a/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang b/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang index a718c7155..7834badb2 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang @@ -400,7 +400,6 @@ item.appliedenergistics2.material.FluixPearl.name=Perle de Fluix item.appliedenergistics2.material.FormationCore.name=Noyau de formation item.appliedenergistics2.material.GoldDust.name=Poussière d'or item.appliedenergistics2.material.IronDust.name=Poussière de fer -item.appliedenergistics2.material.IronNugget.name=Pépite de fer item.appliedenergistics2.material.LogicProcessor.name=Processeur logique item.appliedenergistics2.material.LogicProcessorAsm.name=Processeur logique inachevé item.appliedenergistics2.material.MatterBall.name=Bille de matière diff --git a/src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang b/src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang index 61c4c4287..6a9650a17 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang @@ -408,7 +408,6 @@ item.appliedenergistics2.ItemMaterial.FluixPearl.name=Fluix Gyöngy item.appliedenergistics2.ItemMaterial.FormationCore.name=Formációs Mag item.appliedenergistics2.ItemMaterial.GoldDust.name=Arany Por item.appliedenergistics2.ItemMaterial.IronDust.name=Vas Por -item.appliedenergistics2.ItemMaterial.IronNugget.name=Vasrög item.appliedenergistics2.ItemMaterial.LogicProcessor.name=Logikai Processzor item.appliedenergistics2.ItemMaterial.LogicProcessorAsm.name=Befejezetlen Logikai Processzor item.appliedenergistics2.ItemMaterial.MatterBall.name=Anyag Labda diff --git a/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang b/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang index e64cec372..155f0fd8a 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang @@ -383,7 +383,6 @@ item.appliedenergistics2.material.FluixPearl.name=Perla di Fluix item.appliedenergistics2.material.FormationCore.name=Nucleo di formazione item.appliedenergistics2.material.GoldDust.name=Polvere d'oro item.appliedenergistics2.material.IronDust.name=Polvere di ferro -item.appliedenergistics2.material.IronNugget.name=Pepita di ferro item.appliedenergistics2.material.LogicProcessor.name=Processore logico item.appliedenergistics2.material.LogicProcessorAsm.name=Processore logico incompleto item.appliedenergistics2.material.MatterBall.name=Sfera di materia diff --git a/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang b/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang index 1ef48080d..689f1ab3c 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang @@ -362,7 +362,6 @@ item.appliedenergistics2.material.FluixPearl.name=액정 진주 item.appliedenergistics2.material.FormationCore.name=형성 코어 item.appliedenergistics2.material.GoldDust.name=금 가루 item.appliedenergistics2.material.IronDust.name=철 가루 -item.appliedenergistics2.material.IronNugget.name=철 조각 item.appliedenergistics2.material.LogicProcessor.name=논리 처리기 item.appliedenergistics2.material.LogicProcessorAsm.name=미완성된 논리 처리기 item.appliedenergistics2.material.MatterBall.name=물질 공 diff --git a/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang b/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang index 5ba0e0147..320ecb5e0 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang @@ -405,7 +405,6 @@ item.appliedenergistics2.material.FluixPearl.name=Pérola de Fluix item.appliedenergistics2.material.FormationCore.name=Núcleo de Formação item.appliedenergistics2.material.GoldDust.name=Pó de Ouro item.appliedenergistics2.material.IronDust.name=Pó de Ferro -item.appliedenergistics2.material.IronNugget.name=Pepita de Ferro item.appliedenergistics2.material.LogicProcessor.name=Processador Lógico item.appliedenergistics2.material.LogicProcessorAsm.name=Processador Lógico Inacabado item.appliedenergistics2.material.MatterBall.name=Bola de Matéria diff --git a/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang b/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang index c8b1ec7bd..ff2a58663 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang @@ -262,7 +262,6 @@ item.appliedenergistics2.material.FluixPearl.name=Perlă Fluix item.appliedenergistics2.material.FormationCore.name=Centru de Formaţie item.appliedenergistics2.material.GoldDust.name=Praf de Aur item.appliedenergistics2.material.IronDust.name=Praf de Fier -item.appliedenergistics2.material.IronNugget.name=Pepită de Fier item.appliedenergistics2.material.LogicProcessor.name=Procesor de Logică item.appliedenergistics2.material.LogicProcessorAsm.name=Procesor de Logică Neterminat item.appliedenergistics2.material.MatterBall.name=Minge de Materie diff --git a/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang b/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang index 96302691e..b03e02619 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang @@ -409,7 +409,6 @@ item.appliedenergistics2.material.FluixPearl.name=Изменчивая жемч item.appliedenergistics2.material.FormationCore.name=Ядро формирования item.appliedenergistics2.material.GoldDust.name=Золотая пыль item.appliedenergistics2.material.IronDust.name=Железная пыль -item.appliedenergistics2.material.IronNugget.name=Железный самородок item.appliedenergistics2.material.LogicProcessor.name=Логический процессор item.appliedenergistics2.material.LogicProcessorAsm.name=Незаконченный логический процессор item.appliedenergistics2.material.MatterBall.name=Шарик материи diff --git a/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang b/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang index a46b750b3..29fa4ffc1 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang @@ -405,7 +405,6 @@ item.appliedenergistics2.material.FluixPearl.name=福鲁伊克斯珍珠 item.appliedenergistics2.material.FormationCore.name=成型核心 item.appliedenergistics2.material.GoldDust.name=金粉 item.appliedenergistics2.material.IronDust.name=铁粉 -item.appliedenergistics2.material.IronNugget.name=铁粒 item.appliedenergistics2.material.LogicProcessor.name=逻辑处理器 item.appliedenergistics2.material.LogicProcessorAsm.name=半成品-逻辑处理器 item.appliedenergistics2.material.MatterBall.name=物质球 diff --git a/src/main/resources/assets/appliedenergistics2/lang/zh_TW.lang b/src/main/resources/assets/appliedenergistics2/lang/zh_TW.lang index e7c11cd17..71dbf9d03 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/zh_TW.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/zh_TW.lang @@ -331,7 +331,6 @@ item.appliedenergistics2.ItemMaterial.FluixPearl.name=福魯伊克斯珍珠 item.appliedenergistics2.ItemMaterial.FormationCore.name=成型核心 item.appliedenergistics2.ItemMaterial.GoldDust.name=金粉 item.appliedenergistics2.ItemMaterial.IronDust.name=鐵粉 -item.appliedenergistics2.ItemMaterial.IronNugget.name=鐵粒 item.appliedenergistics2.ItemMaterial.LogicProcessor.name=邏輯處理器 item.appliedenergistics2.ItemMaterial.LogicProcessorAsm.name=半成品-邏輯處理器 item.appliedenergistics2.ItemMaterial.MatterBall.name=物質球 diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_iron_nugget.json b/src/main/resources/assets/appliedenergistics2/models/item/material_iron_nugget.json deleted file mode 100644 index 147cc6054..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/material_iron_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "appliedenergistics2:items/material_iron_nugget" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe index d1182058f..834694177 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe @@ -9,13 +9,3 @@ shaped= mc:redstone_torch netherCrystal mc:redstone_torch, oredictionary:stone oredictionary:stone oredictionary:stone -> mc:comparator - -shaped= - ae2:material.IronNugget ae2:material.IronNugget ae2:material.IronNugget, - ae2:material.IronNugget ae2:material.IronNugget ae2:material.IronNugget, - ae2:material.IronNugget ae2:material.IronNugget ae2:material.IronNugget - -> mc:iron_ingot - -shapeless= - oredictionary:ingotIron - -> 9 ae2:material.IronNugget diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/material_iron_nugget.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_iron_nugget.png deleted file mode 100644 index 5d01dc84f..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/material_iron_nugget.png and /dev/null differ