Skip to content

Commit

Permalink
Remove GT++ naq fuels (#3783)
Browse files Browse the repository at this point in the history
  • Loading branch information
serenibyss authored Jan 10, 2025
1 parent 3b17b70 commit 952a075
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 62 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -267,48 +267,6 @@ public final class MaterialsNuclides {
new MaterialStack(MaterialsFluorides.URANIUM_HEXAFLUORIDE, 1),
new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2));

// Secondary material is molten metal
public static final Material NAQ_FUEL_T1 = new Material(
"Naquadah Fuel",
MaterialState.PURE_LIQUID, // State
null, // Material Colour
-1, // Melting Point in C
-1, // Boiling Point in C
-1, // Protons
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
new MaterialStack(MaterialsElements.getInstance().NAQUADAH, 2),
new MaterialStack(MaterialsElements.getInstance().TANTALUM, 3));

// Secondary material is a plasma
public static final Material NAQ_FUEL_T2 = new Material(
"Enriched Naquadah Fuel",
MaterialState.PURE_LIQUID, // State
null, // Material Colour
-1, // Melting Point in C
-1, // Boiling Point in C
-1, // Protons
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
new MaterialStack(MaterialsElements.getInstance().NAQUADAH_ENRICHED, 2),
new MaterialStack(MaterialsElements.getInstance().TITANIUM, 3));

// Secondary material is a plasma
public static final Material NAQ_FUEL_T3 = new Material(
"Naquadria Fuel",
MaterialState.PURE_LIQUID, // State
null, // Material Colour
-1, // Melting Point in C
-1, // Boiling Point in C
-1, // Protons
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
new MaterialStack(MaterialsElements.getInstance().NAQUADRIA, 2),
new MaterialStack(MaterialsElements.getInstance().AMERICIUM, 3));

private static final MaterialsNuclides INSTANCE = new MaterialsNuclides();

