Skip to content

Commit

Permalink
Merge branch 'master' into lathee
Browse files Browse the repository at this point in the history
  • Loading branch information
Dream-Master authored Dec 31, 2024
2 parents 64b5bae + 02ddd1d commit 16ff7fc
Show file tree
Hide file tree
Showing 10 changed files with 536 additions and 11 deletions.
20 changes: 10 additions & 10 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
dependencies {
api("com.github.GTNewHorizons:StructureLib:1.4.0:dev")
api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.7.4-GTNH:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.7.8-GTNH:dev")
api("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev")
api("com.github.GTNewHorizons:GTNHLib:0.6.0:dev")
api("com.github.GTNewHorizons:ModularUI:1.2.17:dev")
api("com.github.GTNewHorizons:ModularUI2:2.2.0-1.7.10:dev")
api("com.github.GTNewHorizons:waila:1.8.2:dev")
api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-511-GTNH:dev")
api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.4-gtnh:dev")
api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-516-GTNH:dev")
api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.6-gtnh:dev")
api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
api("com.github.GTNewHorizons:Postea:1.0.13:dev")

Expand All @@ -56,12 +56,12 @@ dependencies {

devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.10.0-GTNH:dev")

compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.57:dev")
compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.59:dev")

compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta28:api') { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.4:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.9.0:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.9.1:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.10.0:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.5-GTNH:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.16.0:dev") { transitive = false }
Expand All @@ -80,7 +80,7 @@ dependencies {
compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751")
compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
implementation("com.github.GTNewHorizons:Hodgepodge:2.6.9:dev")
implementation("com.github.GTNewHorizons:Hodgepodge:2.6.11:dev")
compileOnly('com.github.GTNewHorizons:Botania:1.12.3-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.13-GTNH:dev') { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
Expand All @@ -89,13 +89,13 @@ dependencies {
// https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953')
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.0-GTNH:dev') {transitive = false}
compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.9:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")

compileOnly('com.github.GTNewHorizons:SC2:2.2.0:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:Binnie:2.5.0:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Binnie:2.5.2:dev') {transitive = false}
compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false}
devOnlyNonPublishable('com.github.GTNewHorizons:BlockRenderer6343:1.3.0:dev'){transitive=false}

Expand All @@ -106,7 +106,7 @@ dependencies {
// runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.10.0:dev")
// runtimeOnlyNonPublishable('com.github.GTNewHorizons:neiaddons:1.16.0:dev')
// runtimeOnlyNonPublishable('com.github.GTNewHorizons:MagicBees:2.8.5-GTNH:dev')
// runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.5.0:dev')
// runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.5.2:dev')

testImplementation(platform('org.junit:junit-bom:5.9.2'))
testImplementation('org.junit.jupiter:junit-jupiter')
Expand All @@ -119,7 +119,7 @@ dependencies {
functionalTestImplementation('org.junit.platform:junit-platform-reporting')

runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev")
runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.9.0:dev')
runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.9.1:dev')

// For testing
//runtimeOnlyNonPublishable('com.github.GTNewHorizons:TCNEIAdditions:1.4.2:dev')
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/api/util/GTRecipeConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public class GTRecipeConstants {
Collection<GTRecipe> ret = new ArrayList<>();
for (Materials mat : new Materials[] { Materials.Argon, Materials.Nitrogen }) {
builder.duration(Math.max(1, mat == Materials.Nitrogen ? aDuration / 4 : aDuration / 24));
int tPlasmaAmount = (int) Math.min(1L, aDuration / (mat.getMass() * 16L));
int tPlasmaAmount = (int) Math.max(1L, aDuration / (mat.getMass() * 16L));
GTRecipeBuilder plasmaBuilder = builder.copy()
.fluidInputs(mat.getPlasma(tPlasmaAmount))
.fluidOutputs(mat.getGas(tPlasmaAmount));
Expand Down
13 changes: 13 additions & 0 deletions src/main/resources/assets/bartworks/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,18 @@ item.GT_Rockcutter_Item_LV.name=Rockcutter LV
item.GT_Rockcutter_Item_MV.name=Rockcutter MV
item.GT_Rockcutter_Item_HV.name=Rockcutter HV
item.GT_Teslastaff_Item.name=Teslastaff
BW_ItemBlocks.name=Etched Lapis Cell
BW_ItemBlocks.0.name=Etched Lapis Cell
BW_ItemBlocks.1.name=Plated Lapis Cell
GT_LESU_CASING.name=LESU Casing
GT_LESU_CASING.0.name=LESU Casing

bw.blockores.01.name=Ore
bw.blockores.02.name=Small Ore
bw.werkstoffblocks.01.name=Block
bw.werkstoffblockscasing.01.name=Bolted Casing
bw.werkstoffblockscasingadvanced.01.name=Rebolted Casing

GT5U.gui.text.no_imprint=Missing imprint
GT5U.gui.text.not_enough_length=Multiblock Too Short
GT5U.gui.text.wrong_sievert_exactly=§7Wrong sievert. Requires exactly: %s §7Sv
Expand Down Expand Up @@ -45,12 +53,14 @@ GT5U.gui.config.general.rossruinmetas.ev.generators=Generators
GT5U.gui.config.general.rossruinmetas.ev.machines=Machines

itemGroup.bartworks=BartWorks Inter Temporal
BW_Machinery_Casings.name=Machine Casing
BW_Machinery_Casings.0.name=Nickel-Zinc Ferrite Block
BW_Machinery_Casings.1.name=Transformer-Winding Block
item.BW_PaperRotor.name=Primitive Paper Rotor (Wind only)
item.BW_LeatherRotor.name=Primitive Leather Rotor (Wind only)
item.BW_WoolRotor.name=Primitive Wool Rotor (Wind only)
item.BW_CombinedRotor.name=Combined Primitive Rotor (Wind only)
tile.BWRotorBlock.name=Primitive Kinetic Shaftbox
tile.BWRotorBlock.0.name=Primitive Kinetic Shaftbox
item.grindstone_top.name=Grindstone Top Piece
item.grindstone_bottom.name=Grindstone Bottom Piece
Expand All @@ -60,6 +70,7 @@ item.rotors.woolParts.name=Wool Covered Wood Frame
item.rotors.paperParts.name=Paper Covered Wood Frame
item.rotors.combinedParts.name=Multiple Material Covered Wood Frame
item.BW_SimpleWindMeter.name=Simple Wind Meter
tile.BWHeatedWaterPump.name=Simple Stirling Water Pump
tile.BWHeatedWaterPump.0.name=Simple Stirling Water Pump
item.BWrawtube.name=Elongated Glass Tube
item.BWmotor.name=Simple Stirling Motor
Expand All @@ -81,6 +92,7 @@ labModule.item.PCRThermoclyclingModule.name=PCR Thermocycle Module
labModule.item.PlasmidSynthesisModule.name=Plasmid Synthesis Module
labModule.item.TransformationModule.name=Transformation Module
labModule.item.ClonalCellularSynthesisModule.name=Clonal Cellular Synthesis Module
BW_GlasBlocks.name=Borosilicate Glass Block
BW_GlasBlocks.0.name=Borosilicate Glass Block
BW_GlasBlocks.1.name=Titanium Reinforced Borosilicate Glass Block
BW_GlasBlocks.2.name=Tungstensteel Reinforced Borosilicate Glass Block
Expand All @@ -97,6 +109,7 @@ BW_GlasBlocks.12.name=Thorium Yttrium Glass Block
BW_GlasBlocks.13.name=Neutronium Reinforced Borosilicate Glass Block
BW_GlasBlocks.14.name=Cosmic Neutronium Reinforced Borosilicate Glass Block
BW_GlasBlocks.15.name=Infinity Reinforced Borosilicate Glass Block
BW_GlasBlocks2.name=Borosilicate Glass Block
BW_GlasBlocks2.0.name=Transcendentally Reinforced Borosilicate Glass Block

tooltip.glass_tier.0.name=Glass-Tier:
Expand Down
37 changes: 37 additions & 0 deletions src/main/resources/assets/goodgenerator/lang/en_US.lang
Original file line number Diff line number Diff line change
@@ -1,24 +1,40 @@
#This is the lang file for GoodGenerator!

#Blocks
MAR_Casing.name=Field Restriction Casing
MAR_Casing.0.name=Field Restriction Casing
radiationProtectionSteelFrame.name=Radiation Proof Steel Frame Box
radiationProtectionSteelFrame.0.name=Radiation Proof Steel Frame Box
fieldRestrictingGlass.name=Field Restriction Glass
fieldRestrictingGlass.0.name=Field Restriction Glass
FRF_Coil_1.name=Field Restriction Coil
FRF_Coil_1.0.name=Field Restriction Coil
FRF_Coil_2.name=Advanced Field Restriction Coil
FRF_Coil_2.0.name=Advanced Field Restriction Coil
FRF_Coil_3.name=Ultimate Field Restriction Coil
FRF_Coil_3.0.name=Ultimate Field Restriction Coil
FRF_Coil_4.name=Temporal Field Restriction Coil
FRF_Coil_4.0.name=Temporal Field Restriction Coil
FRF_Casing.name=Naquadah Fuel Refinery Casing
FRF_Casing.0.name=Naquadah Fuel Refinery Casing
rawCylinder.name=Raw Cylinder
rawCylinder.0.name=Raw Cylinder
titaniumPlatedCylinder.name=Titanium Plated Cylinder
titaniumPlatedCylinder.0.name=Titanium Plated Cylinder
magicCasing.name=Magic Casing
magicCasing.0.name=Magic Casing
essentiaCell.name=Essentia Diffusion Cell
essentiaCell.0.name=Novice Essentia Diffusion Cell
essentiaCell.1.name=Adept Essentia Diffusion Cell
essentiaCell.2.name=Master Essentia Diffusion Cell
essentiaCell.3.name=Grandmaster Essentia Diffusion Cell
essentiaHatch.name=Essentia Input Hatch
essentiaHatch.0.name=Essentia Input Hatch
speedingPipe.name=Speeding Pipe Casing
speedingPipe.0.name=Speeding Pipe Casing
yottaFluidTankCasing.name=YOTTank Casing
yottaFluidTankCasing.0.name=YOTTank Casing
yottaFluidTankCell.name=Fluid Cell Block
yottaFluidTankCell.0.name=Fluid Cell Block T1
yottaFluidTankCell.1.name=Fluid Cell Block T2
yottaFluidTankCell.2.name=Fluid Cell Block T3
Expand All @@ -29,21 +45,30 @@ yottaFluidTankCell.6.name=Fluid Cell Block T7
yottaFluidTankCell.7.name=Fluid Cell Block T8
yottaFluidTankCell.8.name=Fluid Cell Block T9
yottaFluidTankCell.9.name=Fluid Cell Block T10
supercriticalFluidTurbineCasing.name=SC Turbine Casing
supercriticalFluidTurbineCasing.0.name=SC Turbine Casing
pressureResistantWalls.name=Pressure Resistant Wall
pressureResistantWalls.0.name=Pressure Resistant Wall
impreciseUnitCasing.name=Imprecise Electronic Unit Casing
impreciseUnitCasing.0.name=Imprecise Electronic Unit Casing
preciseUnitCasing.name=Precise Electronic Unit Casing
preciseUnitCasing.0.name=Precise Electronic Unit Casing MK-I
preciseUnitCasing.1.name=Precise Electronic Unit Casing MK-II
preciseUnitCasing.2.name=Precise Electronic Unit Casing MK-III
preciseUnitCasing.3.name=Precise Electronic Unit Casing MK-IV
compactFusionCoil.name=Compact Fusion Coil
compactFusionCoil.0.name=Ameliorated Superconduct Coil
compactFusionCoil.1.name=Compact Fusion Coil
compactFusionCoil.2.name=Advanced Compact Fusion Coil
compactFusionCoil.3.name=Compact Fusion Coil MK-II Prototype
compactFusionCoil.4.name=Compact Fusion Coil MK-II Finaltype
essentiaFilterCasing.name=Essentia Filter Casing
essentiaFilterCasing.0.name=Essentia Filter Casing
essentiaOutputHatch.name=Essentia Output Hatch
essentiaOutputHatch.0.name=Essentia Output Hatch
essentiaOutputHatch_ME.name=Essentia Output Hatch (ME)
essentiaOutputHatch_ME.0.name=Essentia Output Hatch (ME)
componentAssemblyLineCasing.name=Component Assembly Line Casing
componentAssemblyLineCasing.0.name=Component Assembly Line Casing (LV)
componentAssemblyLineCasing.1.name=Component Assembly Line Casing (MV)
componentAssemblyLineCasing.2.name=Component Assembly Line Casing (HV)
Expand All @@ -58,11 +83,17 @@ componentAssemblyLineCasing.10.name=Component Assembly Line Casing (UIV)
componentAssemblyLineCasing.11.name=Component Assembly Line Casing (UMV)
componentAssemblyLineCasing.12.name=Component Assembly Line Casing (UXV)
componentAssemblyLineCasing.13.name=Component Assembly Line Casing (MAX)
magneticFluxCasing.name=Magnetic Flux Casing
magneticFluxCasing.0.name=Magnetic Flux Casing
gravityStabilizationCasing.name=Gravity Stabilization Casing
gravityStabilizationCasing.0.name=Gravity Stabilization Casing
antimatterContainmentCasing.name=Antimatter Containment Casing
antimatterContainmentCasing.0.name=Antimatter Containment Casing
protomatterActivationCoil.name=Protomatter Activation Coil
protomatterActivationCoil.0.name=Protomatter Activation Coil
antimatterAnnihilationMatrix.name=Antimatter Annihilation Matrix
antimatterAnnihilationMatrix.0.name=Antimatter Annihilation Matrix
tile.gg.antimatterRender.name=Antimatter Render

#Items
item.radiationProtectionPlate.name=Radiation Proof Plate
Expand Down Expand Up @@ -116,6 +147,7 @@ item.rodLiquidPlutonium.name=Fuel Rod (Excited Plutonium)
item.rodLiquidPlutonium2.name=Dual Fuel Rod (Excited Plutonium)
item.rodLiquidPlutonium4.name=Quad Fuel Rod (Excited Plutonium)
item.advancedFuelRod.name=Advanced Fuel Rod (Empty)
item.fluidCore.name=Fluid Storage Core
item.fluidCore.0.name=Fluid Storage Core T1
item.fluidCore.1.name=Fluid Storage Core T2
item.fluidCore.2.name=Fluid Storage Core T3
Expand All @@ -126,6 +158,7 @@ item.fluidCore.6.name=Fluid Storage Core T7
item.fluidCore.7.name=Fluid Storage Core T8
item.fluidCore.8.name=Fluid Storage Core T9
item.fluidCore.9.name=Fluid Storage Core T10
item.upgradeEssentia.name=Essentia Generator
item.upgradeEssentia.0.name=Essentia Generator: Empty
item.upgradeEssentia.1.name=§eEssentia Generator: Air§r
item.upgradeEssentia.2.name=§cEssentia Generator: Thermal§r
Expand All @@ -136,14 +169,18 @@ item.upgradeEssentia.6.name=§bEssentia Generator: Mechanics§r
item.upgradeEssentia.7.name=§6Essentia Generator: Spirit§r
item.upgradeEssentia.8.name=§aEssentia Generator: Radiation§r
item.upgradeEssentia.9.name=§3Essentia Generator: Electric§r
item.highEnergyMixture.name=High Energy Mixture
item.highEnergyMixture.0.name=High Energy Mixture
item.saltyRoot.name=Salty Root
item.saltyRoot.0.name=Salty Root
item.huiCircuit.name=Hi-Computation Station
item.huiCircuit.0.name=Hi-Computation Station MK-I
item.huiCircuit.1.name=Hi-Computation Station MK-II
item.huiCircuit.2.name=Hi-Computation Station MK-III
item.huiCircuit.3.name=Hi-Computation Station MK-IV Prototype
item.huiCircuit.4.name=Hi-Computation Station MK-V Finaltype
item.nuclearStar.name=Nuclear Star
item.circuitWrap.name=Wrap of Circuits
item.circuitWrap.0.name=Wrap of ULV Circuits
item.circuitWrap.1.name=Wrap of LV Circuits
item.circuitWrap.2.name=Wrap of MV Circuits
Expand Down
40 changes: 40 additions & 0 deletions src/main/resources/assets/gregtech/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,46 @@ itemGroup.GregTech.Materials=Materials
itemGroup.GregTech.Ores=Ores

item.gt.advancedsensorcard.name=GregTech Advanced Sensor Card
gt.blackholerenderer.name=Black Hole Renderer
gt.block.longdistancepipe.name=Long Distance Pipeline Pipe
gt.blockcasings.cyclotron_coils.name=Solenoid Superconductor Coil
gt.blockcasings.name=Machine Casing
gt.blockcasings2.name=Machine Casing
gt.blockcasings3.name=Machine Casing
gt.blockcasings4.name=Machine Casing
gt.blockcasings5.name=Machine Casing
gt.blockcasings6.name=Machine Casing
gt.blockcasings8.name=Machine Casing
gt.blockcasings9.name=Machine Casing
gt.blockcasings10.name=Machine Casing
gt.blockcasings11.name=Machine Casing
gt.blockconcretes.name=Concrete
gt.blockframes.name=Frame
gt.blockgem1.name=Block
gt.blockgem2.name=Block
gt.blockgem3.name=Block
gt.blockglass1.name=Glass
gt.blockgranites.name=Granite
gt.blockmachines.name=Machine
gt.blockmetal1.name=Block
gt.blockmetal2.name=Block
gt.blockmetal3.name=Block
gt.blockmetal4.name=Block
gt.blockmetal5.name=Block
gt.blockmetal6.name=Block
gt.blockmetal7.name=Block
gt.blockmetal8.name=Block
gt.blockmetal9.name=Block
gt.blockores.name=Ore
gt.blockreinforced.name=Reinforced Block
gt.blockstones.name=Stone
gt.blocktintedglass.name=Tinted Industrial Glass
gt.wormholerenderer.name=Wormhole Renderer
item.gt.comb.name=Comb
item.gt.drop.name=Drop
item.gt.pollen.name=Pollen
item.gt.propolis.name=Propolis
tile.gt.dronerender.name=Drone Renderer

GT5U.autoplace.error.no_hatch=§cSuggested to place hatch §4%s§c but none was found
GT5U.autoplace.error.no_mte.id=§cSuggested to place machine with meta ID §4%s§c but none was found
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/gtnhlanth/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ beamline.pipe.desc.1=Signal does not cross or bend
tile.recipe.tc=Target Chamber
tile.recipe.sc=Source Chamber

item.particle.name=Particle
particle.electron=Electron
particle.photon=Photon
particle.alpha=Alpha
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/assets/kekztech/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ tile.kekztech_gdcceramicelectrolyteunit_block.name=GDC Ceramic Electrolyte Unit
tile.kekztech_yszceramicelectrolyteunit_block.name=YSZ Ceramic Electrolyte Unit

# -------- Fuel Cell: Crafting Components
item.kekztech_crafting_item.name=Crafting Component
item.kekztech_crafting_item.9.name=YSZ Ceramic Dust
item.kekztech_crafting_item.10.name=GDC Ceramic Dust
item.kekztech_crafting_item.11.name=Yttria Dust
Expand All @@ -32,6 +33,7 @@ item.kekztech_crafting_item.14.name=YSZ Ceramic Plate
item.kekztech_crafting_item.15.name=GDC Ceramic Plate

# -------- TFFT: Structure Blocks
tile.kekztech_tfftstoragefield_block.name=T.F.F.T Casing/Storage Field Block
tile.kekztech_tfftstoragefield_block.0.name=T.F.F.T Casing
tile.kekztech_tfftstoragefield_block.1.name=T.F.F.T Storage Field Block (Tier I)
tile.kekztech_tfftstoragefield_block.2.name=T.F.F.T Storage Field Block (Tier II)
Expand All @@ -50,6 +52,7 @@ tile.kekztech_tfftstoragefield_block.hint.3=Hint 3 Dot: EV+ Tier Glass, T.F.F.T
tile.kekztech_tfftstoragefield_block.hint.4=Hint 4 Dot: EV+ Tier Glass

# -------- Lapotronic Super Capacitor: Structure Blocks
tile.kekztech_lapotronicenergyunit_block.name=Lapotronic Casing/Capacitor
tile.kekztech_lapotronicenergyunit_block.0.name=Lapotronic Super Capacitor Casing
tile.kekztech_lapotronicenergyunit_block.1.name=Lapotronic Capacitor (IV)
tile.kekztech_lapotronicenergyunit_block.2.name=Lapotronic Capacitor (LuV)
Expand All @@ -64,6 +67,7 @@ tile.kekztech_lapotronicenergyunit_block.10.name=Mega Ultimate Capacitor (UMV)
tile.kekztech_lapotronicenergyunit_block.desc=Part of the Lapotronic Super Capacitor

# -------- Thaumium Reinforced Jar: Block
tile.kekztech_thaumiumreinforcedjar_block.name=Thaumium Reinforced Jar
tile.kekztech_thaumiumreinforcedjar_block.0.name=Thaumium Reinforced Jar
tile.kekztech_thaumiumreinforcedjar_block.3.name=Thaumium Reinforced Void Jar

Expand All @@ -77,6 +81,7 @@ kekztech.research_page.THAUMIUMREINFORCEDJAR.0=You have heard your fellow Thauma
kekztech.research_page.THAUMIUMREINFORCEDJAR.1=Compressing this much Essentia in such a tiny space causes some volatility. Picking up reinforced jars is probably a bad idea...<BR><BR>You imagine that you could get even more out of your jars if only you had some kind of material harder than even diamond or any of the other magical metal you have seen so far.

# -------- Ichor Jar: Block
tile.kekztech_ichorjar_block.name=Ichor Jar
tile.kekztech_ichorjar_block.0.name=Ichor Jar
tile.kekztech_ichorjar_block.3.name=Ichor Void Jar

Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/kubatech/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ kubablock.tea_acceptor.name=§4§lTea Acceptor
kubablock.tea_storage.name=§4§lTea Storage Extender

#DEFC Casings
defc.casing.name=Fusion Casing
defc.casing.tip=Draconic Evolution Fusion Crafter Casing, Tier %d

#Items
item.kubaitems.name=Tea / Tea Leaf
kubaitem.fromcollection=This item is from
kubaitem.notyours=It looks like that item is not yours
kubaitem.defc_schematic_t1.name=Draconic Core Schematic
Expand Down
Loading

0 comments on commit 16ff7fc

Please sign in to comment.