public static MaterialsNuclides getInstance() {
Expand Down
3 changes: 0 additions & 3 deletions src/main/resources/assets/miscutils/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -3694,9 +3694,6 @@ item.BasicMetaFood.6.name=Raw Ocelot Meat
item.BasicMetaFood.7.name=Cooked Ocelot Meat
item.BasicMetaFood.8.name=Blaze Flesh

item.itemCellNaquadahFuel.name=Naquadah Fuel Cell
item.itemCellEnrichedNaquadahFuel.name=Enriched Naquadah Fuel Cell
item.itemCellNaquadriaFuel.name=Naquadria Fuel Cell
item.boricacid.name=Boric Acid Cell
item.hydrochloricacid.name=Hydrochloric Acid Cell

Expand Down
21 changes: 9 additions & 12 deletions src/main/resources/assets/miscutils/lang/ru_RU.lang
Original file line number Diff line number Diff line change
Expand Up @@ -1350,7 +1350,7 @@ item.crushedCentrifugedLanthaniteNd.name=Centrifuged Crushed Lanthanite (Nd) Ore
item.crushedPurifiedLanthaniteNd.name=Purified Crushed Lanthanite (Nd) Ore
item.dustImpureLanthaniteNd.name=Impure Lanthanite (Nd) Dust
item.dustPureLanthaniteNd.name=Purified Lanthanite (Nd) Dust
item.itemDustAgarditeY.name=Пыль Агардита Y
item.itemDustAgarditeY.name=Пыль Агардита Y
item.itemDustTinyAgarditeY.name=Tiny Pile of Agardite (Y) Dust
item.itemDustSmallAgarditeY.name=Small Pile of Agardite (Y) Dust
item.crushedAgarditeY.name=Crushed Agardite (Y) Ore
Expand Down Expand Up @@ -1784,7 +1784,7 @@ tile.Block of Actinium.name=Блок Актиния
tile.Block of Protactinium.name=Блок Протактиния
tile.Block of Neptunium.name=Блок Нептуния
tile.Block of Curium.name=Блок Кюрия
tile.Block of Berkelium.name=Блок Беркилия
tile.Block of Berkelium.name=Блок Беркилия
tile.Block of Californium.name=Блок Калифорния
tile.Block of Einsteinium.name=Блок Эйнштейния
tile.Block of Fermium.name=Блок Фермия
Expand Down Expand Up @@ -1835,7 +1835,7 @@ tile.Tantalloy-61 Frame Box.name=Каркас Из Сплава Тантала 6
tile.Block of Inconel-625.name=Блок Инконеля 625
tile.Inconel-625 Frame Box.name=Каркас Из Инконеля 625
tile.Block of Inconel-690.name=Блок Инконеля 690
tile.Inconel-690 Frame Box.name=Каркас Из Инконеля 690
tile.Inconel-690 Frame Box.name=Каркас Из Инконеля 690
tile.Block of Inconel-792.name=Блок Инконеля 792
tile.Inconel-792 Frame Box.name=Каркас Из Инконеля 792
tile.Block of Eglin Steel.name=Блок Эглиновой Стали
Expand All @@ -1856,12 +1856,12 @@ tile.Block of Hastelloy-X.name=Блок Хастеллоя X
tile.Hastelloy-X Frame Box.name=Каркас Из Хастеллоя X
tile.Block of Hastelloy-C276.name=Блок Хастеллоя C276
tile.Hastelloy-C276 Frame Box.name=Каркас Из Хастеллоя C276
tile.Block of Hastelloy-N.name=Блок Хастеллоя N
tile.Hastelloy-N Frame Box.name=Каркас Из Хастеллоя N
tile.Block of Hastelloy-N.name=Блок Хастеллоя N
tile.Hastelloy-N Frame Box.name=Каркас Из Хастеллоя N
tile.Block of Incoloy-020.name=Блок Инколоя 020
tile.Incoloy-020 Frame Box.name=Каркас Из Инколоя 020
tile.Block of Incoloy-DS.name=Блок Инколоя DS
tile.Incoloy-DS Frame Box.name=Каркас Из Инколоя DS
tile.Incoloy-DS Frame Box.name=Каркас Из Инколоя DS
tile.Block of Incoloy-MA956.name=Блок Инколоя MA956
tile.Incoloy-MA956 Frame Box.name=Каркас Из Инколоя MA956
tile.Block of Grisium.name=Блок Грисиума
Expand All @@ -1887,7 +1887,7 @@ tile.OreZirconolite.name=Руда Цирконолита
tile.OreGadoliniteCe.name=Руда Гадолинита Ce
tile.OreGadoliniteY.name=Руда Гадолинита Y
tile.OreLepersonnite.name=Руда Леперсоннита
tile.OreSamarskiteY.name=Руда Самарскита Y
tile.OreSamarskiteY.name=Руда Самарскита Y
tile.OreSamarskiteYb.name=Руда Самарскита Yb
tile.OreXenotime.name=Руда Ксенотима
tile.OreYttriaite.name=Руда Иттриайта
Expand All @@ -1900,7 +1900,7 @@ tile.OreZirkelite.name=Руда Циркелита
tile.OreLanthaniteLa.name=Руда Лантанита La
tile.OreLanthaniteCe.name=Руда Лантанита Ce
tile.OreLanthaniteNd.name=Руда Лантанита Nd
tile.OreAgarditeY.name=Руда Агардита Y
tile.OreAgarditeY.name=Руда Агардита Y
tile.OreAgarditeCd.name=Руда Агардита Cd
tile.OreAgarditeLa.name=Руда Агардита La
tile.OreAgarditeNd.name=Руда Агардита Nd
Expand Down Expand Up @@ -3090,9 +3090,6 @@ item.BasicMetaFood.6.name=Raw Ocelot Meat
item.BasicMetaFood.7.name=Cooked Ocelot Meat
item.BasicMetaFood.8.name=Blaze Flesh

item.itemCellNaquadahFuel.name=Naquadah Fuel Cell
item.itemCellEnrichedNaquadahFuel.name=Enriched Naquadah Fuel Cell
item.itemCellNaquadriaFuel.name=Naquadria Fuel Cell
item.boricacid.name=Boric Acid Cell
item.hydrochloricacid.name=Hydrochloric Acid Cell

Expand Down Expand Up @@ -3348,4 +3345,4 @@ item.miscutils:magicfeather.name=Magical Feather
item.BasicGenericChemItem.14.name=Solid-Acid Catalyst

//Added 30/05/22
item.BasicGenericChemItem.15.name=Infinite Mutation Catalyst
item.BasicGenericChemItem.15.name=Infinite Mutation Catalyst
7 changes: 2 additions & 5 deletions src/main/resources/assets/miscutils/lang/zh_CN.lang
Original file line number Diff line number Diff line change
Expand Up @@ -2741,7 +2741,7 @@ item.itemDustNylon.name=尼龙粉
item.itemDustTinyNylon.name=小撮尼龙粉
item.itemDustSmallNylon.name=小堆尼龙粉
item.itemNuggetNylon.name=尼龙粒
item.itemPlateNylon.name=尼龙板
item.itemPlateNylon.name=尼龙板
item.itemPlateDoubleNylon.name=双重尼龙板
item.itemCellNylon.name=尼龙单元
tile.Block of Nylon.name=尼龙块
Expand Down Expand Up @@ -3090,9 +3090,6 @@ item.BasicMetaFood.6.name=生猫肉
item.BasicMetaFood.7.name=熟猫肉
item.BasicMetaFood.8.name=烈焰人肉

item.itemCellNaquadahFuel.name=硅岩燃料单元
item.itemCellEnrichedNaquadahFuel.name=富集硅岩燃料单元
item.itemCellNaquadriaFuel.name=超能硅岩燃料单元
item.boricacid.name=硼酸单元
item.hydrochloricacid.name=盐酸单元

Expand Down Expand Up @@ -3348,4 +3345,4 @@ item.miscutils:magicfeather.name=魔法羽毛
item.BasicGenericChemItem.14.name=固体酸催化剂

//Added 30/05/22
item.BasicGenericChemItem.15.name=无尽突变催化剂
item.BasicGenericChemItem.15.name=无尽突变催化剂

0 comments on commit 952a075

Please sign in to comment.