diff --git a/src/api/java/appeng/api/util/AECableType.java b/src/api/java/appeng/api/util/AECableType.java index 33cee5828..e723d41a2 100644 --- a/src/api/java/appeng/api/util/AECableType.java +++ b/src/api/java/appeng/api/util/AECableType.java @@ -47,15 +47,15 @@ public enum AECableType SMART, /** - * Dense Cable, represents a tier 2 block that can carry 32 channels. + * Smart Dense Cable, represents a tier 2 block that can carry 32 channels. */ - DENSE; + DENSE_SMART; public static final AECableType[] VALIDCABLES = { GLASS, COVERED, SMART, - DENSE + DENSE_SMART }; } diff --git a/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java index 119e67581..2aa93227e 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java @@ -101,8 +101,8 @@ class CableBuilder case SMART: textureFolder = "parts/cable/smart/"; break; - case DENSE: - textureFolder = "parts/cable/dense/"; + case DENSE_SMART: + textureFolder = "parts/cable/dense_smart/"; break; default: throw new IllegalStateException( "Cable type " + cableType + " does not support connections." ); @@ -127,8 +127,8 @@ class CableBuilder case SMART: addCableCore( CableCoreType.COVERED, color, quadsOut ); break; - case DENSE: - addCableCore( CableCoreType.DENSE, color, quadsOut ); + case DENSE_SMART: + addCableCore( CableCoreType.DENSE_SMART, color, quadsOut ); break; default: } @@ -149,7 +149,7 @@ class CableBuilder case COVERED: cubeBuilder.addCube( 5, 5, 5, 11, 11, 11 ); break; - case DENSE: + case DENSE_SMART: cubeBuilder.addCube( 3, 3, 3, 13, 13, 13 ); break; } @@ -456,7 +456,7 @@ class CableBuilder addSmartConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut ); return; } - else if( connectionType != AECableType.DENSE ) + else if( connectionType != AECableType.DENSE_SMART ) { addCoveredConnection( facing, cableColor, connectionType, cableBusAdjacent, quadsOut ); return; @@ -467,7 +467,7 @@ class CableBuilder // We render all faces except the one on the connection side cubeBuilder.setDrawFaces( EnumSet.complementOf( EnumSet.of( facing ) ) ); - TextureAtlasSprite texture = connectionTextures.get( AECableType.DENSE ).get( cableColor ); + TextureAtlasSprite texture = connectionTextures.get( AECableType.DENSE_SMART ).get( cableColor ); cubeBuilder.setTexture( texture ); addDenseCableSizedCube( facing, cubeBuilder ); @@ -499,7 +499,7 @@ class CableBuilder { CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut ); - TextureAtlasSprite texture = connectionTextures.get( AECableType.DENSE ).get( cableColor ); + TextureAtlasSprite texture = connectionTextures.get( AECableType.DENSE_SMART ).get( cableColor ); cubeBuilder.setTexture( texture ); setStraightCableUVs( cubeBuilder, facing, 5, 11 ); diff --git a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java index 8cf081073..3bb2613df 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java @@ -164,8 +164,8 @@ public class CableBusBakedModel implements IBakedModel { case GLASS: return firstType == AECableType.GLASS && secondType == AECableType.GLASS; - case DENSE: - return firstType == AECableType.DENSE && secondType == AECableType.DENSE; + case DENSE_SMART: + return firstType == AECableType.DENSE_SMART && secondType == AECableType.DENSE_SMART; } return true; @@ -200,7 +200,7 @@ public class CableBusBakedModel implements IBakedModel case SMART: cableBuilder.addStraightSmartConnection( facing, cableColor, renderState.getChannelsOnSide().get( facing ), quadsOut ); break; - case DENSE: + case DENSE_SMART: cableBuilder.addStraightDenseConnection( facing, cableColor, renderState.getChannelsOnSide().get( facing ), quadsOut ); break; } @@ -228,7 +228,7 @@ public class CableBusBakedModel implements IBakedModel case SMART: cableBuilder.addConstrainedSmartConnection( facing, cableColor, distance, channels, quadsOut ); break; - case DENSE: + case DENSE_SMART: // Dense cables do not render connections to parts since none can be attached break; } @@ -253,7 +253,7 @@ public class CableBusBakedModel implements IBakedModel case SMART: cableBuilder.addSmartConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut ); break; - case DENSE: + case DENSE_SMART: cableBuilder.addDenseConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut ); break; } diff --git a/src/main/java/appeng/client/render/cablebus/CableCoreType.java b/src/main/java/appeng/client/render/cablebus/CableCoreType.java index d30656364..33f3ed704 100644 --- a/src/main/java/appeng/client/render/cablebus/CableCoreType.java +++ b/src/main/java/appeng/client/render/cablebus/CableCoreType.java @@ -40,7 +40,7 @@ import appeng.core.AppEng; */ public enum CableCoreType { - GLASS( "parts/cable/core/glass" ), COVERED( "parts/cable/core/covered" ), DENSE( "parts/cable/core/dense" ); + GLASS( "parts/cable/core/glass" ), COVERED( "parts/cable/core/covered" ), DENSE_SMART( "parts/cable/core/dense_smart" ); private static final Map cableMapping = generateCableMapping(); @@ -55,7 +55,7 @@ public enum CableCoreType result.put( AECableType.GLASS, CableCoreType.GLASS ); result.put( AECableType.COVERED, CableCoreType.COVERED ); result.put( AECableType.SMART, CableCoreType.COVERED ); - result.put( AECableType.DENSE, CableCoreType.DENSE ); + result.put( AECableType.DENSE_SMART, CableCoreType.DENSE_SMART ); return ImmutableMap.copyOf( result ); } diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java index cdd85a5dc..d1f11edd9 100644 --- a/src/main/java/appeng/core/api/definitions/ApiItems.java +++ b/src/main/java/appeng/core/api/definitions/ApiItems.java @@ -198,10 +198,10 @@ public final class ApiItems implements IItems this.viewCell = registry.item( "view_cell", ItemViewCell::new ).features( AEFeature.VIEW_CELL ).build(); FeatureFactory storageCells = registry.features( AEFeature.STORAGE_CELLS ); - this.cell1k = storageCells.item( "storage_cell_1k", () -> new ItemBasicStorageCell( MaterialType.Cell1kPart, 1 ) ).build(); - this.cell4k = storageCells.item( "storage_cell_4k", () -> new ItemBasicStorageCell( MaterialType.Cell4kPart, 4 ) ).build(); - this.cell16k = storageCells.item( "storage_cell_16k", () -> new ItemBasicStorageCell( MaterialType.Cell16kPart, 16 ) ).build(); - this.cell64k = storageCells.item( "storage_cell_64k", () -> new ItemBasicStorageCell( MaterialType.Cell64kPart, 64 ) ).build(); + this.cell1k = storageCells.item( "storage_cell_1k", () -> new ItemBasicStorageCell( MaterialType.CELL1K_PART, 1 ) ).build(); + this.cell4k = storageCells.item( "storage_cell_4k", () -> new ItemBasicStorageCell( MaterialType.CELL4K_PART, 4 ) ).build(); + this.cell16k = storageCells.item( "storage_cell_16k", () -> new ItemBasicStorageCell( MaterialType.CELL16K_PART, 16 ) ).build(); + this.cell64k = storageCells.item( "storage_cell_64k", () -> new ItemBasicStorageCell( MaterialType.CELL64K_PART, 64 ) ).build(); FeatureFactory spatialCells = registry.features( AEFeature.SPATIAL_IO ); this.spatialCell2 = spatialCells.item( "spatial_storage_cell_2_cubed", () -> new ItemSpatialStorageCell( 2 ) ).build(); diff --git a/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java index 24d47be29..9e3265622 100644 --- a/src/main/java/appeng/core/api/definitions/ApiMaterials.java +++ b/src/main/java/appeng/core/api/definitions/ApiMaterials.java @@ -130,74 +130,74 @@ public final class ApiMaterials implements IMaterials } ) .build(); - this.cell2SpatialPart = new DamagedItemDefinition( "material.cell.spatial.2", materials.createMaterial( MaterialType.Cell2SpatialPart ) ); - this.cell16SpatialPart = new DamagedItemDefinition( "material.cell.spatial.16", materials.createMaterial( MaterialType.Cell16SpatialPart ) ); - this.cell128SpatialPart = new DamagedItemDefinition( "material.cell.spatial.128", materials.createMaterial( MaterialType.Cell128SpatialPart ) ); + this.cell2SpatialPart = new DamagedItemDefinition( "material.cell.spatial.2", materials.createMaterial( MaterialType.CELL2_SPATIAL_PART ) ); + this.cell16SpatialPart = new DamagedItemDefinition( "material.cell.spatial.16", materials.createMaterial( MaterialType.CELL16_SPATIAL_PART ) ); + this.cell128SpatialPart = new DamagedItemDefinition( "material.cell.spatial.128", materials.createMaterial( MaterialType.CELL128_SPATIAL_PART ) ); - this.silicon = new DamagedItemDefinition( "material.silicon", materials.createMaterial( MaterialType.Silicon ) ); - this.skyDust = new DamagedItemDefinition( "material.dust.sky_stone", materials.createMaterial( MaterialType.SkyDust ) ); + this.silicon = new DamagedItemDefinition( "material.silicon", materials.createMaterial( MaterialType.SILICON ) ); + this.skyDust = new DamagedItemDefinition( "material.dust.sky_stone", materials.createMaterial( MaterialType.SKY_DUST ) ); - this.calcProcessorPress = new DamagedItemDefinition( "material.press.processor.calculation", materials.createMaterial( MaterialType.CalcProcessorPress ) ); - this.engProcessorPress = new DamagedItemDefinition( "material.press.processor.engineering", materials.createMaterial( MaterialType.EngProcessorPress ) ); - this.logicProcessorPress = new DamagedItemDefinition( "material.press.processor.logic", materials.createMaterial( MaterialType.LogicProcessorPress ) ); - this.siliconPress = new DamagedItemDefinition( "material.press.silicon", materials.createMaterial( MaterialType.SiliconPress ) ); - this.namePress = new DamagedItemDefinition( "material.press.name", materials.createMaterial( MaterialType.NamePress ) ); + this.calcProcessorPress = new DamagedItemDefinition( "material.press.processor.calculation", materials.createMaterial( MaterialType.CALCULATION_PROCESSOR_PRESS ) ); + this.engProcessorPress = new DamagedItemDefinition( "material.press.processor.engineering", materials.createMaterial( MaterialType.ENGINEERING_PROCESSOR_PRESS ) ); + this.logicProcessorPress = new DamagedItemDefinition( "material.press.processor.logic", materials.createMaterial( MaterialType.LOGIC_PROCESSOR_PRESS ) ); + this.siliconPress = new DamagedItemDefinition( "material.press.silicon", materials.createMaterial( MaterialType.SILICON_PRESS ) ); + this.namePress = new DamagedItemDefinition( "material.press.name", materials.createMaterial( MaterialType.NAME_PRESS ) ); - this.calcProcessorPrint = new DamagedItemDefinition( "material.print.processor.calculation", materials.createMaterial( MaterialType.CalcProcessorPrint ) ); - this.engProcessorPrint = new DamagedItemDefinition( "material.print.processor.engineering", materials.createMaterial( MaterialType.EngProcessorPrint ) ); - this.logicProcessorPrint = new DamagedItemDefinition( "material.print.processor.logic", materials.createMaterial( MaterialType.LogicProcessorPrint ) ); - this.siliconPrint = new DamagedItemDefinition( "material.print.silicon", materials.createMaterial( MaterialType.SiliconPrint ) ); + this.calcProcessorPrint = new DamagedItemDefinition( "material.print.processor.calculation", materials.createMaterial( MaterialType.CALCULATION_PROCESSOR_PRINT ) ); + this.engProcessorPrint = new DamagedItemDefinition( "material.print.processor.engineering", materials.createMaterial( MaterialType.ENGINEERING_PROCESSOR_PRINT ) ); + this.logicProcessorPrint = new DamagedItemDefinition( "material.print.processor.logic", materials.createMaterial( MaterialType.LOGIC_PROCESSOR_PRINT ) ); + this.siliconPrint = new DamagedItemDefinition( "material.print.silicon", materials.createMaterial( MaterialType.SILICON_PRINT ) ); - this.logicProcessor = new DamagedItemDefinition( "material.processor.logic", materials.createMaterial( MaterialType.LogicProcessor ) ); - this.calcProcessor = new DamagedItemDefinition( "material.processor.calculation", materials.createMaterial( MaterialType.CalcProcessor ) ); - this.engProcessor = new DamagedItemDefinition( "material.processor.engineering", materials.createMaterial( MaterialType.EngProcessor ) ); + this.logicProcessor = new DamagedItemDefinition( "material.processor.logic", materials.createMaterial( MaterialType.LOGIC_PROCESSOR ) ); + this.calcProcessor = new DamagedItemDefinition( "material.processor.calculation", materials.createMaterial( MaterialType.CALCULATION_PROCESSOR ) ); + this.engProcessor = new DamagedItemDefinition( "material.processor.engineering", materials.createMaterial( MaterialType.ENGINEERING_PROCESSOR ) ); - this.basicCard = new DamagedItemDefinition( "material.card.basic", materials.createMaterial( MaterialType.BasicCard ) ); - this.advCard = new DamagedItemDefinition( "material.card.advanced", materials.createMaterial( MaterialType.AdvCard ) ); + this.basicCard = new DamagedItemDefinition( "material.card.basic", materials.createMaterial( MaterialType.BASIC_CARD ) ); + this.advCard = new DamagedItemDefinition( "material.card.advanced", materials.createMaterial( MaterialType.ADVANCED_CARD ) ); - this.purifiedCertusQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.certus.purified", materials.createMaterial( MaterialType.PurifiedCertusQuartzCrystal ) ); - this.purifiedNetherQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.nether.purified", materials.createMaterial( MaterialType.PurifiedNetherQuartzCrystal ) ); - this.purifiedFluixCrystal = new DamagedItemDefinition( "material.crystal.fluix.purified", materials.createMaterial( MaterialType.PurifiedFluixCrystal ) ); + this.purifiedCertusQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.certus.purified", materials.createMaterial( MaterialType.PURIFIED_CERTUS_QUARTZ_CRYSTAL ) ); + this.purifiedNetherQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.nether.purified", materials.createMaterial( MaterialType.PURIFIED_NETHER_QUARTZ_CRYSTAL ) ); + this.purifiedFluixCrystal = new DamagedItemDefinition( "material.crystal.fluix.purified", materials.createMaterial( MaterialType.PURIFIED_FLUIX_CRYSTAL ) ); - this.cell1kPart = new DamagedItemDefinition( "material.cell.storage.1k", materials.createMaterial( MaterialType.Cell1kPart ) ); - this.cell4kPart = new DamagedItemDefinition( "material.cell.storage.4k", materials.createMaterial( MaterialType.Cell4kPart ) ); - this.cell16kPart = new DamagedItemDefinition( "material.cell.storage.16k", materials.createMaterial( MaterialType.Cell16kPart ) ); - this.cell64kPart = new DamagedItemDefinition( "material.cell.storage.64k", materials.createMaterial( MaterialType.Cell64kPart ) ); - this.emptyStorageCell = new DamagedItemDefinition( "material.cell.storage.empty", materials.createMaterial( MaterialType.EmptyStorageCell ) ); + this.cell1kPart = new DamagedItemDefinition( "material.cell.storage.1k", materials.createMaterial( MaterialType.CELL1K_PART ) ); + this.cell4kPart = new DamagedItemDefinition( "material.cell.storage.4k", materials.createMaterial( MaterialType.CELL4K_PART ) ); + this.cell16kPart = new DamagedItemDefinition( "material.cell.storage.16k", materials.createMaterial( MaterialType.CELL16K_PART ) ); + this.cell64kPart = new DamagedItemDefinition( "material.cell.storage.64k", materials.createMaterial( MaterialType.CELL64K_PART ) ); + this.emptyStorageCell = new DamagedItemDefinition( "material.cell.storage.empty", materials.createMaterial( MaterialType.EMPTY_STORAGE_CELL ) ); - this.cardRedstone = new DamagedItemDefinition( "material.card.redstone", materials.createMaterial( MaterialType.CardRedstone ) ); - this.cardSpeed = new DamagedItemDefinition( "material.card.acceleration", materials.createMaterial( MaterialType.CardSpeed ) ); - this.cardCapacity = new DamagedItemDefinition( "material.card.capacity", materials.createMaterial( MaterialType.CardCapacity ) ); - this.cardFuzzy = new DamagedItemDefinition( "material.card.fuzzy", materials.createMaterial( MaterialType.CardFuzzy ) ); - this.cardInverter = new DamagedItemDefinition( "material.card.inverter", materials.createMaterial( MaterialType.CardInverter ) ); - this.cardCrafting = new DamagedItemDefinition( "material.card.crafting", materials.createMaterial( MaterialType.CardCrafting ) ); + this.cardRedstone = new DamagedItemDefinition( "material.card.redstone", materials.createMaterial( MaterialType.CARD_REDSTONE ) ); + this.cardSpeed = new DamagedItemDefinition( "material.card.acceleration", materials.createMaterial( MaterialType.CARD_SPEED ) ); + this.cardCapacity = new DamagedItemDefinition( "material.card.capacity", materials.createMaterial( MaterialType.CARD_CAPACITY ) ); + this.cardFuzzy = new DamagedItemDefinition( "material.card.fuzzy", materials.createMaterial( MaterialType.CARD_FUZZY ) ); + this.cardInverter = new DamagedItemDefinition( "material.card.inverter", materials.createMaterial( MaterialType.CARD_INVERTER ) ); + this.cardCrafting = new DamagedItemDefinition( "material.card.crafting", materials.createMaterial( MaterialType.CARD_CRAFTING ) ); - this.enderDust = new DamagedItemDefinition( "material.dust.ender", materials.createMaterial( MaterialType.EnderDust ) ); - this.flour = new DamagedItemDefinition( "material.flour", materials.createMaterial( MaterialType.Flour ) ); - this.goldDust = new DamagedItemDefinition( "material.dust.gold", materials.createMaterial( MaterialType.GoldDust ) ); - this.ironDust = new DamagedItemDefinition( "material.dust.iron", materials.createMaterial( MaterialType.IronDust ) ); - this.fluixDust = new DamagedItemDefinition( "material.dust.fluix", materials.createMaterial( MaterialType.FluixDust ) ); - this.certusQuartzDust = new DamagedItemDefinition( "material.dust.quartz.certus", materials.createMaterial( MaterialType.CertusQuartzDust ) ); - this.netherQuartzDust = new DamagedItemDefinition( "material.dust.quartz.nether", materials.createMaterial( MaterialType.NetherQuartzDust ) ); + this.enderDust = new DamagedItemDefinition( "material.dust.ender", materials.createMaterial( MaterialType.ENDER_DUST ) ); + this.flour = new DamagedItemDefinition( "material.flour", materials.createMaterial( MaterialType.FLOUR ) ); + this.goldDust = new DamagedItemDefinition( "material.dust.gold", materials.createMaterial( MaterialType.GOLD_DUST ) ); + this.ironDust = new DamagedItemDefinition( "material.dust.iron", materials.createMaterial( MaterialType.IRON_DUST ) ); + this.fluixDust = new DamagedItemDefinition( "material.dust.fluix", materials.createMaterial( MaterialType.FLUIX_DUST ) ); + this.certusQuartzDust = new DamagedItemDefinition( "material.dust.quartz.certus", materials.createMaterial( MaterialType.CERTUS_QUARTZ_DUST ) ); + this.netherQuartzDust = new DamagedItemDefinition( "material.dust.quartz.nether", materials.createMaterial( MaterialType.NETHER_QUARTZ_DUST ) ); - this.matterBall = new DamagedItemDefinition( "material.ammo.matter_ball", materials.createMaterial( MaterialType.MatterBall ) ); + this.matterBall = new DamagedItemDefinition( "material.ammo.matter_ball", materials.createMaterial( MaterialType.MATTER_BALL ) ); - this.certusQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.certus", materials.createMaterial( MaterialType.CertusQuartzCrystal ) ); - this.certusQuartzCrystalCharged = new DamagedItemDefinition( "material.crystal.quartz.certus.charged", materials.createMaterial( MaterialType.CertusQuartzCrystalCharged ) ); - this.fluixCrystal = new DamagedItemDefinition( "material.crystal.fluix", materials.createMaterial( MaterialType.FluixCrystal ) ); - this.fluixPearl = new DamagedItemDefinition( "material.pearl.fluix", materials.createMaterial( MaterialType.FluixPearl ) ); + this.certusQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.certus", materials.createMaterial( MaterialType.CERTUS_QUARTZ_CRYSTAL ) ); + this.certusQuartzCrystalCharged = new DamagedItemDefinition( "material.crystal.quartz.certus.charged", materials.createMaterial( MaterialType.CERTUS_QUARTZ_CRYSTAL_CHARGED ) ); + this.fluixCrystal = new DamagedItemDefinition( "material.crystal.fluix", materials.createMaterial( MaterialType.FLUIX_CRYSTAL ) ); + this.fluixPearl = new DamagedItemDefinition( "material.pearl.fluix", materials.createMaterial( MaterialType.FLUIX_PEARL ) ); - this.woodenGear = new DamagedItemDefinition( "material.gear.wooden", materials.createMaterial( MaterialType.WoodenGear ) ); + this.woodenGear = new DamagedItemDefinition( "material.gear.wooden", materials.createMaterial( MaterialType.WOODEN_GEAR ) ); - this.wirelessReceiver = new DamagedItemDefinition( "material.wireless.receiver", materials.createMaterial( MaterialType.Wireless ) ); - this.wirelessBooster = new DamagedItemDefinition( "material.wireless.booster", materials.createMaterial( MaterialType.WirelessBooster ) ); + this.wirelessReceiver = new DamagedItemDefinition( "material.wireless.receiver", materials.createMaterial( MaterialType.WIRELESS ) ); + this.wirelessBooster = new DamagedItemDefinition( "material.wireless.booster", materials.createMaterial( MaterialType.WIRELESS_BOOSTER ) ); - this.annihilationCore = new DamagedItemDefinition( "material.core.annihilation", materials.createMaterial( MaterialType.AnnihilationCore ) ); - this.formationCore = new DamagedItemDefinition( "material.core.formation", materials.createMaterial( MaterialType.FormationCore ) ); + this.annihilationCore = new DamagedItemDefinition( "material.core.annihilation", materials.createMaterial( MaterialType.ANNIHILATION_CORE ) ); + this.formationCore = new DamagedItemDefinition( "material.core.formation", materials.createMaterial( MaterialType.FORMATION_CORE ) ); - this.singularity = new DamagedItemDefinition( "material.singularity", materials.createMaterial( MaterialType.Singularity ) ); - this.qESingularity = new DamagedItemDefinition( "material.singularity.entangled.quantum", materials.createMaterial( MaterialType.QESingularity ) ); - this.blankPattern = new DamagedItemDefinition( "material.pattern.blank", materials.createMaterial( MaterialType.BlankPattern ) ); + this.singularity = new DamagedItemDefinition( "material.singularity", materials.createMaterial( MaterialType.SINGULARITY ) ); + this.qESingularity = new DamagedItemDefinition( "material.singularity.entangled.quantum", materials.createMaterial( MaterialType.QUANTUM_ENTANGLED_SINGULARITY ) ); + this.blankPattern = new DamagedItemDefinition( "material.pattern.blank", materials.createMaterial( MaterialType.BLANK_PATTERN ) ); } @Override diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index c2e4f4832..42e0cfa2d 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -91,45 +91,45 @@ public final class ApiParts implements IParts partModels.registerModels( partType.getModels() ); } - this.cableSmart = constructColoredDefinition( itemPart, PartType.CableSmart ); - this.cableCovered = constructColoredDefinition( itemPart, PartType.CableCovered ); - this.cableGlass = constructColoredDefinition( itemPart, PartType.CableGlass ); - this.cableDense = constructColoredDefinition( itemPart, PartType.CableDense ); + this.cableSmart = constructColoredDefinition( itemPart, PartType.CABLE_SMART ); + this.cableCovered = constructColoredDefinition( itemPart, PartType.CABLE_COVERED ); + this.cableGlass = constructColoredDefinition( itemPart, PartType.CABLE_GLASS ); + this.cableDense = constructColoredDefinition( itemPart, PartType.CABLE_DENSE_SMART ); // this.lumenCableSmart = Optional.absent(); // has yet to be implemented, no PartType defined for it yet // this.lumenCableCovered = Optional.absent(); // has yet to be implemented, no PartType defined for it yet // this.lumenCableGlass = Optional.absent(); // has yet to be implemented, no PartType defined for it yet // this.lumenCableDense = Optional.absent(); // has yet to be implemented, no PartType defined for it yet - this.quartzFiber = new DamagedItemDefinition( "part.quartz_fiber", itemPart.createPart( PartType.QuartzFiber ) ); - this.toggleBus = new DamagedItemDefinition( "part.toggle_bus", itemPart.createPart( PartType.ToggleBus ) ); - this.invertedToggleBus = new DamagedItemDefinition( "part.toggle_bus.inverted", itemPart.createPart( PartType.InvertedToggleBus ) ); - this.storageBus = new DamagedItemDefinition( "part.bus.storage", itemPart.createPart( PartType.StorageBus ) ); - this.importBus = new DamagedItemDefinition( "part.bus.import", itemPart.createPart( PartType.ImportBus ) ); - this.exportBus = new DamagedItemDefinition( "part.bus.export", itemPart.createPart( PartType.ExportBus ) ); - this.iface = new DamagedItemDefinition( "part.interface", itemPart.createPart( PartType.Interface ) ); - this.levelEmitter = new DamagedItemDefinition( "part.level_emitter", itemPart.createPart( PartType.LevelEmitter ) ); - this.annihilationPlane = new DamagedItemDefinition( "part.plane.annihilation", itemPart.createPart( PartType.AnnihilationPlane ) ); - this.identityAnnihilationPlane = new DamagedItemDefinition( "part.plane.annihiliation.identity", itemPart.createPart( PartType.IdentityAnnihilationPlane ) ); - this.formationPlane = new DamagedItemDefinition( "part.plane.formation", itemPart.createPart( PartType.FormationPlane ) ); - this.p2PTunnelME = new DamagedItemDefinition( "part.tunnel.me", itemPart.createPart( PartType.P2PTunnelME ) ); - this.p2PTunnelRedstone = new DamagedItemDefinition( "part.tunnel.redstone", itemPart.createPart( PartType.P2PTunnelRedstone ) ); - this.p2PTunnelItems = new DamagedItemDefinition( "part.tunnel.item", itemPart.createPart( PartType.P2PTunnelItems ) ); - this.p2PTunnelFluids = new DamagedItemDefinition( "part.tunnel.fluid", itemPart.createPart( PartType.P2PTunnelFluids ) ); - this.p2PTunnelEU = new DamagedItemDefinition( "part.tunnel.eu", itemPart.createPart( PartType.P2PTunnelEU ) ); - this.p2PTunnelRF = new DamagedItemDefinition( "part.tunnel.rf", itemPart.createPart( PartType.P2PTunnelRF ) ); - this.p2PTunnelFE = new DamagedItemDefinition( "part.tunnel.fe", itemPart.createPart( PartType.P2PTunnelFE ) ); - this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemPart.createPart( PartType.P2PTunnelLight ) ); + this.quartzFiber = new DamagedItemDefinition( "part.quartz_fiber", itemPart.createPart( PartType.QUARTZ_FIBER ) ); + this.toggleBus = new DamagedItemDefinition( "part.toggle_bus", itemPart.createPart( PartType.TOGGLE_BUS ) ); + this.invertedToggleBus = new DamagedItemDefinition( "part.toggle_bus.inverted", itemPart.createPart( PartType.INVERTED_TOGGLE_BUS ) ); + this.storageBus = new DamagedItemDefinition( "part.bus.storage", itemPart.createPart( PartType.STORAGE_BUS ) ); + this.importBus = new DamagedItemDefinition( "part.bus.import", itemPart.createPart( PartType.IMPORT_BUS ) ); + this.exportBus = new DamagedItemDefinition( "part.bus.export", itemPart.createPart( PartType.EXPORT_BUS ) ); + this.iface = new DamagedItemDefinition( "part.interface", itemPart.createPart( PartType.INTERFACE ) ); + this.levelEmitter = new DamagedItemDefinition( "part.level_emitter", itemPart.createPart( PartType.LEVEL_EMITTER ) ); + this.annihilationPlane = new DamagedItemDefinition( "part.plane.annihilation", itemPart.createPart( PartType.ANNIHILATION_PLANE ) ); + this.identityAnnihilationPlane = new DamagedItemDefinition( "part.plane.annihiliation.identity", itemPart.createPart( PartType.IDENTITY_ANNIHILATION_PLANE ) ); + this.formationPlane = new DamagedItemDefinition( "part.plane.formation", itemPart.createPart( PartType.FORMATION_PLANE ) ); + this.p2PTunnelME = new DamagedItemDefinition( "part.tunnel.me", itemPart.createPart( PartType.P2P_TUNNEL_ME ) ); + this.p2PTunnelRedstone = new DamagedItemDefinition( "part.tunnel.redstone", itemPart.createPart( PartType.P2P_TUNNEL_REDSTONE ) ); + this.p2PTunnelItems = new DamagedItemDefinition( "part.tunnel.item", itemPart.createPart( PartType.P2P_TUNNEL_ITEMS ) ); + this.p2PTunnelFluids = new DamagedItemDefinition( "part.tunnel.fluid", itemPart.createPart( PartType.P2P_TUNNEL_FLUIDS ) ); + this.p2PTunnelEU = new DamagedItemDefinition( "part.tunnel.eu", itemPart.createPart( PartType.P2P_TUNNEL_IC2 ) ); + this.p2PTunnelRF = new DamagedItemDefinition( "part.tunnel.rf", itemPart.createPart( PartType.P2P_TUNNEL_RF ) ); + this.p2PTunnelFE = new DamagedItemDefinition( "part.tunnel.fe", itemPart.createPart( PartType.P2P_TUNNEL_FE ) ); + this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemPart.createPart( PartType.P2P_TUNNEL_LIGHT ) ); // this.p2PTunnelOpenComputers = new DamagedItemDefinition( itemMultiPart.createPart( // PartType.P2PTunnelOpenComputers ) ); - this.cableAnchor = new DamagedItemDefinition( "part.cable_anchor", itemPart.createPart( PartType.CableAnchor ) ); - this.monitor = new DamagedItemDefinition( "part.monitor", itemPart.createPart( PartType.Monitor ) ); - this.semiDarkMonitor = new DamagedItemDefinition( "part.monitor.semi_dark", itemPart.createPart( PartType.SemiDarkMonitor ) ); - this.darkMonitor = new DamagedItemDefinition( "part.monitor.dark", itemPart.createPart( PartType.DarkMonitor ) ); - this.interfaceTerminal = new DamagedItemDefinition( "part.terminal.interface", itemPart.createPart( PartType.InterfaceTerminal ) ); - this.patternTerminal = new DamagedItemDefinition( "part.terminal.pattern", itemPart.createPart( PartType.PatternTerminal ) ); - this.craftingTerminal = new DamagedItemDefinition( "part.terminal.crafting", itemPart.createPart( PartType.CraftingTerminal ) ); - this.terminal = new DamagedItemDefinition( "part.terminal", itemPart.createPart( PartType.Terminal ) ); - this.storageMonitor = new DamagedItemDefinition( "part.monitor.storage", itemPart.createPart( PartType.StorageMonitor ) ); - this.conversionMonitor = new DamagedItemDefinition( "part.monitor.conversion", itemPart.createPart( PartType.ConversionMonitor ) ); + this.cableAnchor = new DamagedItemDefinition( "part.cable_anchor", itemPart.createPart( PartType.CABLE_ANCHOR ) ); + this.monitor = new DamagedItemDefinition( "part.monitor", itemPart.createPart( PartType.MONITOR ) ); + this.semiDarkMonitor = new DamagedItemDefinition( "part.monitor.semi_dark", itemPart.createPart( PartType.SEMI_DARK_MONITOR ) ); + this.darkMonitor = new DamagedItemDefinition( "part.monitor.dark", itemPart.createPart( PartType.DARK_MONITOR ) ); + this.interfaceTerminal = new DamagedItemDefinition( "part.terminal.interface", itemPart.createPart( PartType.INTERFACE_TERMINAL ) ); + this.patternTerminal = new DamagedItemDefinition( "part.terminal.pattern", itemPart.createPart( PartType.PATTERN_TERMINAL ) ); + this.craftingTerminal = new DamagedItemDefinition( "part.terminal.crafting", itemPart.createPart( PartType.CRAFTING_TERMINAL ) ); + this.terminal = new DamagedItemDefinition( "part.terminal", itemPart.createPart( PartType.TERMINAL ) ); + this.storageMonitor = new DamagedItemDefinition( "part.monitor.storage", itemPart.createPart( PartType.STORAGE_MONITOR ) ); + this.conversionMonitor = new DamagedItemDefinition( "part.monitor.conversion", itemPart.createPart( PartType.CONVERSION_MONITOR ) ); } private static AEColoredItemDefinition constructColoredDefinition( final ItemPart target, final PartType type ) diff --git a/src/main/java/appeng/items/materials/ItemMaterial.java b/src/main/java/appeng/items/materials/ItemMaterial.java index 508f36198..434ca50eb 100644 --- a/src/main/java/appeng/items/materials/ItemMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMaterial.java @@ -96,7 +96,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, return; } - if( mt == MaterialType.NamePress ) + if( mt == MaterialType.NAME_PRESS ) { final NBTTagCompound c = Platform.openNbtData( stack ); lines.add( c.getString( "InscribeName" ) ); @@ -143,7 +143,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, public MaterialType getTypeByStack( final ItemStack is ) { MaterialType type = this.dmgToMaterial.get( is.getItemDamage() ); - return ( type != null ) ? type : MaterialType.InvalidType; + return ( type != null ) ? type : MaterialType.INVALID_TYPE; } @Override @@ -151,17 +151,17 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, { switch( this.getTypeByStack( itemstack ) ) { - case CardCapacity: + case CARD_CAPACITY: return Upgrades.CAPACITY; - case CardFuzzy: + case CARD_FUZZY: return Upgrades.FUZZY; - case CardRedstone: + case CARD_REDSTONE: return Upgrades.REDSTONE; - case CardSpeed: + case CARD_SPEED: return Upgrades.SPEED; - case CardInverter: + case CARD_INVERTER: return Upgrades.INVERTER; - case CardCrafting: + case CARD_CRAFTING: return Upgrades.CRAFTING; default: return null; @@ -257,7 +257,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, @Override public String getUnlocalizedName( final ItemStack is ) { - return "item.appliedenergistics2.material." + this.nameOf( is ); + return "item.appliedenergistics2.material." + this.nameOf( is ).toLowerCase(); } @Override @@ -384,13 +384,13 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, { switch( this.getTypeByStack( is ) ) { - case Cell1kPart: + case CELL1K_PART: return KILO_SCALAR; - case Cell4kPart: + case CELL4K_PART: return KILO_SCALAR * 4; - case Cell16kPart: + case CELL16K_PART: return KILO_SCALAR * 16; - case Cell64kPart: + case CELL64K_PART: return KILO_SCALAR * 64; default: } @@ -402,10 +402,10 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, { switch( this.getTypeByStack( is ) ) { - case Cell1kPart: - case Cell4kPart: - case Cell16kPart: - case Cell64kPart: + case CELL1K_PART: + case CELL4K_PART: + case CELL16K_PART: + case CELL64K_PART: return true; default: } diff --git a/src/main/java/appeng/items/materials/MaterialType.java b/src/main/java/appeng/items/materials/MaterialType.java index 218609442..675513596 100644 --- a/src/main/java/appeng/items/materials/MaterialType.java +++ b/src/main/java/appeng/items/materials/MaterialType.java @@ -39,82 +39,82 @@ import appeng.entity.EntitySingularity; public enum MaterialType { - InvalidType( -1, "material_invalid_type" ), + INVALID_TYPE( -1, "material_invalid_type" ), - CertusQuartzCrystal( 0, "material_certus_quartz_crystal", EnumSet.of( AEFeature.CERTUS ), "crystalCertusQuartz" ), - CertusQuartzCrystalCharged( 1, "material_certus_quartz_crystal_charged", EnumSet.of( AEFeature.CERTUS ), EntityChargedQuartz.class ), + CERTUS_QUARTZ_CRYSTAL( 0, "material_certus_quartz_crystal", EnumSet.of( AEFeature.CERTUS ), "crystalCertusQuartz" ), + CERTUS_QUARTZ_CRYSTAL_CHARGED( 1, "material_certus_quartz_crystal_charged", EnumSet.of( AEFeature.CERTUS ), EntityChargedQuartz.class ), - CertusQuartzDust( 2, "material_certus_quartz_dust", EnumSet.of( AEFeature.DUSTS, AEFeature.CERTUS ), "dustCertusQuartz" ), - NetherQuartzDust( 3, "material_nether_quartz_dust", EnumSet.of( AEFeature.DUSTS ), "dustNetherQuartz" ), - Flour( 4, "material_flour", EnumSet.of( AEFeature.FLOUR ), "dustWheat" ), - GoldDust( 51, "material_gold_dust", EnumSet.of( AEFeature.DUSTS ), "dustGold" ), - IronDust( 49, "material_iron_dust", EnumSet.of( AEFeature.DUSTS ), "dustIron" ), + CERTUS_QUARTZ_DUST( 2, "material_certus_quartz_dust", EnumSet.of( AEFeature.DUSTS, AEFeature.CERTUS ), "dustCertusQuartz" ), + NETHER_QUARTZ_DUST( 3, "material_nether_quartz_dust", EnumSet.of( AEFeature.DUSTS ), "dustNetherQuartz" ), + FLOUR( 4, "material_flour", EnumSet.of( AEFeature.FLOUR ), "dustWheat" ), + GOLD_DUST( 51, "material_gold_dust", EnumSet.of( AEFeature.DUSTS ), "dustGold" ), + IRON_DUST( 49, "material_iron_dust", EnumSet.of( AEFeature.DUSTS ), "dustIron" ), - Silicon( 5, "material_silicon", EnumSet.of( AEFeature.SILICON ), "itemSilicon" ), - MatterBall( 6, "material_matter_ball", EnumSet.of( AEFeature.MATTER_BALL ) ), + SILICON( 5, "material_silicon", EnumSet.of( AEFeature.SILICON ), "itemSilicon" ), + MATTER_BALL( 6, "material_matter_ball", EnumSet.of( AEFeature.MATTER_BALL ) ), - FluixCrystal( 7, "material_fluix_crystal", EnumSet.of( AEFeature.FLUIX ), "crystalFluix" ), - FluixDust( 8, "material_fluix_dust", EnumSet.of( AEFeature.FLUIX, AEFeature.DUSTS ), "dustFluix" ), - FluixPearl( 9, "material_fluix_pearl", EnumSet.of( AEFeature.FLUIX ), "pearlFluix" ), + FLUIX_CRYSTAL( 7, "material_fluix_crystal", EnumSet.of( AEFeature.FLUIX ), "crystalFluix" ), + FLUIX_DUST( 8, "material_fluix_dust", EnumSet.of( AEFeature.FLUIX, AEFeature.DUSTS ), "dustFluix" ), + FLUIX_PEARL( 9, "material_fluix_pearl", EnumSet.of( AEFeature.FLUIX ), "pearlFluix" ), - PurifiedCertusQuartzCrystal( 10, "material_purified_certus_quartz_crystal", EnumSet.of( AEFeature.CERTUS, AEFeature.PURE_CRYSTALS ) ), - PurifiedNetherQuartzCrystal( 11, "material_purified_nether_quartz_crystal", EnumSet.of( AEFeature.PURE_CRYSTALS ) ), - PurifiedFluixCrystal( 12, "material_purified_fluix_crystal", EnumSet.of( AEFeature.FLUIX, AEFeature.PURE_CRYSTALS ) ), + PURIFIED_CERTUS_QUARTZ_CRYSTAL( 10, "material_purified_certus_quartz_crystal", EnumSet.of( AEFeature.CERTUS, AEFeature.PURE_CRYSTALS ) ), + PURIFIED_NETHER_QUARTZ_CRYSTAL( 11, "material_purified_nether_quartz_crystal", EnumSet.of( AEFeature.PURE_CRYSTALS ) ), + PURIFIED_FLUIX_CRYSTAL( 12, "material_purified_fluix_crystal", EnumSet.of( AEFeature.FLUIX, AEFeature.PURE_CRYSTALS ) ), - CalcProcessorPress( 13, "material_calc_processor_press", EnumSet.of( AEFeature.PRESSES ) ), - EngProcessorPress( 14, "material_eng_processor_press", EnumSet.of( AEFeature.PRESSES ) ), - LogicProcessorPress( 15, "material_logic_processor_press", EnumSet.of( AEFeature.PRESSES ) ), + CALCULATION_PROCESSOR_PRESS( 13, "material_calculation_processor_press", EnumSet.of( AEFeature.PRESSES ) ), + ENGINEERING_PROCESSOR_PRESS( 14, "material_engineering_processor_press", EnumSet.of( AEFeature.PRESSES ) ), + LOGIC_PROCESSOR_PRESS( 15, "material_logic_processor_press", EnumSet.of( AEFeature.PRESSES ) ), - CalcProcessorPrint( 16, "material_calc_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ), - EngProcessorPrint( 17, "material_eng_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ), - LogicProcessorPrint( 18, "material_logic_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ), + CALCULATION_PROCESSOR_PRINT( 16, "material_calculation_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ), + ENGINEERING_PROCESSOR_PRINT( 17, "material_engineering_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ), + LOGIC_PROCESSOR_PRINT( 18, "material_logic_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ), - SiliconPress( 19, "material_silicon_press", EnumSet.of( AEFeature.PRESSES ) ), - SiliconPrint( 20, "material_silicon_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ), + SILICON_PRESS( 19, "material_silicon_press", EnumSet.of( AEFeature.PRESSES ) ), + SILICON_PRINT( 20, "material_silicon_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ), - NamePress( 21, "material_name_press", EnumSet.of( AEFeature.PRESSES ) ), + NAME_PRESS( 21, "material_name_press", EnumSet.of( AEFeature.PRESSES ) ), - LogicProcessor( 22, "material_logic_processor", EnumSet.of( AEFeature.PROCESSORS ) ), - CalcProcessor( 23, "material_calc_processor", EnumSet.of( AEFeature.PROCESSORS ) ), - EngProcessor( 24, "material_eng_processor", EnumSet.of( AEFeature.PROCESSORS ) ), + LOGIC_PROCESSOR( 22, "material_logic_processor", EnumSet.of( AEFeature.PROCESSORS ) ), + CALCULATION_PROCESSOR( 23, "material_calculation_processor", EnumSet.of( AEFeature.PROCESSORS ) ), + ENGINEERING_PROCESSOR( 24, "material_engineering_processor", EnumSet.of( AEFeature.PROCESSORS ) ), // Basic Cards - BasicCard( 25, "material_basic_card", EnumSet.of( AEFeature.BASIC_CARDS ) ), - CardRedstone( 26, "material_card_redstone", EnumSet.of( AEFeature.BASIC_CARDS ) ), - CardCapacity( 27, "material_card_capacity", EnumSet.of( AEFeature.BASIC_CARDS ) ), + BASIC_CARD( 25, "material_basic_card", EnumSet.of( AEFeature.BASIC_CARDS ) ), + CARD_REDSTONE( 26, "material_card_redstone", EnumSet.of( AEFeature.BASIC_CARDS ) ), + CARD_CAPACITY( 27, "material_card_capacity", EnumSet.of( AEFeature.BASIC_CARDS ) ), // Adv Cards - AdvCard( 28, "material_adv_card", EnumSet.of( AEFeature.ADVANCED_CARDS ) ), - CardFuzzy( 29, "material_card_fuzzy", EnumSet.of( AEFeature.ADVANCED_CARDS ) ), - CardSpeed( 30, "material_card_speed", EnumSet.of( AEFeature.ADVANCED_CARDS ) ), - CardInverter( 31, "material_card_inverter", EnumSet.of( AEFeature.ADVANCED_CARDS ) ), + ADVANCED_CARD( 28, "material_advanced_card", EnumSet.of( AEFeature.ADVANCED_CARDS ) ), + CARD_FUZZY( 29, "material_card_fuzzy", EnumSet.of( AEFeature.ADVANCED_CARDS ) ), + CARD_SPEED( 30, "material_card_speed", EnumSet.of( AEFeature.ADVANCED_CARDS ) ), + CARD_INVERTER( 31, "material_card_inverter", EnumSet.of( AEFeature.ADVANCED_CARDS ) ), - Cell2SpatialPart( 32, "material_cell2_spatial_part", EnumSet.of( AEFeature.SPATIAL_IO ) ), - Cell16SpatialPart( 33, "material_cell16_spatial_part", EnumSet.of( AEFeature.SPATIAL_IO ) ), - Cell128SpatialPart( 34, "material_cell128_spatial_part", EnumSet.of( AEFeature.SPATIAL_IO ) ), + CELL2_SPATIAL_PART( 32, "material_cell2_spatial_part", EnumSet.of( AEFeature.SPATIAL_IO ) ), + CELL16_SPATIAL_PART( 33, "material_cell16_spatial_part", EnumSet.of( AEFeature.SPATIAL_IO ) ), + CELL128_SPATIAL_PART( 34, "material_cell128_spatial_part", EnumSet.of( AEFeature.SPATIAL_IO ) ), - Cell1kPart( 35, "material_cell1k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ), - Cell4kPart( 36, "material_cell4k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ), - Cell16kPart( 37, "material_cell16k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ), - Cell64kPart( 38, "material_cell64k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ), - EmptyStorageCell( 39, "material_empty_storage_cell", EnumSet.of( AEFeature.STORAGE_CELLS ) ), + CELL1K_PART( 35, "material_cell1k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ), + CELL4K_PART( 36, "material_cell4k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ), + CELL16K_PART( 37, "material_cell16k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ), + CELL64K_PART( 38, "material_cell64k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ), + EMPTY_STORAGE_CELL( 39, "material_empty_storage_cell", EnumSet.of( AEFeature.STORAGE_CELLS ) ), - WoodenGear( 40, "material_wooden_gear", EnumSet.of( AEFeature.GRIND_STONE ), "gearWood" ), + WOODEN_GEAR( 40, "material_wooden_gear", EnumSet.of( AEFeature.GRIND_STONE ), "gearWood" ), - Wireless( 41, "material_wireless", EnumSet.of( AEFeature.WIRELESS_ACCESS_TERMINAL ) ), - WirelessBooster( 42, "material_wireless_booster", EnumSet.of( AEFeature.WIRELESS_ACCESS_TERMINAL ) ), + WIRELESS( 41, "material_wireless", EnumSet.of( AEFeature.WIRELESS_ACCESS_TERMINAL ) ), + WIRELESS_BOOSTER( 42, "material_wireless_booster", EnumSet.of( AEFeature.WIRELESS_ACCESS_TERMINAL ) ), - FormationCore( 43, "material_formation_core", EnumSet.of( AEFeature.CORES ) ), - AnnihilationCore( 44, "material_annihilation_core", EnumSet.of( AEFeature.CORES ) ), + FORMATION_CORE( 43, "material_formation_core", EnumSet.of( AEFeature.CORES ) ), + ANNIHILATION_CORE( 44, "material_annihilation_core", EnumSet.of( AEFeature.CORES ) ), - SkyDust( 45, "material_sky_dust", EnumSet.of( AEFeature.DUSTS ) ), + SKY_DUST( 45, "material_sky_dust", EnumSet.of( AEFeature.DUSTS ) ), - EnderDust( 46, "material_ender_dust", EnumSet.of( AEFeature.QUANTUM_NETWORK_BRIDGE ), "dustEnder,dustEnderPearl", EntitySingularity.class ), - Singularity( 47, "material_singularity", EnumSet.of( AEFeature.QUANTUM_NETWORK_BRIDGE ), EntitySingularity.class ), - QESingularity( 48, "material_qesingularity", EnumSet.of( AEFeature.QUANTUM_NETWORK_BRIDGE ), EntitySingularity.class ), + ENDER_DUST( 46, "material_ender_dust", EnumSet.of( AEFeature.QUANTUM_NETWORK_BRIDGE ), "dustEnder,dustEnderPearl", EntitySingularity.class ), + SINGULARITY( 47, "material_singularity", EnumSet.of( AEFeature.QUANTUM_NETWORK_BRIDGE ), EntitySingularity.class ), + QUANTUM_ENTANGLED_SINGULARITY( 48, "material_quantum_entangled_singularity", EnumSet.of( AEFeature.QUANTUM_NETWORK_BRIDGE ), EntitySingularity.class ), - BlankPattern( 52, "material_blank_pattern", EnumSet.of( AEFeature.PATTERNS ) ), - CardCrafting( 53, "material_card_crafting", EnumSet.of( AEFeature.ADVANCED_CARDS, AEFeature.CRAFTING_CPU ) ); + BLANK_PATTERN( 52, "material_blank_pattern", EnumSet.of( AEFeature.PATTERNS ) ), + CARD_CRAFTING( 53, "material_card_crafting", EnumSet.of( AEFeature.ADVANCED_CARDS, AEFeature.CRAFTING_CPU ) ); private final Set features; private final ModelResourceLocation model; diff --git a/src/main/java/appeng/items/parts/ItemPart.java b/src/main/java/appeng/items/parts/ItemPart.java index 1a29a7f74..f7faede94 100644 --- a/src/main/java/appeng/items/parts/ItemPart.java +++ b/src/main/java/appeng/items/parts/ItemPart.java @@ -36,7 +36,6 @@ import com.google.common.base.Preconditions; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -155,7 +154,7 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup @Override public EnumActionResult onItemUse( final EntityPlayer player, final World w, final BlockPos pos, final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { - if( this.getTypeByStack( player.getHeldItem(hand) ) == PartType.InvalidType ) + if( this.getTypeByStack( player.getHeldItem(hand) ) == PartType.INVALID_TYPE ) { return EnumActionResult.FAIL; } @@ -167,7 +166,7 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup public String getUnlocalizedName( final ItemStack is ) { Preconditions.checkNotNull( is ); - return "item.appliedenergistics2.multi_part." + getTypeByStack( is ).getUnlocalizedName(); + return "item.appliedenergistics2.multi_part." + getTypeByStack( is ).getUnlocalizedName().toLowerCase(); } @Override @@ -218,7 +217,7 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup return pt.part; } - return PartType.InvalidType; + return PartType.INVALID_TYPE; } @Nullable @@ -287,14 +286,14 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup final PartType pt = this.getTypeByStack( stack ); switch( pt ) { - case ImportBus: + case IMPORT_BUS: importBus = true; if( u == pt ) { group = true; } break; - case ExportBus: + case EXPORT_BUS: exportBus = true; if( u == pt ) { diff --git a/src/main/java/appeng/items/parts/ItemPartRendering.java b/src/main/java/appeng/items/parts/ItemPartRendering.java index 878ac932f..a60d361cb 100644 --- a/src/main/java/appeng/items/parts/ItemPartRendering.java +++ b/src/main/java/appeng/items/parts/ItemPartRendering.java @@ -64,7 +64,7 @@ public class ItemPartRendering extends ItemRenderingCustomizer // Register all item models as variants so they get loaded rendering.variants( Arrays.stream( PartType.values() ) - .filter( f -> f != PartType.InvalidType ) + .filter( f -> f != PartType.INVALID_TYPE ) .flatMap( part -> part.getItemModels().stream() ) .collect( Collectors.toList() ) ); diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index 10d9fcb87..155b8a9c6 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -75,9 +75,9 @@ import appeng.util.Platform; public enum PartType { - InvalidType( -1, "invalid", EnumSet.of( AEFeature.CORE ), EnumSet.noneOf( IntegrationType.class ), null ), + INVALID_TYPE( -1, "invalid", EnumSet.of( AEFeature.CORE ), EnumSet.noneOf( IntegrationType.class ), null ), - CableGlass( 0, "cable_glass", EnumSet.of( AEFeature.GLASS_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableGlass.class ) + CABLE_GLASS( 0, "cable_glass", EnumSet.of( AEFeature.GLASS_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableGlass.class ) { @Override public boolean isCable() @@ -95,7 +95,7 @@ public enum PartType } }, - CableCovered( 20, "cable_covered", EnumSet.of( AEFeature.COVERED_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableCovered.class ) + CABLE_COVERED( 20, "cable_covered", EnumSet.of( AEFeature.COVERED_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableCovered.class ) { @Override public boolean isCable() @@ -113,7 +113,7 @@ public enum PartType } }, - CableSmart( 40, "cable_smart", EnumSet.of( AEFeature.CHANNELS, AEFeature.SMART_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableSmart.class ) + CABLE_SMART( 40, "cable_smart", EnumSet.of( AEFeature.CHANNELS, AEFeature.SMART_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableSmart.class ) { @Override public boolean isCable() @@ -131,7 +131,7 @@ public enum PartType } }, - CableDense( 60, "cable_dense", EnumSet.of( AEFeature.CHANNELS, AEFeature.DENSE_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartDenseCable.class ) + CABLE_DENSE_SMART( 60, "cable_dense_smart", EnumSet.of( AEFeature.CHANNELS, AEFeature.DENSE_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartDenseCable.class ) { @Override public boolean isCable() @@ -149,50 +149,50 @@ public enum PartType } }, - ToggleBus( 80, "toggle_bus", EnumSet.of( AEFeature.TOGGLE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartToggleBus.class ), + TOGGLE_BUS( 80, "toggle_bus", EnumSet.of( AEFeature.TOGGLE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartToggleBus.class ), - InvertedToggleBus( 100, "inverted_toggle_bus", EnumSet.of( AEFeature.TOGGLE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartInvertedToggleBus.class ), + INVERTED_TOGGLE_BUS( 100, "inverted_toggle_bus", EnumSet.of( AEFeature.TOGGLE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartInvertedToggleBus.class ), - CableAnchor( 120, "cable_anchor", EnumSet.of( AEFeature.CABLE_ANCHOR ), EnumSet.noneOf( IntegrationType.class ), PartCableAnchor.class ), + CABLE_ANCHOR( 120, "cable_anchor", EnumSet.of( AEFeature.CABLE_ANCHOR ), EnumSet.noneOf( IntegrationType.class ), PartCableAnchor.class ), - QuartzFiber( 140, "quartz_fiber", EnumSet.of( AEFeature.QUARTZ_FIBER ), EnumSet.noneOf( IntegrationType.class ), PartQuartzFiber.class ), + QUARTZ_FIBER( 140, "quartz_fiber", EnumSet.of( AEFeature.QUARTZ_FIBER ), EnumSet.noneOf( IntegrationType.class ), PartQuartzFiber.class ), - Monitor( 160, "monitor", EnumSet.of( AEFeature.PANELS ), EnumSet.noneOf( IntegrationType.class ), PartPanel.class ), + MONITOR( 160, "monitor", EnumSet.of( AEFeature.PANELS ), EnumSet.noneOf( IntegrationType.class ), PartPanel.class ), - SemiDarkMonitor( 180, "semi_dark_monitor", EnumSet.of( AEFeature.PANELS ), EnumSet.noneOf( IntegrationType.class ), PartSemiDarkPanel.class ), + SEMI_DARK_MONITOR( 180, "semi_dark_monitor", EnumSet.of( AEFeature.PANELS ), EnumSet.noneOf( IntegrationType.class ), PartSemiDarkPanel.class ), - DarkMonitor( 200, "dark_monitor", EnumSet.of( AEFeature.PANELS ), EnumSet.noneOf( IntegrationType.class ), PartDarkPanel.class ), + DARK_MONITOR( 200, "dark_monitor", EnumSet.of( AEFeature.PANELS ), EnumSet.noneOf( IntegrationType.class ), PartDarkPanel.class ), - StorageBus( 220, "storage_bus", EnumSet.of( AEFeature.STORAGE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartStorageBus.class ), + STORAGE_BUS( 220, "storage_bus", EnumSet.of( AEFeature.STORAGE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartStorageBus.class ), - ImportBus( 240, "import_bus", EnumSet.of( AEFeature.IMPORT_BUS ), EnumSet.noneOf( IntegrationType.class ), PartImportBus.class ), + IMPORT_BUS( 240, "import_bus", EnumSet.of( AEFeature.IMPORT_BUS ), EnumSet.noneOf( IntegrationType.class ), PartImportBus.class ), - ExportBus( 260, "export_bus", EnumSet.of( AEFeature.EXPORT_BUS ), EnumSet.noneOf( IntegrationType.class ), PartExportBus.class ), + EXPORT_BUS( 260, "export_bus", EnumSet.of( AEFeature.EXPORT_BUS ), EnumSet.noneOf( IntegrationType.class ), PartExportBus.class ), - LevelEmitter( 280, "level_emitter", EnumSet.of( AEFeature.LEVEL_EMITTER ), EnumSet.noneOf( IntegrationType.class ), PartLevelEmitter.class ), + LEVEL_EMITTER( 280, "level_emitter", EnumSet.of( AEFeature.LEVEL_EMITTER ), EnumSet.noneOf( IntegrationType.class ), PartLevelEmitter.class ), - AnnihilationPlane( 300, "annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE ), EnumSet + ANNIHILATION_PLANE( 300, "annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE ), EnumSet .noneOf( IntegrationType.class ), PartAnnihilationPlane.class ), - IdentityAnnihilationPlane( 301, "identity_annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE, AEFeature.IDENTITY_ANNIHILATION_PLANE ), EnumSet + IDENTITY_ANNIHILATION_PLANE( 301, "identity_annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE, AEFeature.IDENTITY_ANNIHILATION_PLANE ), EnumSet .noneOf( IntegrationType.class ), PartIdentityAnnihilationPlane.class ), - FormationPlane( 320, "formation_plane", EnumSet.of( AEFeature.FORMATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartFormationPlane.class ), + FORMATION_PLANE( 320, "formation_plane", EnumSet.of( AEFeature.FORMATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartFormationPlane.class ), - PatternTerminal( 340, "pattern_terminal", EnumSet.of( AEFeature.PATTERNS ), EnumSet.noneOf( IntegrationType.class ), PartPatternTerminal.class ), + PATTERN_TERMINAL( 340, "pattern_terminal", EnumSet.of( AEFeature.PATTERNS ), EnumSet.noneOf( IntegrationType.class ), PartPatternTerminal.class ), - CraftingTerminal( 360, "crafting_terminal", EnumSet.of( AEFeature.CRAFTING_TERMINAL ), EnumSet.noneOf( IntegrationType.class ), PartCraftingTerminal.class ), + CRAFTING_TERMINAL( 360, "crafting_terminal", EnumSet.of( AEFeature.CRAFTING_TERMINAL ), EnumSet.noneOf( IntegrationType.class ), PartCraftingTerminal.class ), - Terminal( 380, "terminal", EnumSet.of( AEFeature.TERMINAL ), EnumSet.noneOf( IntegrationType.class ), PartTerminal.class ), + TERMINAL( 380, "terminal", EnumSet.of( AEFeature.TERMINAL ), EnumSet.noneOf( IntegrationType.class ), PartTerminal.class ), - StorageMonitor( 400, "storage_monitor", EnumSet.of( AEFeature.STORAGE_MONITOR ), EnumSet.noneOf( IntegrationType.class ), PartStorageMonitor.class ), + STORAGE_MONITOR( 400, "storage_monitor", EnumSet.of( AEFeature.STORAGE_MONITOR ), EnumSet.noneOf( IntegrationType.class ), PartStorageMonitor.class ), - ConversionMonitor( 420, "conversion_monitor", EnumSet.of( AEFeature.PART_CONVERSION_MONITOR ), EnumSet + CONVERSION_MONITOR( 420, "conversion_monitor", EnumSet.of( AEFeature.PART_CONVERSION_MONITOR ), EnumSet .noneOf( IntegrationType.class ), PartConversionMonitor.class ), - Interface( 440, "interface", EnumSet.of( AEFeature.INTERFACE ), EnumSet.noneOf( IntegrationType.class ), PartInterface.class ), + INTERFACE( 440, "interface", EnumSet.of( AEFeature.INTERFACE ), EnumSet.noneOf( IntegrationType.class ), PartInterface.class ), - P2PTunnelME( 460, "p2p_tunnel_me", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ME ), EnumSet + P2P_TUNNEL_ME( 460, "p2p_tunnel_me", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ME ), EnumSet .noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel ) { @Override @@ -202,7 +202,7 @@ public enum PartType } }, - P2PTunnelRedstone( 461, "p2p_tunnel_redstone", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_REDSTONE ), EnumSet + P2P_TUNNEL_REDSTONE( 461, "p2p_tunnel_redstone", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_REDSTONE ), EnumSet .noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel ) { @Override @@ -212,7 +212,7 @@ public enum PartType } }, - P2PTunnelItems( 462, "p2p_tunnel_items", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ITEMS ), EnumSet + P2P_TUNNEL_ITEMS( 462, "p2p_tunnel_items", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ITEMS ), EnumSet .noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel ) { @Override @@ -222,7 +222,7 @@ public enum PartType } }, - P2PTunnelFluids( 463, "p2p_tunnel_fluids", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FLUIDS ), EnumSet + P2P_TUNNEL_FLUIDS( 463, "p2p_tunnel_fluids", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FLUIDS ), EnumSet .noneOf( IntegrationType.class ), PartP2PFluids.class, GuiText.FluidTunnel ) { @Override @@ -232,7 +232,7 @@ public enum PartType } }, - P2PTunnelEU( 465, "p2p_tunnel_ic2", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_EU ), EnumSet + P2P_TUNNEL_IC2( 465, "p2p_tunnel_ic2", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_EU ), EnumSet .of ( IntegrationType.IC2 ), PartP2PIC2Power.class, GuiText.EUTunnel ) { @Override @@ -242,7 +242,7 @@ public enum PartType } }, - P2PTunnelRF( 466, "p2p_tunnel_rf", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_RF ), EnumSet + P2P_TUNNEL_RF( 466, "p2p_tunnel_rf", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_RF ), EnumSet .of ( IntegrationType.RF ), PartP2PRFPower.class, GuiText.RFTunnel ) { @Override @@ -252,7 +252,7 @@ public enum PartType } }, - P2PTunnelLight( 467, "p2p_tunnel_light", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_LIGHT ), EnumSet + P2P_TUNNEL_LIGHT( 467, "p2p_tunnel_light", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_LIGHT ), EnumSet .noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel ) { @Override @@ -262,7 +262,7 @@ public enum PartType } }, - P2PTunnelFE( 469, "p2p_tunnel_fe", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FE ), EnumSet + P2P_TUNNEL_FE( 469, "p2p_tunnel_fe", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FE ), EnumSet .noneOf( IntegrationType.class ), PartP2PFEPower.class, GuiText.FETunnel ) { @Override @@ -275,7 +275,7 @@ public enum PartType // P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of( // IntegrationType.OpenComputers ), PartP2POpenComputers.class, GuiText.OCTunnel ), - InterfaceTerminal( 480, "interface_terminal", EnumSet.of( AEFeature.INTERFACE_TERMINAL ), EnumSet + INTERFACE_TERMINAL( 480, "interface_terminal", EnumSet.of( AEFeature.INTERFACE_TERMINAL ), EnumSet .noneOf( IntegrationType.class ), PartInterfaceTerminal.class ); private final int baseDamage; @@ -377,7 +377,7 @@ public enum PartType String getUnlocalizedName() { - return name(); + return name().toLowerCase(); } GuiText getExtraName() diff --git a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java index c0558b5d1..126574fce 100644 --- a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java @@ -75,19 +75,19 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe switch( this.component ) { - case Cell1kPart: + case CELL1K_PART: this.idleDrain = 0.5; this.perType = 8; break; - case Cell4kPart: + case CELL4K_PART: this.idleDrain = 1.0; this.perType = 32; break; - case Cell16kPart: + case CELL16K_PART: this.idleDrain = 1.5; this.perType = 128; break; - case Cell64kPart: + case CELL64K_PART: this.idleDrain = 2.0; this.perType = 512; break; diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 376feae24..5dacf35a3 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -1179,7 +1179,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I TileEntity adjacentTe = this.getTile().getWorld().getTileEntity( adjacentPos ); if( adjacentTe instanceof IGridHost ) { - if( !( adjacentTe instanceof IPartHost ) || cable.getCableConnectionType() == AECableType.DENSE ) + if( !( adjacentTe instanceof IPartHost ) || cable.getCableConnectionType() == AECableType.DENSE_SMART ) { IGridHost gridHost = (IGridHost) adjacentTe; connectionType = gridHost.getCableConnectionType( AEPartLocation.fromFacing( facing.getOpposite() ) ); diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/PartCable.java index d1e462f8d..86b863fe0 100644 --- a/src/main/java/appeng/parts/networking/PartCable.java +++ b/src/main/java/appeng/parts/networking/PartCable.java @@ -43,7 +43,6 @@ import appeng.api.parts.BusSupport; import appeng.api.parts.IPart; import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; -import appeng.api.parts.IPartModel; import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; @@ -129,7 +128,7 @@ public class PartCable extends AEBasePart implements IPartCable { newPart = parts.cableSmart().stack( newColor, 1 ); } - else if( this.getCableConnectionType() == AECableType.DENSE ) + else if( this.getCableConnectionType() == AECableType.DENSE_SMART ) { newPart = parts.cableDense().stack( newColor, 1 ); } diff --git a/src/main/java/appeng/parts/networking/PartDenseCable.java b/src/main/java/appeng/parts/networking/PartDenseCable.java index 4b5d0839b..3af307e80 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCable.java +++ b/src/main/java/appeng/parts/networking/PartDenseCable.java @@ -55,7 +55,7 @@ public class PartDenseCable extends PartCable @Override public AECableType getCableConnectionType() { - return AECableType.DENSE; + return AECableType.DENSE_SMART; } @Override @@ -152,7 +152,7 @@ public class PartDenseCable extends PartCable if( te instanceof IGridHost ) { final AECableType t = ( (IGridHost) te ).getCableConnectionType( of.getOpposite() ); - return t == AECableType.DENSE; + return t == AECableType.DENSE_SMART; } return false; } diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index 5acd1c7e4..ef53b27be 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -106,7 +106,7 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I @Override public AECableType getCableConnectionType( final AEPartLocation dir ) { - return AECableType.DENSE; + return AECableType.DENSE_SMART; } @Override diff --git a/src/main/java/appeng/recipes/AEItemResolver.java b/src/main/java/appeng/recipes/AEItemResolver.java index ef389fab3..eacedcff3 100644 --- a/src/main/java/appeng/recipes/AEItemResolver.java +++ b/src/main/java/appeng/recipes/AEItemResolver.java @@ -91,12 +91,12 @@ public class AEItemResolver implements ISubItemResolver return this.cableItem( parts.cableSmart(), itemName.substring( itemName.indexOf( '.' ) + 1 ) ); } - if( itemName.equals( "cable_dense" ) ) + if( itemName.equals( "cable_dense_smart" ) ) { return new ResolverResultSet( "cable_dense", parts.cableDense().allStacks( 1 ) ); } - if( itemName.startsWith( "cable_dense." ) ) + if( itemName.startsWith( "cable_dense_smart." ) ) { return this.cableItem( parts.cableDense(), itemName.substring( itemName.indexOf( '.' ) + 1 ) ); } @@ -122,7 +122,7 @@ public class AEItemResolver implements ISubItemResolver if( itemName.startsWith( "material." ) ) { final String materialName = itemName.substring( itemName.indexOf( '.' ) + 1 ); - final MaterialType mt = MaterialType.valueOf( materialName ); + final MaterialType mt = MaterialType.valueOf( materialName.toUpperCase() ); // itemName = itemName.substring( 0, itemName.indexOf( "." ) ); if( mt.getItemInstance() == ItemMaterial.instance && mt.getDamageValue() >= 0 && mt.isRegistered() ) { @@ -133,7 +133,7 @@ public class AEItemResolver implements ISubItemResolver if( itemName.startsWith( "part." ) ) { final String partName = itemName.substring( itemName.indexOf( '.' ) + 1 ); - final PartType pt = PartType.valueOf( partName ); + final PartType pt = PartType.valueOf( partName.toUpperCase() ); // itemName = itemName.substring( 0, itemName.indexOf( "." ) ); final int dVal = ItemPart.instance.getDamageByType( pt ); if( dVal >= 0 ) diff --git a/src/main/java/appeng/tile/networking/TileController.java b/src/main/java/appeng/tile/networking/TileController.java index f14040068..d7f0a9db8 100644 --- a/src/main/java/appeng/tile/networking/TileController.java +++ b/src/main/java/appeng/tile/networking/TileController.java @@ -62,7 +62,7 @@ public class TileController extends AENetworkPowerTile @Override public AECableType getCableConnectionType( final AEPartLocation dir ) { - return AECableType.DENSE; + return AECableType.DENSE_SMART; } @Override diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index b830459cc..bab2decbc 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -310,7 +310,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock @Override public AECableType getCableConnectionType( final AEPartLocation dir ) { - return AECableType.DENSE; + return AECableType.DENSE_SMART; } public void neighborUpdate() diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/groups.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/groups.recipe index 883a11014..4bef8fbbc 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/groups.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/groups.recipe @@ -1,5 +1,5 @@ group= oredictionary:itemIlluminatedPanel -> monitor -group= ae2:interface ae2:part.Interface -> interface +group= ae2:interface ae2:part.interface -> interface group= ae2:certus_quartz_cutting_knife:* ae2:nether_quartz_cutting_knife:* -> knife group= ae2:certus_quartz_wrench ae2:nether_quartz_wrench -> wrench @@ -13,9 +13,9 @@ group= oredictionary:dustEnder oredictionary:dustEnderPearl -> dustEnder group=oredictionary:blockGlass oredictionary:glass mc:glass -> glass group=oredictionary:wool mc:wool:* -> wool -group=oredictionary:crystalCertusQuartz oredictionary:crystalNetherQuartz ae2:material.CertusQuartzCrystalCharged -> crystalQuartz +group=oredictionary:crystalCertusQuartz oredictionary:crystalNetherQuartz ae2:material.certus_quartz_crystal_charged -> crystalQuartz group=oredictionary:dustCertusQuartz oredictionary:dustNetherQuartz -> dustQuartz -group=oredictionary:crystalCertusQuartz ae2:material.CertusQuartzCrystalCharged ae2:material.PurifiedCertusQuartzCrystal -> certusCrystal -group=oredictionary:crystalNetherQuartz ae2:material.PurifiedNetherQuartzCrystal -> netherCrystal -group=oredictionary:crystalFluix ae2:material.PurifiedFluixCrystal -> fluixCrystal \ No newline at end of file +group=oredictionary:crystalCertusQuartz ae2:material.certus_quartz_crystal_charged ae2:material.purified_certus_quartz_crystal -> certusCrystal +group=oredictionary:crystalNetherQuartz ae2:material.purified_nether_quartz_crystal -> netherCrystal +group=oredictionary:crystalFluix ae2:material.purified_fluix_crystal -> fluixCrystal \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/index.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/index.recipe index 5c143d90b..5c4c3e1fc 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/index.recipe @@ -12,10 +12,20 @@ import=aliases.recipe import=oredict.recipe import=groups.recipe -# All actual recipes -import=decorative/index.recipe -import=materials/index.recipe -import=misc/index.recipe -import=network/index.recipe import=processing/index.recipe -import=tools/index.recipe \ No newline at end of file + +### Manually load non-shaped/shapeless recipe files +import=smelting/smelting.recipe +import=materials/circuits.recipe +import=materials/presses.recipe +import=materials/processors.recipe + + + +### REPLACED IN 1.12 BY JSON RECIPES +# All actual recipes +#import=decorative/index.recipe +#import=materials/index.recipe +#import=misc/index.recipe +#import=network/index.recipe +#import=tools/index.recipe \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/materials/circuits.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/materials/circuits.recipe index f79318cd8..a7398bd06 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/materials/circuits.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/materials/circuits.recipe @@ -1,15 +1,15 @@ inscribe= - oredictionary:ingotGold ae2:material.LogicProcessorPress - -> ae2:material.LogicProcessorPrint + oredictionary:ingotGold ae2:material.logic_processor_press + -> ae2:material.logic_processor_print inscribe= - ae2:material.PurifiedCertusQuartzCrystal ae2:material.CalcProcessorPress - -> ae2:material.CalcProcessorPrint + ae2:material.purified_certus_quartz_crystal ae2:material.calculation_processor_press + -> ae2:material.calculation_processor_print inscribe= - oredictionary:gemDiamond ae2:material.EngProcessorPress - -> ae2:material.EngProcessorPrint + oredictionary:gemDiamond ae2:material.engineering_processor_press + -> ae2:material.engineering_processor_print inscribe= - oredictionary:itemSilicon ae2:material.SiliconPress - -> ae2:material.SiliconPrint + oredictionary:itemSilicon ae2:material.silicon_press + -> ae2:material.silicon_print diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/materials/presses.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/materials/presses.recipe index 68a8a3026..0efeb351d 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/materials/presses.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/materials/presses.recipe @@ -1,15 +1,15 @@ inscribe= - oredictionary:blockIron ae2:material.LogicProcessorPress - -> ae2:material.LogicProcessorPress + oredictionary:blockIron ae2:material.logic_processor_press + -> ae2:material.logic_processor_press inscribe= - oredictionary:blockIron ae2:material.CalcProcessorPress - -> ae2:material.CalcProcessorPress + oredictionary:blockIron ae2:material.calculation_processor_press + -> ae2:material.calculation_processor_press inscribe= - oredictionary:blockIron ae2:material.EngProcessorPress - -> ae2:material.EngProcessorPress + oredictionary:blockIron ae2:material.engineering_processor_press + -> ae2:material.engineering_processor_press inscribe= - oredictionary:blockIron ae2:material.SiliconPress - -> ae2:material.SiliconPress + oredictionary:blockIron ae2:material.silicon_press + -> ae2:material.silicon_press diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/materials/processors.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/materials/processors.recipe index 74cb2d2f3..f10645b25 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/materials/processors.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/materials/processors.recipe @@ -1,11 +1,11 @@ press= - oredictionary:dustRedstone ae2:material.LogicProcessorPrint ae2:material.SiliconPrint - -> ae2:material.LogicProcessor + oredictionary:dustRedstone ae2:material.logic_processor_print ae2:material.silicon_print + -> ae2:material.logic_processor press= - oredictionary:dustRedstone ae2:material.CalcProcessorPrint ae2:material.SiliconPrint - -> ae2:material.CalcProcessor + oredictionary:dustRedstone ae2:material.calculation_processor_print ae2:material.silicon_print + -> ae2:material.calculation_processor press= - oredictionary:dustRedstone ae2:material.EngProcessorPrint ae2:material.SiliconPrint - -> ae2:material.EngProcessor + oredictionary:dustRedstone ae2:material.engineering_processor_print ae2:material.silicon_print + -> ae2:material.engineering_processor diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/oredict.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/oredict.recipe index dc41f9200..7e5bf5b85 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/oredict.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/oredict.recipe @@ -14,18 +14,18 @@ ore=mc:chest -> chestWood # AE2 Ore Dictionary # Materials for processing in other machines -ore=ae2:material.CertusQuartzCrystal -> crystalCertusQuartz -ore=ae2:material.FluixCrystal -> crystalFluix -ore=ae2:material.PurifiedFluixCrystal -> crystalPureFluix -ore=ae2:material.NetherQuartzDust -> dustNetherQuartz -ore=ae2:material.CertusQuartzDust -> dustCertusQuartz -ore=ae2:material.FluixDust -> dustFluix +ore=ae2:material.certus_quartz_crystal -> crystalCertusQuartz +ore=ae2:material.fluix_crystal -> crystalFluix +ore=ae2:material.purified_fluix_crystal -> crystalPureFluix +ore=ae2:material.nether_quartz_dust -> dustNetherQuartz +ore=ae2:material.certus_quartz_dust -> dustCertusQuartz +ore=ae2:material.fluix_dust -> dustFluix # Ores of AE2 ore=ae2:quartz_ore -> oreCertusQuartz ore=ae2:charged_quartz_ore -> oreChargedCertusQuartz # Parts to be used -ore= ae2:part.SemiDarkMonitor -> itemIlluminatedPanel -ore= ae2:part.Monitor -> itemIlluminatedPanel -ore= ae2:part.DarkMonitor -> itemIlluminatedPanel +ore= ae2:part.semi_dark_monitor -> itemIlluminatedPanel +ore= ae2:part.monitor -> itemIlluminatedPanel +ore= ae2:part.dark_monitor -> itemIlluminatedPanel diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/factorization.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/factorization.recipe index 67d61bc26..1a8add582 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/factorization.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/factorization.recipe @@ -1,9 +1,9 @@ -grindfz= ae2:material.FluixCrystal -> ae2:material.FluixDust -grindfz= ae2:sky_stone_block:0 -> ae2:material.SkyDust -grindfz= mc:ender_pearl -> ae2:material.EnderDust -# grindfz= oredictionary:cropWheat -> ae2:material.Flour -grindfz= ae2:material.CertusQuartzCrystalCharged -> ae2:material.CertusQuartzDust -grindfz= ae2:material.CertusQuartzCrystal -> ae2:material.CertusQuartzDust -# grindfz= mc:quartz -> ae2:material.NetherQuartzDust -grindfz= ae2:quartz_ore -> 2 ae2:material.CertusQuartzDust -grindfz= ae2:charged_quartz_ore -> 2 ae2:material.CertusQuartzDust +grindfz= ae2:material.fluix_crystal -> ae2:material.fluix_dust +grindfz= ae2:sky_stone_block:0 -> ae2:material.sky_dust +grindfz= mc:ender_pearl -> ae2:material.ender_dust +# grindfz= oredictionary:cropWheat -> ae2:material.flour +grindfz= ae2:material.certus_quartz_crystal_charged -> ae2:material.certus_quartz_dust +grindfz= ae2:material.certus_quartz_crystal -> ae2:material.certus_quartz_dust +# grindfz= mc:quartz -> ae2:material.nether_quartz_dust +grindfz= ae2:quartz_ore -> 2 ae2:material.certus_quartz_dust +grindfz= ae2:charged_quartz_ore -> 2 ae2:material.certus_quartz_dust diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/grind.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/grind.recipe index e24414945..729291b65 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/grind.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/grind.recipe @@ -1,4 +1,4 @@ -grind= ae2:material.FluixCrystal -> ae2:material.FluixDust -grind= ae2:sky_stone_block:0 -> ae2:material.SkyDust +grind= ae2:material.fluix_crystal -> ae2:material.fluix_dust +grind= ae2:sky_stone_block:0 -> ae2:material.sky_dust grind= mc:gravel -> mc:flint grind= mc:bone -> 4 mc:dye:15 diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/hydraulicraft.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/hydraulicraft.recipe index 205bf58ad..2ecefa866 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/hydraulicraft.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/hydraulicraft.recipe @@ -1,9 +1,9 @@ -hccrusher= ae2:material.FluixCrystal -> ae2:material.FluixDust -hccrusher= ae2:sky_stone_block:0 -> ae2:material.SkyDust -hccrusher= mc:ender_pearl -> ae2:material.EnderDust -hccrusher= oredictionary:cropWheat -> ae2:material.Flour -hccrusher= ae2:material.CertusQuartzCrystalCharged -> ae2:material.CertusQuartzDust -hccrusher= ae2:material.CertusQuartzCrystal -> ae2:material.CertusQuartzDust -hccrusher= mc:quartz -> ae2:material.NetherQuartzDust -hccrusher= ae2:quartz_ore -> 2 ae2:material.CertusQuartzDust -hccrusher= ae2:charged_quartz_ore -> 2 ae2:material.CertusQuartzDust +hccrusher= ae2:material.fluix_crystal -> ae2:material.fluix_dust +hccrusher= ae2:sky_stone_block:0 -> ae2:material.sky_dust +hccrusher= mc:ender_pearl -> ae2:material.ender_dust +hccrusher= oredictionary:cropWheat -> ae2:material.flour +hccrusher= ae2:material.certus_quartz_crystal_charged -> ae2:material.certus_quartz_dust +hccrusher= ae2:material.certus_quartz_crystal -> ae2:material.certus_quartz_dust +hccrusher= mc:quartz -> ae2:material.nether_quartz_dust +hccrusher= ae2:quartz_ore -> 2 ae2:material.certus_quartz_dust +hccrusher= ae2:charged_quartz_ore -> 2 ae2:material.certus_quartz_dust diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/ic2.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/ic2.recipe index f57ea9704..9341e1923 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/ic2.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/ic2.recipe @@ -1,9 +1,9 @@ -macerator= ae2:material.FluixCrystal -> ae2:material.FluixDust -macerator= ae2:sky_stone_block:0 -> ae2:material.SkyDust -macerator= mc:ender_pearl -> ae2:material.EnderDust -# macerator= oredictionary:cropWheat -> ae2:material.Flour -macerator= ae2:material.CertusQuartzCrystalCharged -> ae2:material.CertusQuartzDust -macerator= ae2:material.CertusQuartzCrystal -> ae2:material.CertusQuartzDust -macerator= mc:quartz -> ae2:material.NetherQuartzDust -macerator= ae2:quartz_ore -> 2 ae2:material.CertusQuartzDust -macerator= ae2:charged_quartz_ore -> 2 ae2:material.CertusQuartzDust +macerator= ae2:material.fluix_crystal -> ae2:material.fluix_dust +macerator= ae2:sky_stone_block:0 -> ae2:material.sky_dust +macerator= mc:ender_pearl -> ae2:material.ender_dust +# macerator= oredictionary:cropWheat -> ae2:material.flour +macerator= ae2:material.certus_quartz_crystal_charged -> ae2:material.certus_quartz_dust +macerator= ae2:material.certus_quartz_crystal -> ae2:material.certus_quartz_dust +macerator= mc:quartz -> ae2:material.nether_quartz_dust +macerator= ae2:quartz_ore -> 2 ae2:material.certus_quartz_dust +macerator= ae2:charged_quartz_ore -> 2 ae2:material.certus_quartz_dust diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/mekanism.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/mekanism.recipe index 68fdb1289..ee501a391 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/mekanism.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/mekanism.recipe @@ -1,9 +1,9 @@ -mekcrusher= ae2:material.FluixCrystal -> ae2:material.FluixDust -#bug mekcrusher= ae2:sky_stone_block:0 -> ae2:material.SkyDust -#bug mekcrusher= mc:ender_pearl -> ae2:material.EnderDust -# mekcrusher= oredictionary:cropWheat -> ae2:material.Flour -#bug mekcrusher= ae2:material.CertusQuartzCrystalCharged -> ae2:material.CertusQuartzDust -mekcrusher= ae2:material.CertusQuartzCrystal -> ae2:material.CertusQuartzDust -mekcrusher= mc:quartz -> ae2:material.NetherQuartzDust -mekechamber= ae2:quartz_ore -> 2 ae2:material.CertusQuartzDust -mekechamber= ae2:charged_quartz_ore -> 2 ae2:material.CertusQuartzDust +mekcrusher= ae2:material.fluix_crystal -> ae2:material.fluix_dust +#bug mekcrusher= ae2:sky_stone_block:0 -> ae2:material.sky_dust +#bug mekcrusher= mc:ender_pearl -> ae2:material.ender_dust +# mekcrusher= oredictionary:cropWheat -> ae2:material.flour +#bug mekcrusher= ae2:material.certus_quartz_crystal_charged -> ae2:material.certus_quartz_dust +mekcrusher= ae2:material.certus_quartz_crystal -> ae2:material.certus_quartz_dust +mekcrusher= mc:quartz -> ae2:material.nether_quartz_dust +mekechamber= ae2:quartz_ore -> 2 ae2:material.certus_quartz_dust +mekechamber= ae2:charged_quartz_ore -> 2 ae2:material.certus_quartz_dust diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/rotarycraft.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/rotarycraft.recipe index 1c6bd0e18..a23d06b31 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/rotarycraft.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/rotarycraft.recipe @@ -1,9 +1,9 @@ -crusher= ae2:material.FluixCrystal -> ae2:material.FluixDust -crusher= ae2:sky_stone_block:0 -> ae2:material.SkyDust -crusher= mc:ender_pearl -> ae2:material.EnderDust -crusher= oredictionary:cropWheat -> ae2:material.Flour -crusher= ae2:material.CertusQuartzCrystalCharged -> ae2:material.CertusQuartzDust -crusher= ae2:material.CertusQuartzCrystal -> ae2:material.CertusQuartzDust -crusher= mc:quartz -> ae2:material.NetherQuartzDust -crusher= ae2:quartz_ore -> 2 ae2:material.CertusQuartzDust -crusher= ae2:charged_quartz_ore -> 2 ae2:material.CertusQuartzDust +crusher= ae2:material.fluix_crystal -> ae2:material.fluix_dust +crusher= ae2:sky_stone_block:0 -> ae2:material.sky_dust +crusher= mc:ender_pearl -> ae2:material.ender_dust +crusher= oredictionary:cropWheat -> ae2:material.flour +crusher= ae2:material.certus_quartz_crystal_charged -> ae2:material.certus_quartz_dust +crusher= ae2:material.certus_quartz_crystal -> ae2:material.certus_quartz_dust +crusher= mc:quartz -> ae2:material.certus_quartz_dust +crusher= ae2:quartz_ore -> 2 ae2:material.certus_quartz_dust +crusher= ae2:charged_quartz_ore -> 2 ae2:material.certus_quartz_dust diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/te.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/te.recipe index 1436eb9b0..a169b59d8 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/te.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/te.recipe @@ -1,9 +1,9 @@ -pulverizer= ae2:material.FluixCrystal -> ae2:material.FluixDust -pulverizer= ae2:sky_stone_block:0 -> ae2:material.SkyDust -pulverizer= mc:ender_pearl -> ae2:material.EnderDust -pulverizer= oredictionary:cropWheat -> ae2:material.Flour -pulverizer= ae2:material.CertusQuartzCrystalCharged -> ae2:material.CertusQuartzDust -pulverizer= ae2:material.CertusQuartzCrystal -> ae2:material.CertusQuartzDust -pulverizer= mc:quartz -> ae2:material.NetherQuartzDust -pulverizer= ae2:quartz_ore -> 2 ae2:material.CertusQuartzDust -pulverizer= ae2:charged_quartz_ore -> 2 ae2:material.CertusQuartzDust +pulverizer= ae2:material.fluix_crystal -> ae2:material.fluix_dust +pulverizer= ae2:sky_stone_block:0 -> ae2:material.sky_dust +pulverizer= mc:ender_pearl -> ae2:material.ender_dust +pulverizer= oredictionary:cropWheat -> ae2:material.flour +pulverizer= ae2:material.certus_quartz_crystal_charged -> ae2:material.certus_quartz_dust +pulverizer= ae2:material.certus_quartz_crystal -> ae2:material.certus_quartz_dust +pulverizer= mc:quartz -> ae2:material.nether_quartz_dust +pulverizer= ae2:quartz_ore -> 2 ae2:material.certus_quartz_dust +pulverizer= ae2:charged_quartz_ore -> 2 ae2:material.certus_quartz_dust diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/vanilla.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/vanilla.recipe index 2af55299f..e7c6ce343 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/processing/vanilla.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/processing/vanilla.recipe @@ -1,8 +1,8 @@ # Ore Processing -smelt= ae2:material.GoldDust -> mc:gold_ingot -smelt= ae2:material.IronDust -> mc:iron_ingot -smelt= ae2:material.Flour -> mc:bread +smelt= ae2:material.gold_dust -> mc:gold_ingot +smelt= ae2:material.iron_dust -> mc:iron_ingot +smelt= ae2:material.flour -> mc:bread # Silicon -smelt= ae2:material.NetherQuartzDust -> ae2:material.Silicon -smelt= ae2:material.CertusQuartzDust -> ae2:material.Silicon +smelt= ae2:material.nether_quartz_dust -> ae2:material.silicon +smelt= ae2:material.certus_quartz_dust -> ae2:material.silicon diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/smelting.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/smelting.recipe new file mode 100644 index 000000000..f207c6683 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/smelting/smelting.recipe @@ -0,0 +1,2 @@ +smelt= + ae2:sky_stone_block -> ae2:smooth_sky_stone_block \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang b/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang index 6a5574d7f..1407d2261 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang @@ -319,91 +319,91 @@ item.appliedenergistics2.encoded_pattern.name=Kódované schéma item.appliedenergistics2.view_cell.name=Zobrazit článek item.appliedenergistics2.facade.name=Kabelová fasáda -item.appliedenergistics2.crystal_seed.Certus.name=Semínko nakloněného křemene -item.appliedenergistics2.crystal_seed.Nether.name=Semínko křemene -item.appliedenergistics2.crystal_seed.Fluix.name=Semínko Fluixu -item.appliedenergistics2.material.InvalidType.name=Tento předmět je zakázaný. -item.appliedenergistics2.material.AdvCard.name=Pokročilá karta -item.appliedenergistics2.material.AnnihilationCore.name=Jádro zkázy -item.appliedenergistics2.material.BasicCard.name=Běžná karta -item.appliedenergistics2.material.BlankPattern.name=Prázdné schéma -item.appliedenergistics2.material.CalcProcessor.name=Výpočetní procesor -item.appliedenergistics2.material.CardCapacity.name=Kapacitní karta -item.appliedenergistics2.material.CardFuzzy.name=Rozmazaná karta -item.appliedenergistics2.material.CardInverter.name=Měničová karta -item.appliedenergistics2.material.CardRedstone.name=Ruditová karta -item.appliedenergistics2.material.CardSpeed.name=Akcelerační karta -item.appliedenergistics2.material.Cell2SpatialPart.name=2³ Prostorový komponent -item.appliedenergistics2.material.Cell16SpatialPart.name=16³ Prostorový komponent -item.appliedenergistics2.material.Cell128SpatialPart.name=128³ Prostorový komponent -item.appliedenergistics2.material.Cell1kPart.name=1k ME Úložný komponent -item.appliedenergistics2.material.Cell4kPart.name=4k ME Úložný komponent -item.appliedenergistics2.material.Cell16kPart.name=16k ME Úložný komponent -item.appliedenergistics2.material.Cell64kPart.name=64k ME Úložný komponent -item.appliedenergistics2.material.CertusQuartzCrystal.name=Krystal nakloněného křemene -item.appliedenergistics2.material.CertusQuartzCrystalCharged.name=Nabitý krystal nakloněného křemene -item.appliedenergistics2.material.CertusQuartzDust.name=Prach nakloněného křemene -item.appliedenergistics2.material.EmptyStorageCell.name=ME úložné pouzdro -item.appliedenergistics2.material.EnderDust.name=Prach z Endu -item.appliedenergistics2.material.EngProcessor.name=Inženýrský procesor -item.appliedenergistics2.material.Flour.name=Mouka -item.appliedenergistics2.material.FluixCrystal.name=Fluixový krystal -item.appliedenergistics2.material.FluixDust.name=Fluixový prach -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.LogicProcessor.name=Logický procesor -item.appliedenergistics2.material.LogicProcessorAsm.name=Nedokončený logický procesor -item.appliedenergistics2.material.MatterBall.name=Hmotný míč -item.appliedenergistics2.material.NetherQuartzDust.name=Křemenný prach -item.appliedenergistics2.material.PurifiedCertusQuartzCrystal.name=Čistý nahnutý křemenný krystal -item.appliedenergistics2.material.PurifiedFluixCrystal.name=Čistý Fluixový krystal -item.appliedenergistics2.material.PurifiedNetherQuartzCrystal.name=Čistý křemenný krystal -item.appliedenergistics2.material.QESingularity.name=Kvantová zapletená singularita -item.appliedenergistics2.material.Silicon.name=Křemík -item.appliedenergistics2.material.Singularity.name=Singularita -item.appliedenergistics2.material.Wireless.name=Bezdrátový přijímač -item.appliedenergistics2.material.WirelessBooster.name=Bezdrátový posilovač -item.appliedenergistics2.material.WoodenGear.name=Dřevěné kolečko -item.appliedenergistics2.material.EngProcessorPress.name=Výtisk inženýrského zapisovače -item.appliedenergistics2.material.CalcProcessorPress.name=Výtisk kalkulačního zapisovače -item.appliedenergistics2.material.LogicProcessorPress.name=Výtisk logického zapisovače -item.appliedenergistics2.material.EngProcessorPrint.name=Vytisknutý inženýrský obvod -item.appliedenergistics2.material.CalcProcessorPrint.name=Vytisknutý kalkulační obvod -item.appliedenergistics2.material.LogicProcessorPrint.name=Vytisknutý logický obvod -item.appliedenergistics2.material.SiliconPress.name=Výtisk křemíkového zapisovače -item.appliedenergistics2.material.SiliconPrint.name=Vytisknutý křemík -item.appliedenergistics2.material.NamePress.name=Výtisk jmenového zapisovače -item.appliedenergistics2.material.SkyDust.name=Prach nebeského kamene -item.appliedenergistics2.material.CardCrafting.name=Výrobní karta +item.appliedenergistics2.crystal_seed.certus.name=Semínko nakloněného křemene +item.appliedenergistics2.crystal_seed.nether.name=Semínko křemene +item.appliedenergistics2.crystal_seed.fluix.name=Semínko Fluixu +item.appliedenergistics2.material.invalid_type.name=Tento předmět je zakázaný. +item.appliedenergistics2.material.advanced_card.name=Pokročilá karta +item.appliedenergistics2.material.annihilation_core.name=Jádro zkázy +item.appliedenergistics2.material.basic_card.name=Běžná karta +item.appliedenergistics2.material.blank_pattern.name=Prázdné schéma +item.appliedenergistics2.material.calculation_processor.name=Výpočetní procesor +item.appliedenergistics2.material.card_capacity.name=Kapacitní karta +item.appliedenergistics2.material.card_fuzzy.name=Rozmazaná karta +item.appliedenergistics2.material.card_inverter.name=Měničová karta +item.appliedenergistics2.material.card_redstone.name=Ruditová karta +item.appliedenergistics2.material.card_speed.name=Akcelerační karta +item.appliedenergistics2.material.cell2_spatial_part.name=2³ Prostorový komponent +item.appliedenergistics2.material.cell16_spatial_part.name=16³ Prostorový komponent +item.appliedenergistics2.material.cell128_spatial_part.name=128³ Prostorový komponent +item.appliedenergistics2.material.cell1k_part.name=1k ME Úložný komponent +item.appliedenergistics2.material.cell4k_part.name=4k ME Úložný komponent +item.appliedenergistics2.material.cell16k_part.name=16k ME Úložný komponent +item.appliedenergistics2.material.cell64k_part.name=64k ME Úložný komponent +item.appliedenergistics2.material.certus_quartz_crystal.name=Krystal nakloněného křemene +item.appliedenergistics2.material.certus_quartz_crystal_charged.name=Nabitý krystal nakloněného křemene +item.appliedenergistics2.material.certus_quartz_dust.name=Prach nakloněného křemene +item.appliedenergistics2.material.empty_storage_cell.name=ME úložné pouzdro +item.appliedenergistics2.material.ender_dust.name=Prach z Endu +item.appliedenergistics2.material.engineering_processor.name=Inženýrský procesor +item.appliedenergistics2.material.flour.name=Mouka +item.appliedenergistics2.material.fluix_crystal.name=Fluixový krystal +item.appliedenergistics2.material.fluix_dust.name=Fluixový prach +item.appliedenergistics2.material.fluix_pearl.name=Fluixová perla +item.appliedenergistics2.material.formation_core.name=Formační jádro +item.appliedenergistics2.material.gold_dust.name=Zlatý prach +item.appliedenergistics2.material.iron_dust.name=Železný prach +item.appliedenergistics2.material.logic_processor.name=Logický procesor +item.appliedenergistics2.material.logic_processor_asm.name=Nedokončený logický procesor +item.appliedenergistics2.material.matter_ball.name=Hmotný míč +item.appliedenergistics2.material.nether_quartz_dust.name=Křemenný prach +item.appliedenergistics2.material.purified_certus_quartz_crystal.name=Čistý nahnutý křemenný krystal +item.appliedenergistics2.material.purified_fluix_crystal.name=Čistý Fluixový krystal +item.appliedenergistics2.material.purified_nether_quartz_crystal.name=Čistý křemenný krystal +item.appliedenergistics2.material.quantum_entangled_singularity.name=Kvantová zapletená singularita +item.appliedenergistics2.material.silicon.name=Křemík +item.appliedenergistics2.material.singularity.name=Singularita +item.appliedenergistics2.material.wireless.name=Bezdrátový přijímač +item.appliedenergistics2.material.wireless_booster.name=Bezdrátový posilovač +item.appliedenergistics2.material.wooden_gear.name=Dřevěné kolečko +item.appliedenergistics2.material.engineering_processor_press.name=Výtisk inženýrského zapisovače +item.appliedenergistics2.material.calculation_processor_press.name=Výtisk kalkulačního zapisovače +item.appliedenergistics2.material.logic_processor_press.name=Výtisk logického zapisovače +item.appliedenergistics2.material.engineering_processor_print.name=Vytisknutý inženýrský obvod +item.appliedenergistics2.material.calculation_processor_print.name=Vytisknutý kalkulační obvod +item.appliedenergistics2.material.logic_processor_print.name=Vytisknutý logický obvod +item.appliedenergistics2.material.silicon_press.name=Výtisk křemíkového zapisovače +item.appliedenergistics2.material.silicon_print.name=Vytisknutý křemík +item.appliedenergistics2.material.name_press.name=Výtisk jmenového zapisovače +item.appliedenergistics2.material.sky_dust.name=Prach nebeského kamene +item.appliedenergistics2.material.card_crafting.name=Výrobní karta -item.appliedenergistics2.multi_part.AnnihilationPlane.name=ME plocha zkázy -item.appliedenergistics2.multi_part.CableAnchor.name=Kabelová kotva -item.appliedenergistics2.multi_part.CableCovered.name=ME krytý kabel -item.appliedenergistics2.multi_part.CableGlass.name=ME skleněný kabel -item.appliedenergistics2.multi_part.CableSmart.name=ME chytrý kabel -item.appliedenergistics2.multi_part.CableDense.name=ME silný kabel -item.appliedenergistics2.multi_part.StorageMonitor.name=ME monitor úložiště -item.appliedenergistics2.multi_part.ConversionMonitor.name=ME konverzní monitor -item.appliedenergistics2.multi_part.CraftingTerminal.name=ME výrobní terminál -item.appliedenergistics2.multi_part.SemiDarkMonitor.name=Osvětlený panel -item.appliedenergistics2.multi_part.Monitor.name=Světlě osvětlený panel -item.appliedenergistics2.multi_part.DarkMonitor.name=Tmavě osvětlený panel -item.appliedenergistics2.multi_part.ExportBus.name=ME exportní sběrnice -item.appliedenergistics2.multi_part.FormationPlane.name=ME formační plocha -item.appliedenergistics2.multi_part.ImportBus.name=ME importní sběrnice -item.appliedenergistics2.multi_part.Interface.name=ME rozhraní -item.appliedenergistics2.multi_part.LevelEmitter.name=ME úrovňový vysílač -item.appliedenergistics2.multi_part.P2PTunnel.name=P2P tunel -item.appliedenergistics2.multi_part.PatternTerminal.name=ME terminál schémat -item.appliedenergistics2.multi_part.QuartzFiber.name=Křemenné vlákno -item.appliedenergistics2.multi_part.StorageBus.name=ME úložná sběrnice -item.appliedenergistics2.multi_part.Terminal.name=ME terminál -item.appliedenergistics2.multi_part.InvertedToggleBus.name=ME převrácená přepínaci sběrnice -item.appliedenergistics2.multi_part.ToggleBus.name=ME přepínací sběrnice -item.appliedenergistics2.multi_part.CraftingMonitor.name=ME výrobní monitor -item.appliedenergistics2.multi_part.InterfaceTerminal.name=ME terminál rozhraní +item.appliedenergistics2.multi_part.annihilation_plane.name=ME plocha zkázy +item.appliedenergistics2.multi_part.cable_anchor.name=Kabelová kotva +item.appliedenergistics2.multi_part.cable_covered.name=ME krytý kabel +item.appliedenergistics2.multi_part.cable_glass.name=ME skleněný kabel +item.appliedenergistics2.multi_part.cable_smart.name=ME chytrý kabel +item.appliedenergistics2.multi_part.cable_dense_smart.name=ME silný kabel +item.appliedenergistics2.multi_part.storage_monitor.name=ME monitor úložiště +item.appliedenergistics2.multi_part.conversion_monitor.name=ME konverzní monitor +item.appliedenergistics2.multi_part.crafting_terminal.name=ME výrobní terminál +item.appliedenergistics2.multi_part.semi_dark_monitor.name=Osvětlený panel +item.appliedenergistics2.multi_part.monitor.name=Světlě osvětlený panel +item.appliedenergistics2.multi_part.dark_monitor.name=Tmavě osvětlený panel +item.appliedenergistics2.multi_part.export_bus.name=ME exportní sběrnice +item.appliedenergistics2.multi_part.formation_plane.name=ME formační plocha +item.appliedenergistics2.multi_part.import_bus.name=ME importní sběrnice +item.appliedenergistics2.multi_part.interface.name=ME rozhraní +item.appliedenergistics2.multi_part.level_emitter.name=ME úrovňový vysílač +item.appliedenergistics2.multi_part.p2p_tunnel.name=P2P tunel +item.appliedenergistics2.multi_part.pattern_terminal.name=ME terminál schémat +item.appliedenergistics2.multi_part.quartz_fiber.name=Křemenné vlákno +item.appliedenergistics2.multi_part.storage_bus.name=ME úložná sběrnice +item.appliedenergistics2.multi_part.terminal.name=ME terminál +item.appliedenergistics2.multi_part.inverted_toggle_bus.name=ME převrácená přepínaci sběrnice +item.appliedenergistics2.multi_part.toggle_bus.name=ME přepínací sběrnice +item.appliedenergistics2.multi_part.crafting_monitor.name=ME výrobní monitor +item.appliedenergistics2.multi_part.interface_terminal.name=ME terminál rozhraní item.appliedenergistics2.spatial_storage_cell_128_cubed.name=128³ Prostorový úložný článek item.appliedenergistics2.spatial_storage_cell_16_cubed.name=16³ Prostorový úložný článek diff --git a/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang b/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang index 7e9e5de80..12c80aa5e 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang @@ -370,93 +370,93 @@ item.appliedenergistics2.encoded_pattern.name=Kodierte ME-Schablone item.appliedenergistics2.view_cell.name=Sichtzelle item.appliedenergistics2.facade.name=Kabelfassade -item.appliedenergistics2.crystal_seed.Certus.name=Certusquarzkeim -item.appliedenergistics2.crystal_seed.Nether.name=Netherquarzkeim -item.appliedenergistics2.crystal_seed.Fluix.name=Fluixkeim -item.appliedenergistics2.material.InvalidType.name=Dieses Item ist deaktiviert. -item.appliedenergistics2.material.AdvCard.name=Fortgeschrittene Karte -item.appliedenergistics2.material.AnnihilationCore.name=Annihilationskern -item.appliedenergistics2.material.BasicCard.name=Basiskarte -item.appliedenergistics2.material.BlankPattern.name=Leere Schablone -item.appliedenergistics2.material.CalcProcessor.name=Kalkulationsprozessor -item.appliedenergistics2.material.CardCapacity.name=Kapazitätskarte -item.appliedenergistics2.material.CardFuzzy.name=Ungenauigkeitskarte -item.appliedenergistics2.material.CardInverter.name=Umkehrungskarte -item.appliedenergistics2.material.CardRedstone.name=Redstone-Karte -item.appliedenergistics2.material.CardSpeed.name=Beschleunigungskarte -item.appliedenergistics2.material.Cell2SpatialPart.name=2³ Raumkomponente -item.appliedenergistics2.material.Cell16SpatialPart.name=16³ Raumkomponente -item.appliedenergistics2.material.Cell128SpatialPart.name=128³ Raumkomponente -item.appliedenergistics2.material.Cell1kPart.name=1k-ME-Speicherkomponente -item.appliedenergistics2.material.Cell4kPart.name=4k-ME-Speicherkomponente -item.appliedenergistics2.material.Cell16kPart.name=16k-ME-Speicherkomponente -item.appliedenergistics2.material.Cell64kPart.name=64k-ME-Speicherkomponente -item.appliedenergistics2.material.CertusQuartzCrystal.name=Certusquarzkristall -item.appliedenergistics2.material.CertusQuartzCrystalCharged.name=Geladener Certusquarzkristall -item.appliedenergistics2.material.CertusQuartzDust.name=Certusquarzstaub -item.appliedenergistics2.material.EmptyStorageCell.name=ME-Speichergehäuse -item.appliedenergistics2.material.EnderDust.name=Enderstaub -item.appliedenergistics2.material.EngProcessor.name=Konstruktionsprozessor -item.appliedenergistics2.material.Flour.name=Mehl -item.appliedenergistics2.material.FluixCrystal.name=Fluixkristall -item.appliedenergistics2.material.FluixDust.name=Fluixstaub -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.LogicProcessor.name=Logikprozessor -item.appliedenergistics2.material.LogicProcessorAsm.name=Unfertiger Logikprozessor -item.appliedenergistics2.material.MatterBall.name=Materieball -item.appliedenergistics2.material.NetherQuartzDust.name=Netherquarzstaub -item.appliedenergistics2.material.PurifiedCertusQuartzCrystal.name=Reiner Certusquarzkristall -item.appliedenergistics2.material.PurifiedFluixCrystal.name=Reiner Fluixkristall -item.appliedenergistics2.material.PurifiedNetherQuartzCrystal.name=Reiner Netherquarzkristall -item.appliedenergistics2.material.QESingularity.name=Quantenverschränkte Singularität -item.appliedenergistics2.material.Silicon.name=Silizium -item.appliedenergistics2.material.Singularity.name=Singularität -item.appliedenergistics2.material.Wireless.name=Drahtlosempfänger -item.appliedenergistics2.material.WirelessBooster.name=Drahtlosverstärker -item.appliedenergistics2.material.WoodenGear.name=Holzzahnrad -item.appliedenergistics2.material.EngProcessorPress.name=Gravur-Konstruktionsdruck -item.appliedenergistics2.material.CalcProcessorPress.name=Gravur-Kalkulationsdruck -item.appliedenergistics2.material.LogicProcessorPress.name=Gravur-Logikdruck -item.appliedenergistics2.material.EngProcessorPrint.name=Gedruckter Konstruktionsschaltkreis -item.appliedenergistics2.material.CalcProcessorPrint.name=Gedruckter Kalkulationsschaltkreis -item.appliedenergistics2.material.LogicProcessorPrint.name=Gedruckter Logikschaltkreis -item.appliedenergistics2.material.SiliconPress.name=Gravur-Siliziumdruck -item.appliedenergistics2.material.SiliconPrint.name=Gedrucktes Silizium -item.appliedenergistics2.material.NamePress.name=Schreiber-Namensdruck -item.appliedenergistics2.material.SkyDust.name=Himmelssteinstaub -item.appliedenergistics2.material.CardCrafting.name=Fertigungskarte +item.appliedenergistics2.crystal_seed.certus.name=Certusquarzkeim +item.appliedenergistics2.crystal_seed.nether.name=Netherquarzkeim +item.appliedenergistics2.crystal_seed.fluix.name=Fluixkeim +item.appliedenergistics2.material.invalid_type.name=Dieses Item ist deaktiviert. +item.appliedenergistics2.material.advanced_card.name=Fortgeschrittene Karte +item.appliedenergistics2.material.annihilation_core.name=Annihilationskern +item.appliedenergistics2.material.basic_card.name=Basiskarte +item.appliedenergistics2.material.blank_pattern.name=Leere Schablone +item.appliedenergistics2.material.calculation_processor.name=Kalkulationsprozessor +item.appliedenergistics2.material.card_capacity.name=Kapazitätskarte +item.appliedenergistics2.material.card_fuzzy.name=Ungenauigkeitskarte +item.appliedenergistics2.material.card_inverter.name=Umkehrungskarte +item.appliedenergistics2.material.card_redstone.name=Redstone-Karte +item.appliedenergistics2.material.card_speed.name=Beschleunigungskarte +item.appliedenergistics2.material.cell2_spatial_part.name=2³ Raumkomponente +item.appliedenergistics2.material.cell16_spatial_part.name=16³ Raumkomponente +item.appliedenergistics2.material.cell128_spatial_part.name=128³ Raumkomponente +item.appliedenergistics2.material.cell1k_part.name=1k-ME-Speicherkomponente +item.appliedenergistics2.material.cell4k_part.name=4k-ME-Speicherkomponente +item.appliedenergistics2.material.cell16k_part.name=16k-ME-Speicherkomponente +item.appliedenergistics2.material.cell64k_part.name=64k-ME-Speicherkomponente +item.appliedenergistics2.material.certus_quartz_crystal.name=Certusquarzkristall +item.appliedenergistics2.material.certus_quartz_crystal_charged.name=Geladener Certusquarzkristall +item.appliedenergistics2.material.certus_quartz_dust.name=Certusquarzstaub +item.appliedenergistics2.material.empty_storage_cell.name=ME-Speichergehäuse +item.appliedenergistics2.material.ender_dust.name=Enderstaub +item.appliedenergistics2.material.engineering_processor.name=Konstruktionsprozessor +item.appliedenergistics2.material.flour.name=Mehl +item.appliedenergistics2.material.fluix_crystal.name=Fluixkristall +item.appliedenergistics2.material.fluix_dust.name=Fluixstaub +item.appliedenergistics2.material.fluix_pearl.name=Fluixperle +item.appliedenergistics2.material.formation_core.name=Formationskern +item.appliedenergistics2.material.gold_dust.name=Goldstaub +item.appliedenergistics2.material.iron_dust.name=Eisenstaub +item.appliedenergistics2.material.logic_processor.name=Logikprozessor +item.appliedenergistics2.material.logic_processor_asm.name=Unfertiger Logikprozessor +item.appliedenergistics2.material.matter_ball.name=Materieball +item.appliedenergistics2.material.nether_quartz_dust.name=Netherquarzstaub +item.appliedenergistics2.material.purified_certus_quartz_crystal.name=Reiner Certusquarzkristall +item.appliedenergistics2.material.purified_fluix_crystal.name=Reiner Fluixkristall +item.appliedenergistics2.material.purified_nether_quartz_crystal.name=Reiner Netherquarzkristall +item.appliedenergistics2.material.quantum_entangled_singularity.name=Quantenverschränkte Singularität +item.appliedenergistics2.material.silicon.name=Silizium +item.appliedenergistics2.material.singularity.name=Singularität +item.appliedenergistics2.material.wireless.name=Drahtlosempfänger +item.appliedenergistics2.material.wireless_booster.name=Drahtlosverstärker +item.appliedenergistics2.material.wooden_gear.name=Holzzahnrad +item.appliedenergistics2.material.engineering_processor_press.name=Gravur-Konstruktionsdruck +item.appliedenergistics2.material.calculation_processor_press.name=Gravur-Kalkulationsdruck +item.appliedenergistics2.material.logic_processor_press.name=Gravur-Logikdruck +item.appliedenergistics2.material.engineering_processor_print.name=Gedruckter Konstruktionsschaltkreis +item.appliedenergistics2.material.calculation_processor_print.name=Gedruckter Kalkulationsschaltkreis +item.appliedenergistics2.material.logic_processor_print.name=Gedruckter Logikschaltkreis +item.appliedenergistics2.material.silicon_press.name=Gravur-Siliziumdruck +item.appliedenergistics2.material.silicon_print.name=Gedrucktes Silizium +item.appliedenergistics2.material.name_press.name=Schreiber-Namensdruck +item.appliedenergistics2.material.sky_dust.name=Himmelssteinstaub +item.appliedenergistics2.material.card_crafting.name=Fertigungskarte -item.appliedenergistics2.multi_part.AnnihilationPlane.name=ME-Annihilationsfeld -item.appliedenergistics2.multi_part.IdentityAnnihilationPlane.name=ME-Identitätsannihilationsfelds -item.appliedenergistics2.multi_part.CableAnchor.name=Kabelanker -item.appliedenergistics2.multi_part.CableCovered.name=Verdecktes ME-Kabel -item.appliedenergistics2.multi_part.CableGlass.name=ME-Glaskabel -item.appliedenergistics2.multi_part.CableSmart.name=Schlaues ME-Kabel -item.appliedenergistics2.multi_part.CableDense.name=Dichtes ME-Kabel -item.appliedenergistics2.multi_part.StorageMonitor.name=ME-Speichermonitor -item.appliedenergistics2.multi_part.ConversionMonitor.name=ME-Konversionsmonitor -item.appliedenergistics2.multi_part.CraftingTerminal.name=ME-Fertigungskonsole -item.appliedenergistics2.multi_part.SemiDarkMonitor.name=Leuchtfeld -item.appliedenergistics2.multi_part.Monitor.name=Helles Leuchtfeld -item.appliedenergistics2.multi_part.DarkMonitor.name=Dunkles Leuchtfeld -item.appliedenergistics2.multi_part.ExportBus.name=ME-Exportbus -item.appliedenergistics2.multi_part.FormationPlane.name=ME-Formationsfeld -item.appliedenergistics2.multi_part.ImportBus.name=ME-Importbus -item.appliedenergistics2.multi_part.Interface.name=ME-Schnittstelle -item.appliedenergistics2.multi_part.LevelEmitter.name=ME-Füllstandsemitter -item.appliedenergistics2.multi_part.P2PTunnel.name=P2P-Tunnel -item.appliedenergistics2.multi_part.PatternTerminal.name=ME-Schablonenkonsole -item.appliedenergistics2.multi_part.QuartzFiber.name=Quarzfaser -item.appliedenergistics2.multi_part.StorageBus.name=ME-Speicherbus -item.appliedenergistics2.multi_part.Terminal.name=ME-Konsole -item.appliedenergistics2.multi_part.InvertedToggleBus.name=Invertierter schaltbarer ME-Bus -item.appliedenergistics2.multi_part.ToggleBus.name=Schaltbarer ME-Bus -item.appliedenergistics2.multi_part.CraftingMonitor.name=ME-Fertigungsmonitor -item.appliedenergistics2.multi_part.InterfaceTerminal.name=ME-Schnittstellenkonsole -item.appliedenergistics2.multi_part.InvalidType.name=Deaktiviertes Item +item.appliedenergistics2.multi_part.annihilation_plane.name=ME-Annihilationsfeld +item.appliedenergistics2.multi_part.identity_annihilation_plane.name=ME-Identitätsannihilationsfelds +item.appliedenergistics2.multi_part.cable_anchor.name=Kabelanker +item.appliedenergistics2.multi_part.cable_covered.name=Verdecktes ME-Kabel +item.appliedenergistics2.multi_part.cable_glass.name=ME-Glaskabel +item.appliedenergistics2.multi_part.cable_smart.name=Schlaues ME-Kabel +item.appliedenergistics2.multi_part.cable_dense_smart.name=Dichtes ME-Kabel +item.appliedenergistics2.multi_part.storage_monitor.name=ME-Speichermonitor +item.appliedenergistics2.multi_part.conversion_monitor.name=ME-Konversionsmonitor +item.appliedenergistics2.multi_part.crafting_terminal.name=ME-Fertigungskonsole +item.appliedenergistics2.multi_part.semi_dark_monitor.name=Leuchtfeld +item.appliedenergistics2.multi_part.monitor.name=Helles Leuchtfeld +item.appliedenergistics2.multi_part.dark_monitor.name=Dunkles Leuchtfeld +item.appliedenergistics2.multi_part.export_bus.name=ME-Exportbus +item.appliedenergistics2.multi_part.formation_plane.name=ME-Formationsfeld +item.appliedenergistics2.multi_part.import_bus.name=ME-Importbus +item.appliedenergistics2.multi_part.interface.name=ME-Schnittstelle +item.appliedenergistics2.multi_part.level_emitter.name=ME-Füllstandsemitter +item.appliedenergistics2.multi_part.p2p_tunnel.name=P2P-Tunnel +item.appliedenergistics2.multi_part.pattern_terminal.name=ME-Schablonenkonsole +item.appliedenergistics2.multi_part.quartz_fiber.name=Quarzfaser +item.appliedenergistics2.multi_part.storage_bus.name=ME-Speicherbus +item.appliedenergistics2.multi_part.terminal.name=ME-Konsole +item.appliedenergistics2.multi_part.inverted_toggle_bus.name=Invertierter schaltbarer ME-Bus +item.appliedenergistics2.multi_part.toggle_bus.name=Schaltbarer ME-Bus +item.appliedenergistics2.multi_part.crafting_monitor.name=ME-Fertigungsmonitor +item.appliedenergistics2.multi_part.interface_terminal.name=ME-Schnittstellenkonsole +item.appliedenergistics2.multi_part.invalid_type.name=Deaktiviertes Item item.appliedenergistics2.spatial_storage_cell_128_cubed.name=128³-Raumspeicherzelle item.appliedenergistics2.spatial_storage_cell_16_cubed.name=16³-Raumspeicherzelle diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang index 3d2771241..0e8657510 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang @@ -392,97 +392,97 @@ item.appliedenergistics2.encoded_pattern.name=Encoded Pattern item.appliedenergistics2.view_cell.name=View Cell item.appliedenergistics2.facade.name=Cable Facade -item.appliedenergistics2.crystal_seed.Certus.name=Certus Quartz Seed -item.appliedenergistics2.crystal_seed.Nether.name=Nether Quartz Seed -item.appliedenergistics2.crystal_seed.Fluix.name=Fluix Seed -item.appliedenergistics2.material.InvalidType.name=This Item Is Disabled. -item.appliedenergistics2.material.AdvCard.name=Advanced Card -item.appliedenergistics2.material.AnnihilationCore.name=Annihilation Core -item.appliedenergistics2.material.BasicCard.name=Basic Card -item.appliedenergistics2.material.BlankPattern.name=Blank Pattern -item.appliedenergistics2.material.CalcProcessor.name=Calculation Processor -item.appliedenergistics2.material.CardCapacity.name=Capacity Card -item.appliedenergistics2.material.CardFuzzy.name=Fuzzy Card -item.appliedenergistics2.material.CardInverter.name=Inverter Card -item.appliedenergistics2.material.CardRedstone.name=Redstone Card -item.appliedenergistics2.material.CardSpeed.name=Acceleration Card -item.appliedenergistics2.material.Cell2SpatialPart.name=2³ Spatial Component -item.appliedenergistics2.material.Cell16SpatialPart.name=16³ Spatial Component -item.appliedenergistics2.material.Cell128SpatialPart.name=128³ Spatial Component -item.appliedenergistics2.material.Cell1kPart.name=1k ME Storage Component -item.appliedenergistics2.material.Cell4kPart.name=4k ME Storage Component -item.appliedenergistics2.material.Cell16kPart.name=16k ME Storage Component -item.appliedenergistics2.material.Cell64kPart.name=64k ME Storage Component -item.appliedenergistics2.material.CertusQuartzCrystal.name=Certus Quartz Crystal -item.appliedenergistics2.material.CertusQuartzCrystalCharged.name=Charged Certus Quartz Crystal -item.appliedenergistics2.material.CertusQuartzDust.name=Certus Quartz Dust -item.appliedenergistics2.material.EmptyStorageCell.name=ME Storage Housing -item.appliedenergistics2.material.EnderDust.name=Ender Dust -item.appliedenergistics2.material.EngProcessor.name=Engineering Processor -item.appliedenergistics2.material.Flour.name=Flour -item.appliedenergistics2.material.FluixCrystal.name=Fluix Crystal -item.appliedenergistics2.material.FluixDust.name=Fluix Dust -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.LogicProcessor.name=Logic Processor -item.appliedenergistics2.material.LogicProcessorAsm.name=Unfinished Logic Processor -item.appliedenergistics2.material.MatterBall.name=Matter Ball -item.appliedenergistics2.material.NetherQuartzDust.name=Nether Quartz Dust -item.appliedenergistics2.material.PurifiedCertusQuartzCrystal.name=Pure Certus Quartz Crystal -item.appliedenergistics2.material.PurifiedFluixCrystal.name=Pure Fluix Crystal -item.appliedenergistics2.material.PurifiedNetherQuartzCrystal.name=Pure Nether Quartz Crystal -item.appliedenergistics2.material.QESingularity.name=Quantum Entangled Singularity -item.appliedenergistics2.material.Silicon.name=Silicon -item.appliedenergistics2.material.Singularity.name=Singularity -item.appliedenergistics2.material.Wireless.name=Wireless Receiver -item.appliedenergistics2.material.WirelessBooster.name=Wireless Booster -item.appliedenergistics2.material.WoodenGear.name=Wooden Gear -item.appliedenergistics2.material.EngProcessorPress.name=Inscriber Engineering Press -item.appliedenergistics2.material.CalcProcessorPress.name=Inscriber Calculation Press -item.appliedenergistics2.material.LogicProcessorPress.name=Inscriber Logic Press -item.appliedenergistics2.material.EngProcessorPrint.name=Printed Engineering Circuit -item.appliedenergistics2.material.CalcProcessorPrint.name=Printed Calculation Circuit -item.appliedenergistics2.material.LogicProcessorPrint.name=Printed Logic Circuit -item.appliedenergistics2.material.SiliconPress.name=Inscriber Silicon Press -item.appliedenergistics2.material.SiliconPrint.name=Printed Silicon -item.appliedenergistics2.material.NamePress.name=Inscriber Name Press -item.appliedenergistics2.material.SkyDust.name=Sky Stone Dust -item.appliedenergistics2.material.CardCrafting.name=Crafting Card +item.appliedenergistics2.crystal_seed.certus.name=Certus Quartz Seed +item.appliedenergistics2.crystal_seed.nether.name=Nether Quartz Seed +item.appliedenergistics2.crystal_seed.fluix.name=Fluix Seed +item.appliedenergistics2.material.invalid_type.name=This Item Is Disabled. +item.appliedenergistics2.material.advanced_card.name=Advanced Card +item.appliedenergistics2.material.annihilation_core.name=Annihilation Core +item.appliedenergistics2.material.basic_card.name=Basic Card +item.appliedenergistics2.material.blank_pattern.name=Blank Pattern +item.appliedenergistics2.material.calculation_processor.name=Calculation Processor +item.appliedenergistics2.material.card_capacity.name=Capacity Card +item.appliedenergistics2.material.card_fuzzy.name=Fuzzy Card +item.appliedenergistics2.material.card_inverter.name=Inverter Card +item.appliedenergistics2.material.card_redstone.name=Redstone Card +item.appliedenergistics2.material.card_speed.name=Acceleration Card +item.appliedenergistics2.material.cell2_spatial_part.name=2? Spatial Component +item.appliedenergistics2.material.cell16_spatial_part.name=16? Spatial Component +item.appliedenergistics2.material.cell128_spatial_part.name=128? Spatial Component +item.appliedenergistics2.material.cell1k_part.name=1k ME Storage Component +item.appliedenergistics2.material.cell4k_part.name=4k ME Storage Component +item.appliedenergistics2.material.cell16k_part.name=16k ME Storage Component +item.appliedenergistics2.material.cell64k_part.name=64k ME Storage Component +item.appliedenergistics2.material.certus_quartz_crystal.name=Certus Quartz Crystal +item.appliedenergistics2.material.certus_quartz_crystal_charged.name=Charged Certus Quartz Crystal +item.appliedenergistics2.material.certus_quartz_dust.name=Certus Quartz Dust +item.appliedenergistics2.material.empty_storage_cell.name=ME Storage Housing +item.appliedenergistics2.material.ender_dust.name=Ender Dust +item.appliedenergistics2.material.engineering_processor.name=Engineering Processor +item.appliedenergistics2.material.flour.name=Flour +item.appliedenergistics2.material.fluix_crystal.name=Fluix Crystal +item.appliedenergistics2.material.fluix_dust.name=Fluix Dust +item.appliedenergistics2.material.fluix_pearl.name=Fluix Pearl +item.appliedenergistics2.material.formation_core.name=Formation Core +item.appliedenergistics2.material.gold_dust.name=Gold Dust +item.appliedenergistics2.material.iron_dust.name=Iron Dust +item.appliedenergistics2.material.logic_processor.name=Logic Processor +item.appliedenergistics2.material.logic_processor_asm.name=Unfinished Logic Processor +item.appliedenergistics2.material.matter_ball.name=Matter Ball +item.appliedenergistics2.material.nether_quartz_dust.name=Nether Quartz Dust +item.appliedenergistics2.material.purified_certus_quartz_crystal.name=Pure Certus Quartz Crystal +item.appliedenergistics2.material.purified_fluix_crystal.name=Pure Fluix Crystal +item.appliedenergistics2.material.purified_nether_quartz_crystal.name=Pure Nether Quartz Crystal +item.appliedenergistics2.material.quantum_entangled_singularity.name=Quantum Entangled Singularity +item.appliedenergistics2.material.silicon.name=Silicon +item.appliedenergistics2.material.singularity.name=Singularity +item.appliedenergistics2.material.wireless.name=Wireless Receiver +item.appliedenergistics2.material.wireless_booster.name=Wireless Booster +item.appliedenergistics2.material.wooden_gear.name=Wooden Gear +item.appliedenergistics2.material.engineering_processor_press.name=Inscriber Engineering Press +item.appliedenergistics2.material.calculation_processor_press.name=Inscriber Calculation Press +item.appliedenergistics2.material.logic_processor_press.name=Inscriber Logic Press +item.appliedenergistics2.material.engineering_processor_print.name=Printed Engineering Circuit +item.appliedenergistics2.material.calculation_processor_print.name=Printed Calculation Circuit +item.appliedenergistics2.material.logic_processor_print.name=Printed Logic Circuit +item.appliedenergistics2.material.silicon_press.name=Inscriber Silicon Press +item.appliedenergistics2.material.silicon_print.name=Printed Silicon +item.appliedenergistics2.material.name_press.name=Inscriber Name Press +item.appliedenergistics2.material.sky_dust.name=Sky Stone Dust +item.appliedenergistics2.material.card_crafting.name=Crafting Card -item.appliedenergistics2.multi_part.AnnihilationPlane.name=ME Annihilation Plane -item.appliedenergistics2.multi_part.IdentityAnnihilationPlane.name=ME Identity Annihilation Plane -item.appliedenergistics2.multi_part.CableAnchor.name=Cable Anchor -item.appliedenergistics2.multi_part.CableCovered.name=ME Covered Cable -item.appliedenergistics2.multi_part.CableGlass.name=ME Glass Cable -item.appliedenergistics2.multi_part.CableSmart.name=ME Smart Cable -item.appliedenergistics2.multi_part.CableDense.name=ME Dense Cable -item.appliedenergistics2.multi_part.StorageMonitor.name=ME Storage Monitor -item.appliedenergistics2.multi_part.ConversionMonitor.name=ME Conversion Monitor -item.appliedenergistics2.multi_part.CraftingTerminal.name=ME Crafting Terminal -item.appliedenergistics2.multi_part.SemiDarkMonitor.name=Illuminated Panel -item.appliedenergistics2.multi_part.Monitor.name=Bright Illuminated Panel -item.appliedenergistics2.multi_part.DarkMonitor.name=Dark Illuminated Panel -item.appliedenergistics2.multi_part.ExportBus.name=ME Export Bus -item.appliedenergistics2.multi_part.FormationPlane.name=ME Formation Plane -item.appliedenergistics2.multi_part.ImportBus.name=ME Import Bus -item.appliedenergistics2.multi_part.Interface.name=ME Interface -item.appliedenergistics2.multi_part.LevelEmitter.name=ME Level Emitter -item.appliedenergistics2.multi_part.P2PTunnel.name=P2P Tunnel -item.appliedenergistics2.multi_part.PatternTerminal.name=ME Pattern Terminal -item.appliedenergistics2.multi_part.QuartzFiber.name=Quartz Fiber -item.appliedenergistics2.multi_part.StorageBus.name=ME Storage Bus -item.appliedenergistics2.multi_part.Terminal.name=ME Terminal -item.appliedenergistics2.multi_part.InvertedToggleBus.name=ME Inverted Toggle Bus -item.appliedenergistics2.multi_part.ToggleBus.name=ME Toggle Bus -item.appliedenergistics2.multi_part.CraftingMonitor.name=ME Crafting Monitor -item.appliedenergistics2.multi_part.InterfaceTerminal.name=ME Interface Terminal -item.appliedenergistics2.multi_part.InvalidType.name=Disabled Item +item.appliedenergistics2.multi_part.annihilation_plane.name=ME Annihilation Plane +item.appliedenergistics2.multi_part.identity_annihilation_plane.name=ME Identity Annihilation Plane +item.appliedenergistics2.multi_part.cable_anchor.name=Cable Anchor +item.appliedenergistics2.multi_part.cable_covered.name=ME Covered Cable +item.appliedenergistics2.multi_part.cable_glass.name=ME Glass Cable +item.appliedenergistics2.multi_part.cable_smart.name=ME Smart Cable +item.appliedenergistics2.multi_part.cable_dense_smart.name=ME Dense Smart Cable +item.appliedenergistics2.multi_part.storage_monitor.name=ME Storage Monitor +item.appliedenergistics2.multi_part.conversion_monitor.name=ME Conversion Monitor +item.appliedenergistics2.multi_part.crafting_terminal.name=ME Crafting Terminal +item.appliedenergistics2.multi_part.semi_dark_monitor.name=Illuminated Panel +item.appliedenergistics2.multi_part.monitor.name=Bright Illuminated Panel +item.appliedenergistics2.multi_part.dark_monitor.name=Dark Illuminated Panel +item.appliedenergistics2.multi_part.export_bus.name=ME Export Bus +item.appliedenergistics2.multi_part.formation_plane.name=ME Formation Plane +item.appliedenergistics2.multi_part.import_bus.name=ME Import Bus +item.appliedenergistics2.multi_part.interface.name=ME Interface +item.appliedenergistics2.multi_part.level_emitter.name=ME Level Emitter +item.appliedenergistics2.multi_part.p2p_tunnel.name=P2P Tunnel +item.appliedenergistics2.multi_part.pattern_terminal.name=ME Pattern Terminal +item.appliedenergistics2.multi_part.quartz_fiber.name=Quartz Fiber +item.appliedenergistics2.multi_part.storage_bus.name=ME Storage Bus +item.appliedenergistics2.multi_part.terminal.name=ME Terminal +item.appliedenergistics2.multi_part.inverted_toggle_bus.name=ME Inverted Toggle Bus +item.appliedenergistics2.multi_part.toggle_bus.name=ME Toggle Bus +item.appliedenergistics2.multi_part.crafting_monitor.name=ME Crafting Monitor +item.appliedenergistics2.multi_part.interface_terminal.name=ME Interface Terminal +item.appliedenergistics2.multi_part.invalid_type.name=Disabled Item -item.appliedenergistics2.spatial_storage_cell_128_cubed.name=128³ Spatial Storage Cell -item.appliedenergistics2.spatial_storage_cell_16_cubed.name=16³ Spatial Storage Cell -item.appliedenergistics2.spatial_storage_cell_2_cubed.name=2³ Spatial Storage Cell +item.appliedenergistics2.spatial_storage_cell_128_cubed.name=128? Spatial Storage Cell +item.appliedenergistics2.spatial_storage_cell_16_cubed.name=16? Spatial Storage Cell +item.appliedenergistics2.spatial_storage_cell_2_cubed.name=2? Spatial Storage Cell item.appliedenergistics2.certus_quartz_axe.name=Certus Quartz Axe item.appliedenergistics2.certus_quartz_cutting_knife.name=Certus Quartz Cutting Knife diff --git a/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang b/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang index a59d67c20..4a1c5af5b 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang @@ -303,90 +303,90 @@ item.appliedenergistics2.encoded_pattern.name=Patrón Codificado item.appliedenergistics2.view_cell.name=Celda de Visión item.appliedenergistics2.facade.name=Fachada de Cable -item.appliedenergistics2.crystal_seed.Certus.name=Semilla de Cuarzo Certus -item.appliedenergistics2.crystal_seed.Nether.name=Semilla de Cuarzo -item.appliedenergistics2.crystal_seed.Fluix.name=Semilla de Fluix -item.appliedenergistics2.material.AdvCard.name=Tarjeta Avanzada -item.appliedenergistics2.material.AnnihilationCore.name=Núcleo de Absorción -item.appliedenergistics2.material.BasicCard.name=Tarjeta Básica -item.appliedenergistics2.material.BlankPattern.name=Patrón en Blanco -item.appliedenergistics2.material.CalcProcessor.name=Procesador de Calculo -item.appliedenergistics2.material.CardCapacity.name=Tarjeta de Capacidad -item.appliedenergistics2.material.CardFuzzy.name=Tarjeta Difusa -item.appliedenergistics2.material.CardInverter.name=Tarjeta Inversora -item.appliedenergistics2.material.CardRedstone.name=Tarjeta de Redstone -item.appliedenergistics2.material.CardSpeed.name=Tarjeta de Aceleración -item.appliedenergistics2.material.Cell2SpatialPart.name=2³ Componente Espacial -item.appliedenergistics2.material.Cell16SpatialPart.name=16³ Componente Espacial -item.appliedenergistics2.material.Cell128SpatialPart.name=128³ Componente Espacial -item.appliedenergistics2.material.Cell1kPart.name=1k ME Componente de Almacenamiento -item.appliedenergistics2.material.Cell4kPart.name=4k ME Componente de Almacenamiento -item.appliedenergistics2.material.Cell16kPart.name=16k ME Componente de Almacenamiento -item.appliedenergistics2.material.Cell64kPart.name=64k ME Componente de Almacenamiento -item.appliedenergistics2.material.CertusQuartzCrystal.name=Cristal de Cuarzo Certus -item.appliedenergistics2.material.CertusQuartzCrystalCharged.name=Cristal de Cuarzo Certus Cargado -item.appliedenergistics2.material.CertusQuartzDust.name=Polvo de Cuarzo Certus -item.appliedenergistics2.material.EmptyStorageCell.name=ME Carcasa de Almacenamiento -item.appliedenergistics2.material.EnderDust.name=Polvo de Ender -item.appliedenergistics2.material.EngProcessor.name=Procesador de Ingeniería -item.appliedenergistics2.material.Flour.name=Harina -item.appliedenergistics2.material.FluixCrystal.name=Cristal de Fluix -item.appliedenergistics2.material.FluixDust.name=Polvo de Fluix -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.LogicProcessor.name=Procesador Lógico -item.appliedenergistics2.material.LogicProcessorAsm.name=Procesador Lógico sin Acabar -item.appliedenergistics2.material.MatterBall.name=Bola de Materia -item.appliedenergistics2.material.NetherQuartzDust.name=Polvo de Cuarzo -item.appliedenergistics2.material.PurifiedCertusQuartzCrystal.name=Cristal de Cuarzo Certus Puro -item.appliedenergistics2.material.PurifiedFluixCrystal.name=Cristal de Fluix Puro -item.appliedenergistics2.material.PurifiedNetherQuartzCrystal.name=Cristal de Cuarzo Puro -item.appliedenergistics2.material.QESingularity.name=Singularidad Cuantica Enlazada -item.appliedenergistics2.material.Silicon.name=Silicona -item.appliedenergistics2.material.Singularity.name=Singularidad -item.appliedenergistics2.material.Wireless.name=Receptor Inalámbrico -item.appliedenergistics2.material.WirelessBooster.name=Potenciador Inalámbrico -item.appliedenergistics2.material.WoodenGear.name=Engranaje de Madera -item.appliedenergistics2.material.EngProcessorPress.name=Prensa de Circuito de Ingeniería -item.appliedenergistics2.material.CalcProcessorPress.name=Prensa de Circuito de Cálculo -item.appliedenergistics2.material.LogicProcessorPress.name=Prensa de Circuito Lógico -item.appliedenergistics2.material.EngProcessorPrint.name=Circuito de Ingeniería Impreso -item.appliedenergistics2.material.CalcProcessorPrint.name=Circuito de Cálculo Impreso -item.appliedenergistics2.material.LogicProcessorPrint.name=Circuito Lógico Impreso -item.appliedenergistics2.material.SiliconPress.name=Prensa de Silicona -item.appliedenergistics2.material.SiliconPrint.name=Silicona Impresa -item.appliedenergistics2.material.NamePress.name=Prensa de Nombres -item.appliedenergistics2.material.SkyDust.name=Polvo de Piedra del Cielo -item.appliedenergistics2.material.CardCrafting.name=Tarjeta de Trabajo +item.appliedenergistics2.crystal_seed.certus.name=Semilla de Cuarzo Certus +item.appliedenergistics2.crystal_seed.nether.name=Semilla de Cuarzo +item.appliedenergistics2.crystal_seed.fluix.name=Semilla de Fluix +item.appliedenergistics2.material.advanced_card.name=Tarjeta Avanzada +item.appliedenergistics2.material.annihilation_core.name=Núcleo de Absorción +item.appliedenergistics2.material.basic_card.name=Tarjeta Básica +item.appliedenergistics2.material.blank_pattern.name=Patrón en Blanco +item.appliedenergistics2.material.calculation_processor.name=Procesador de Calculo +item.appliedenergistics2.material.card_capacity.name=Tarjeta de Capacidad +item.appliedenergistics2.material.card_fuzzy.name=Tarjeta Difusa +item.appliedenergistics2.material.card_inverter.name=Tarjeta Inversora +item.appliedenergistics2.material.card_redstone.name=Tarjeta de Redstone +item.appliedenergistics2.material.card_speed.name=Tarjeta de Aceleración +item.appliedenergistics2.material.cell2_spatial_part.name=2³ Componente Espacial +item.appliedenergistics2.material.cell16_spatial_part.name=16³ Componente Espacial +item.appliedenergistics2.material.cell128_spatial_part.name=128³ Componente Espacial +item.appliedenergistics2.material.cell1k_part.name=1k ME Componente de Almacenamiento +item.appliedenergistics2.material.cell4k_part.name=4k ME Componente de Almacenamiento +item.appliedenergistics2.material.cell16k_part.name=16k ME Componente de Almacenamiento +item.appliedenergistics2.material.cell64k_part.name=64k ME Componente de Almacenamiento +item.appliedenergistics2.material.certus_quartz_crystal.name=Cristal de Cuarzo Certus +item.appliedenergistics2.material.certus_quartz_crystal_charged.name=Cristal de Cuarzo Certus Cargado +item.appliedenergistics2.material.certus_quartz_dust.name=Polvo de Cuarzo Certus +item.appliedenergistics2.material.empty_storage_cell.name=ME Carcasa de Almacenamiento +item.appliedenergistics2.material.ender_dust.name=Polvo de Ender +item.appliedenergistics2.material.engineering_processor.name=Procesador de Ingeniería +item.appliedenergistics2.material.flour.name=Harina +item.appliedenergistics2.material.fluix_crystal.name=Cristal de Fluix +item.appliedenergistics2.material.fluix_dust.name=Polvo de Fluix +item.appliedenergistics2.material.fluix_pearl.name=Perla de Fluix +item.appliedenergistics2.material.formation_core.name=Núcleo de Formación +item.appliedenergistics2.material.gold_dust.name=Polvo de Oro +item.appliedenergistics2.material.iron_dust.name=Polvo de Hierro +item.appliedenergistics2.material.logic_processor.name=Procesador Lógico +item.appliedenergistics2.material.logic_processor_asm.name=Procesador Lógico sin Acabar +item.appliedenergistics2.material.matter_ball.name=Bola de Materia +item.appliedenergistics2.material.nether_quartz_dust.name=Polvo de Cuarzo +item.appliedenergistics2.material.purified_certus_quartz_crystal.name=Cristal de Cuarzo Certus Puro +item.appliedenergistics2.material.purified_fluix_crystal.name=Cristal de Fluix Puro +item.appliedenergistics2.material.purified_nether_quartz_crystal.name=Cristal de Cuarzo Puro +item.appliedenergistics2.material.quantum_entangled_singularity.name=Singularidad Cuantica Enlazada +item.appliedenergistics2.material.silicon.name=Silicona +item.appliedenergistics2.material.singularity.name=Singularidad +item.appliedenergistics2.material.wireless.name=Receptor Inalámbrico +item.appliedenergistics2.material.wireless_booster.name=Potenciador Inalámbrico +item.appliedenergistics2.material.wooden_gear.name=Engranaje de Madera +item.appliedenergistics2.material.engineering_processor_press.name=Prensa de Circuito de Ingeniería +item.appliedenergistics2.material.calculation_processor_press.name=Prensa de Circuito de Cálculo +item.appliedenergistics2.material.logic_processor_press.name=Prensa de Circuito Lógico +item.appliedenergistics2.material.engineering_processor_print.name=Circuito de Ingeniería Impreso +item.appliedenergistics2.material.calculation_processor_print.name=Circuito de Cálculo Impreso +item.appliedenergistics2.material.logic_processor_print.name=Circuito Lógico Impreso +item.appliedenergistics2.material.silicon_press.name=Prensa de Silicona +item.appliedenergistics2.material.silicon_print.name=Silicona Impresa +item.appliedenergistics2.material.name_press.name=Prensa de Nombres +item.appliedenergistics2.material.sky_dust.name=Polvo de Piedra del Cielo +item.appliedenergistics2.material.card_crafting.name=Tarjeta de Trabajo -item.appliedenergistics2.multi_part.AnnihilationPlane.name=ME Panel de Absorción -item.appliedenergistics2.multi_part.CableAnchor.name=Ancla de Cable -item.appliedenergistics2.multi_part.CableCovered.name=ME Cable Cubierto -item.appliedenergistics2.multi_part.CableGlass.name=ME Cable de Cristal -item.appliedenergistics2.multi_part.CableSmart.name=ME Cable Avanzado -item.appliedenergistics2.multi_part.CableDense.name=ME Cable Denso -item.appliedenergistics2.multi_part.StorageMonitor.name=ME Monitor de Almacenamiento -item.appliedenergistics2.multi_part.ConversionMonitor.name=ME Monitor de Conversión -item.appliedenergistics2.multi_part.CraftingTerminal.name=ME Terminal de Trabajo -item.appliedenergistics2.multi_part.SemiDarkMonitor.name=Panel Iluminado -item.appliedenergistics2.multi_part.Monitor.name=Panel Iluminado Claro -item.appliedenergistics2.multi_part.DarkMonitor.name=Panel Iluminado Oscuro -item.appliedenergistics2.multi_part.ExportBus.name=ME Bus de Exportación -item.appliedenergistics2.multi_part.FormationPlane.name=ME Panel de Formación -item.appliedenergistics2.multi_part.ImportBus.name=ME Bus de Importación -item.appliedenergistics2.multi_part.Interface.name=ME Interfaz -item.appliedenergistics2.multi_part.LevelEmitter.name=ME Emisor -item.appliedenergistics2.multi_part.P2PTunnel.name=Tunel P2P -item.appliedenergistics2.multi_part.PatternTerminal.name=ME Terminal de Patrones -item.appliedenergistics2.multi_part.QuartzFiber.name=Fibra de Cuarzo -item.appliedenergistics2.multi_part.StorageBus.name=ME Bus de Almacenamiento -item.appliedenergistics2.multi_part.Terminal.name=ME Terminal -item.appliedenergistics2.multi_part.InvertedToggleBus.name=ME Bus de Cambio Inverso -item.appliedenergistics2.multi_part.ToggleBus.name=ME Bus de Cambio -item.appliedenergistics2.multi_part.CraftingMonitor.name=ME Monitor de Trabajo -item.appliedenergistics2.multi_part.InterfaceTerminal.name=ME Terminal de Interfaces +item.appliedenergistics2.multi_part.annihilation_plane.name=ME Panel de Absorción +item.appliedenergistics2.multi_part.cable_anchor.name=Ancla de Cable +item.appliedenergistics2.multi_part.cable_covered.name=ME Cable Cubierto +item.appliedenergistics2.multi_part.cable_glass.name=ME Cable de Cristal +item.appliedenergistics2.multi_part.cable_smart.name=ME Cable Avanzado +item.appliedenergistics2.multi_part.cable_dense_smart.name=ME Cable Denso +item.appliedenergistics2.multi_part.storage_monitor.name=ME Monitor de Almacenamiento +item.appliedenergistics2.multi_part.conversion_monitor.name=ME Monitor de Conversión +item.appliedenergistics2.multi_part.crafting_terminal.name=ME Terminal de Trabajo +item.appliedenergistics2.multi_part.semi_dark_monitor.name=Panel Iluminado +item.appliedenergistics2.multi_part.monitor.name=Panel Iluminado Claro +item.appliedenergistics2.multi_part.dark_monitor.name=Panel Iluminado Oscuro +item.appliedenergistics2.multi_part.export_bus.name=ME Bus de Exportación +item.appliedenergistics2.multi_part.formation_plane.name=ME Panel de Formación +item.appliedenergistics2.multi_part.import_bus.name=ME Bus de Importación +item.appliedenergistics2.multi_part.interface.name=ME Interfaz +item.appliedenergistics2.multi_part.level_emitter.name=ME Emisor +item.appliedenergistics2.multi_part.p2p_tunnel.name=Tunel P2P +item.appliedenergistics2.multi_part.pattern_terminal.name=ME Terminal de Patrones +item.appliedenergistics2.multi_part.quartz_fiber.name=Fibra de Cuarzo +item.appliedenergistics2.multi_part.storage_bus.name=ME Bus de Almacenamiento +item.appliedenergistics2.multi_part.terminal.name=ME Terminal +item.appliedenergistics2.multi_part.inverted_toggle_bus.name=ME Bus de Cambio Inverso +item.appliedenergistics2.multi_part.toggle_bus.name=ME Bus de Cambio +item.appliedenergistics2.multi_part.crafting_monitor.name=ME Monitor de Trabajo +item.appliedenergistics2.multi_part.interface_terminal.name=ME Terminal de Interfaces item.appliedenergistics2.spatial_storage_cell_128_cubed.name=128³ Unidad de Almacenamiento Espacial item.appliedenergistics2.spatial_storage_cell_16_cubed.name=16³ Unidad de Almacenamiento Espacial diff --git a/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang b/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang index 3007e64d8..95ac34319 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang @@ -367,93 +367,93 @@ item.appliedenergistics2.encoded_pattern.name=Modèle encodé item.appliedenergistics2.view_cell.name=Cellule de visualisation item.appliedenergistics2.facade.name=Façade de câble -item.appliedenergistics2.crystal_seed.Certus.name=Graine de Quartz Certus -item.appliedenergistics2.crystal_seed.Nether.name=Graine de Quartz du Nether -item.appliedenergistics2.crystal_seed.Fluix.name=Graine de Fluix -item.appliedenergistics2.material.InvalidType.name=Cet objet est désactivé. -item.appliedenergistics2.material.AdvCard.name=Carte avancée -item.appliedenergistics2.material.AnnihilationCore.name=Noyau d'annihilation -item.appliedenergistics2.material.BasicCard.name=Carte basique -item.appliedenergistics2.material.BlankPattern.name=Modèle vide -item.appliedenergistics2.material.CalcProcessor.name=Processeur de calcul -item.appliedenergistics2.material.CardCapacity.name=Carte de capacité -item.appliedenergistics2.material.CardFuzzy.name=Carte brouillonne -item.appliedenergistics2.material.CardInverter.name=Carte d'inversion -item.appliedenergistics2.material.CardRedstone.name=Carte de Redstone -item.appliedenergistics2.material.CardSpeed.name=Carte d'accélération -item.appliedenergistics2.material.Cell2SpatialPart.name=Composant spatial 2³ -item.appliedenergistics2.material.Cell16SpatialPart.name=Composant spatial 16³ -item.appliedenergistics2.material.Cell128SpatialPart.name=Composant spatial 128³ -item.appliedenergistics2.material.Cell1kPart.name=Composant de stockage ME 1k -item.appliedenergistics2.material.Cell4kPart.name=Composant de stockage ME 4k -item.appliedenergistics2.material.Cell16kPart.name=Composant de stockage ME 16k -item.appliedenergistics2.material.Cell64kPart.name=Composant de stockage ME 64k -item.appliedenergistics2.material.CertusQuartzCrystal.name=Cristal de Quartz Certus -item.appliedenergistics2.material.CertusQuartzCrystalCharged.name=Cristal de Quartz Certus chargé -item.appliedenergistics2.material.CertusQuartzDust.name=Poussière de Quartz Certus -item.appliedenergistics2.material.EmptyStorageCell.name=Boîtier de stockage ME -item.appliedenergistics2.material.EnderDust.name=Poussière d'Ender -item.appliedenergistics2.material.EngProcessor.name=Processeur d'ingénierie -item.appliedenergistics2.material.Flour.name=Farine -item.appliedenergistics2.material.FluixCrystal.name=Cristal de Fluix -item.appliedenergistics2.material.FluixDust.name=Poussière de Fluix -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.LogicProcessor.name=Processeur logique -item.appliedenergistics2.material.LogicProcessorAsm.name=Processeur logique inachevé -item.appliedenergistics2.material.MatterBall.name=Bille de matière -item.appliedenergistics2.material.NetherQuartzDust.name=Poussière de Quartz du Nether -item.appliedenergistics2.material.PurifiedCertusQuartzCrystal.name=Cristal de Quartz Certus pur -item.appliedenergistics2.material.PurifiedFluixCrystal.name=Cristal de Fluix pur -item.appliedenergistics2.material.PurifiedNetherQuartzCrystal.name=Cristal de Quartz du Nether pur -item.appliedenergistics2.material.QESingularity.name=Singularité quantique intriquée -item.appliedenergistics2.material.Silicon.name=Silicone -item.appliedenergistics2.material.Singularity.name=Singularité -item.appliedenergistics2.material.Wireless.name=Récepteur sans-fil -item.appliedenergistics2.material.WirelessBooster.name=Boosteur de signal -item.appliedenergistics2.material.WoodenGear.name=Engrenage en bois -item.appliedenergistics2.material.EngProcessorPress.name=Matrice de presse d'ingénierie -item.appliedenergistics2.material.CalcProcessorPress.name=Matrice de presse de calcul -item.appliedenergistics2.material.LogicProcessorPress.name=Matrice de presse de logique -item.appliedenergistics2.material.EngProcessorPrint.name=Circuit imprimé d'ingénierie -item.appliedenergistics2.material.CalcProcessorPrint.name=Circuit imprimé de calcul -item.appliedenergistics2.material.LogicProcessorPrint.name=Circuit imprimé de logique -item.appliedenergistics2.material.SiliconPress.name=Matrice de presse de silicone -item.appliedenergistics2.material.SiliconPrint.name=Silicone imprimé -item.appliedenergistics2.material.NamePress.name=Matrice de presse de nommage -item.appliedenergistics2.material.SkyDust.name=Poussière de pierre du ciel -item.appliedenergistics2.material.CardCrafting.name=Carte de fabrication +item.appliedenergistics2.crystal_seed.certus.name=Graine de Quartz Certus +item.appliedenergistics2.crystal_seed.nether.name=Graine de Quartz du Nether +item.appliedenergistics2.crystal_seed.fluix.name=Graine de Fluix +item.appliedenergistics2.material.invalid_type.name=Cet objet est désactivé. +item.appliedenergistics2.material.advanced_card.name=Carte avancée +item.appliedenergistics2.material.annihilation_core.name=Noyau d'annihilation +item.appliedenergistics2.material.basic_card.name=Carte basique +item.appliedenergistics2.material.blank_pattern.name=Modèle vide +item.appliedenergistics2.material.calculation_processor.name=Processeur de calcul +item.appliedenergistics2.material.card_capacity.name=Carte de capacité +item.appliedenergistics2.material.card_fuzzy.name=Carte brouillonne +item.appliedenergistics2.material.card_inverter.name=Carte d'inversion +item.appliedenergistics2.material.card_redstone.name=Carte de Redstone +item.appliedenergistics2.material.card_speed.name=Carte d'accélération +item.appliedenergistics2.material.cell2_spatial_part.name=Composant spatial 2³ +item.appliedenergistics2.material.cell16_spatial_part.name=Composant spatial 16³ +item.appliedenergistics2.material.cell128_spatial_part.name=Composant spatial 128³ +item.appliedenergistics2.material.cell1k_part.name=Composant de stockage ME 1k +item.appliedenergistics2.material.cell4k_part.name=Composant de stockage ME 4k +item.appliedenergistics2.material.cell16k_part.name=Composant de stockage ME 16k +item.appliedenergistics2.material.cell64k_part.name=Composant de stockage ME 64k +item.appliedenergistics2.material.certus_quartz_crystal.name=Cristal de Quartz Certus +item.appliedenergistics2.material.certus_quartz_crystal_charged.name=Cristal de Quartz Certus chargé +item.appliedenergistics2.material.certus_quartz_dust.name=Poussière de Quartz Certus +item.appliedenergistics2.material.empty_storage_cell.name=Boîtier de stockage ME +item.appliedenergistics2.material.ender_dust.name=Poussière d'Ender +item.appliedenergistics2.material.engineering_processor.name=Processeur d'ingénierie +item.appliedenergistics2.material.flour.name=Farine +item.appliedenergistics2.material.fluix_crystal.name=Cristal de Fluix +item.appliedenergistics2.material.fluix_dust.name=Poussière de Fluix +item.appliedenergistics2.material.fluix_pearl.name=Perle de Fluix +item.appliedenergistics2.material.formation_core.name=Noyau de formation +item.appliedenergistics2.material.gold_dust.name=Poussière d'or +item.appliedenergistics2.material.iron_dust.name=Poussière de fer +item.appliedenergistics2.material.logic_processor.name=Processeur logique +item.appliedenergistics2.material.logic_processor_asm.name=Processeur logique inachevé +item.appliedenergistics2.material.matter_ball.name=Bille de matière +item.appliedenergistics2.material.nether_quartz_dust.name=Poussière de Quartz du Nether +item.appliedenergistics2.material.purified_certus_quartz_crystal.name=Cristal de Quartz Certus pur +item.appliedenergistics2.material.purified_fluix_crystal.name=Cristal de Fluix pur +item.appliedenergistics2.material.purified_nether_quartz_crystal.name=Cristal de Quartz du Nether pur +item.appliedenergistics2.material.quantum_entangled_singularity.name=Singularité quantique intriquée +item.appliedenergistics2.material.silicon.name=Silicone +item.appliedenergistics2.material.singularity.name=Singularité +item.appliedenergistics2.material.wireless.name=Récepteur sans-fil +item.appliedenergistics2.material.wireless_booster.name=Boosteur de signal +item.appliedenergistics2.material.wooden_gear.name=Engrenage en bois +item.appliedenergistics2.material.engineering_processor_press.name=Matrice de presse d'ingénierie +item.appliedenergistics2.material.calculation_processor_press.name=Matrice de presse de calcul +item.appliedenergistics2.material.logic_processor_press.name=Matrice de presse de logique +item.appliedenergistics2.material.engineering_processor_print.name=Circuit imprimé d'ingénierie +item.appliedenergistics2.material.calculation_processor_print.name=Circuit imprimé de calcul +item.appliedenergistics2.material.logic_processor_print.name=Circuit imprimé de logique +item.appliedenergistics2.material.silicon_press.name=Matrice de presse de silicone +item.appliedenergistics2.material.silicon_print.name=Silicone imprimé +item.appliedenergistics2.material.name_press.name=Matrice de presse de nommage +item.appliedenergistics2.material.sky_dust.name=Poussière de pierre du ciel +item.appliedenergistics2.material.card_crafting.name=Carte de fabrication -item.appliedenergistics2.multi_part.AnnihilationPlane.name=Plan de dématérialisation ME -item.appliedenergistics2.multi_part.IdentityAnnihilationPlane.name=Plan de dématérialisation d'identité ME -item.appliedenergistics2.multi_part.CableAnchor.name=Ancre de câble -item.appliedenergistics2.multi_part.CableCovered.name=Câble couvert ME -item.appliedenergistics2.multi_part.CableGlass.name=Câble de verre ME -item.appliedenergistics2.multi_part.CableSmart.name=Câble intelligent ME -item.appliedenergistics2.multi_part.CableDense.name=Câble dense ME -item.appliedenergistics2.multi_part.StorageMonitor.name=Moniteur de stockage ME -item.appliedenergistics2.multi_part.ConversionMonitor.name=Moniteur de conversion ME -item.appliedenergistics2.multi_part.CraftingTerminal.name=Terminal de fabrication ME -item.appliedenergistics2.multi_part.SemiDarkMonitor.name=Panneau illuminé -item.appliedenergistics2.multi_part.Monitor.name=Panneau illuminé éclairé -item.appliedenergistics2.multi_part.DarkMonitor.name=Panneau illuminé sombre -item.appliedenergistics2.multi_part.ExportBus.name=Bus d'export ME -item.appliedenergistics2.multi_part.FormationPlane.name=Plan de matérialisation ME -item.appliedenergistics2.multi_part.ImportBus.name=Bus d'import ME -item.appliedenergistics2.multi_part.Interface.name=Interface ME -item.appliedenergistics2.multi_part.LevelEmitter.name=Emetteur de niveau ME -item.appliedenergistics2.multi_part.P2PTunnel.name=Tunnel P2P -item.appliedenergistics2.multi_part.PatternTerminal.name=Terminal de modèles ME -item.appliedenergistics2.multi_part.QuartzFiber.name=Fibre de Quartz -item.appliedenergistics2.multi_part.StorageBus.name=Bus de stockage ME -item.appliedenergistics2.multi_part.Terminal.name=Terminal ME -item.appliedenergistics2.multi_part.InvertedToggleBus.name=Bus levier inversé ME -item.appliedenergistics2.multi_part.ToggleBus.name=Bus levier ME -item.appliedenergistics2.multi_part.CraftingMonitor.name=Moniteur des fabrications ME -item.appliedenergistics2.multi_part.InterfaceTerminal.name=Terminal d'interface ME -item.appliedenergistics2.multi_part.InvalidType.name=Éléments désactivés +item.appliedenergistics2.multi_part.annihilation_plane.name=Plan de dématérialisation ME +item.appliedenergistics2.multi_part.identity_annihilation_plane.name=Plan de dématérialisation d'identité ME +item.appliedenergistics2.multi_part.cable_anchor.name=Ancre de câble +item.appliedenergistics2.multi_part.cable_covered.name=Câble couvert ME +item.appliedenergistics2.multi_part.cable_glass.name=Câble de verre ME +item.appliedenergistics2.multi_part.cable_smart.name=Câble intelligent ME +item.appliedenergistics2.multi_part.cable_dense_smart.name=Câble dense ME +item.appliedenergistics2.multi_part.storage_monitor.name=Moniteur de stockage ME +item.appliedenergistics2.multi_part.conversion_monitor.name=Moniteur de conversion ME +item.appliedenergistics2.multi_part.crafting_terminal.name=Terminal de fabrication ME +item.appliedenergistics2.multi_part.semi_dark_monitor.name=Panneau illuminé +item.appliedenergistics2.multi_part.monitor.name=Panneau illuminé éclairé +item.appliedenergistics2.multi_part.dark_monitor.name=Panneau illuminé sombre +item.appliedenergistics2.multi_part.export_bus.name=Bus d'export ME +item.appliedenergistics2.multi_part.formation_plane.name=Plan de matérialisation ME +item.appliedenergistics2.multi_part.import_bus.name=Bus d'import ME +item.appliedenergistics2.multi_part.interface.name=Interface ME +item.appliedenergistics2.multi_part.level_emitter.name=Emetteur de niveau ME +item.appliedenergistics2.multi_part.p2p_tunnel.name=Tunnel P2P +item.appliedenergistics2.multi_part.pattern_terminal.name=Terminal de modèles ME +item.appliedenergistics2.multi_part.quartz_fiber.name=Fibre de Quartz +item.appliedenergistics2.multi_part.storage_bus.name=Bus de stockage ME +item.appliedenergistics2.multi_part.terminal.name=Terminal ME +item.appliedenergistics2.multi_part.inverted_toggle_bus.name=Bus levier inversé ME +item.appliedenergistics2.multi_part.toggle_bus.name=Bus levier ME +item.appliedenergistics2.multi_part.crafting_monitor.name=Moniteur des fabrications ME +item.appliedenergistics2.multi_part.interface_terminal.name=Terminal d'interface ME +item.appliedenergistics2.multi_part.invalid_type.name=Éléments désactivés item.appliedenergistics2.spatial_storage_cell_128_cubed.name=Disque spatiale de 128³ item.appliedenergistics2.spatial_storage_cell_16_cubed.name=Disque spatiale de 16³ diff --git a/src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang b/src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang index 1700850e6..e4db79331 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang @@ -378,7 +378,7 @@ item.appliedenergistics2.ItemFacade.name=Kábel Látszat item.appliedenergistics2.ItemCrystalSeed.Certus.name=Certus Kvarc Mag item.appliedenergistics2.ItemCrystalSeed.Nether.name=Alvilági Kvarc Mag item.appliedenergistics2.ItemCrystalSeed.Fluix.name=Fluix Mag -item.appliedenergistics2.ItemMaterial.InvalidType.name=Ez a tárgy tiltva van. +item.appliedenergistics2.ItemMaterial.invalid_type.name=Ez a tárgy tiltva van. item.appliedenergistics2.ItemMaterial.AdvCard.name=Fejlett Kártya item.appliedenergistics2.ItemMaterial.AnnihilationCore.name=Megsemmisítő Mag item.appliedenergistics2.ItemMaterial.BasicCard.name=Egyszerű Kártya @@ -461,7 +461,7 @@ item.appliedenergistics2.ItemPart.InvertedToggleBus.name=ME Invertált Kapcsoló item.appliedenergistics2.ItemPart.ToggleBus.name=ME Kapcsoló Busz item.appliedenergistics2.ItemPart.CraftingMonitor.name=ME Barkácsoló Monitor item.appliedenergistics2.ItemPart.InterfaceTerminal.name=ME Interfész Terminál -item.appliedenergistics2.ItemPart.InvalidType.name=Tiltott Tárgy +item.appliedenergistics2.ItemPart.invalid_type.name=Tiltott Tárgy item.appliedenergistics2.ItemSpatialStorageCell.128Cubed.name=128³ Térbeli Tároló Cella item.appliedenergistics2.ItemSpatialStorageCell.16Cubed.name=16³ Térbeli Tároló Cella diff --git a/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang b/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang index 99f9f4531..ae363b231 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang @@ -350,91 +350,91 @@ item.appliedenergistics2.encoded_pattern.name=Modello Codificato item.appliedenergistics2.view_cell.name=Cella olografica item.appliedenergistics2.facade.name=Facciata per cavo -item.appliedenergistics2.crystal_seed.Certus.name=Seme di quarzo certus -item.appliedenergistics2.crystal_seed.Nether.name=Seme di quarzo degli Inferi -item.appliedenergistics2.crystal_seed.Fluix.name=Seme di fluix -item.appliedenergistics2.material.InvalidType.name=Quest'oggetto è disabilitato. -item.appliedenergistics2.material.AdvCard.name=Scheda avanzata -item.appliedenergistics2.material.AnnihilationCore.name=Nucleo di annientamento -item.appliedenergistics2.material.BasicCard.name=Scheda base -item.appliedenergistics2.material.BlankPattern.name=Modello vuoto -item.appliedenergistics2.material.CalcProcessor.name=Processore di calcolo -item.appliedenergistics2.material.CardCapacity.name=Sceda per capacità -item.appliedenergistics2.material.CardFuzzy.name=Scheda vaga -item.appliedenergistics2.material.CardInverter.name=Scheda invertita -item.appliedenergistics2.material.CardRedstone.name=Sceda pietrarossa -item.appliedenergistics2.material.CardSpeed.name=Sceda acceleratore -item.appliedenergistics2.material.Cell2SpatialPart.name=Componente per spazio da 2³ -item.appliedenergistics2.material.Cell16SpatialPart.name=Componente per spazio da 16³ -item.appliedenergistics2.material.Cell128SpatialPart.name=Componente per spazio da 128³ -item.appliedenergistics2.material.Cell1kPart.name=Componente per immagazzinaggio da 1k ME -item.appliedenergistics2.material.Cell4kPart.name=Componente per immagazzinaggio da 4k ME -item.appliedenergistics2.material.Cell16kPart.name=Componente per immagazzinaggio da 16k ME -item.appliedenergistics2.material.Cell64kPart.name=Componente per immagazzinaggio da 64k ME -item.appliedenergistics2.material.CertusQuartzCrystal.name=Cristallo di quarzo certus -item.appliedenergistics2.material.CertusQuartzCrystalCharged.name=Cristallo di quarzo certus carico -item.appliedenergistics2.material.CertusQuartzDust.name=Polvere di quarzo certus -item.appliedenergistics2.material.EmptyStorageCell.name=Custodia per cella ME -item.appliedenergistics2.material.EnderDust.name=Polvere d'omega -item.appliedenergistics2.material.EngProcessor.name=Processore di ingegneria -item.appliedenergistics2.material.Flour.name=Farina -item.appliedenergistics2.material.FluixCrystal.name=Cristallo di Fluix -item.appliedenergistics2.material.FluixDust.name=Polvere di Fluix -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.LogicProcessor.name=Processore logico -item.appliedenergistics2.material.LogicProcessorAsm.name=Processore logico incompleto -item.appliedenergistics2.material.MatterBall.name=Sfera di materia -item.appliedenergistics2.material.NetherQuartzDust.name=Polvere di quarzo degli Inferi -item.appliedenergistics2.material.PurifiedCertusQuartzCrystal.name=Cristallo di quarzo certus puro -item.appliedenergistics2.material.PurifiedFluixCrystal.name=Cristallo di fluix puro -item.appliedenergistics2.material.PurifiedNetherQuartzCrystal.name=Cristallo di quarzo degli Inferi puro -item.appliedenergistics2.material.QESingularity.name=Singolarità quantistico incrociato -item.appliedenergistics2.material.Silicon.name=Silicone -item.appliedenergistics2.material.Singularity.name=Singolarità -item.appliedenergistics2.material.Wireless.name=Ricevitore wireless -item.appliedenergistics2.material.WirelessBooster.name=Amplificatori wireless -item.appliedenergistics2.material.WoodenGear.name=Ingranaggio di legno -item.appliedenergistics2.material.EngProcessorPress.name=Stampo di ingegneria per incisore -item.appliedenergistics2.material.CalcProcessorPress.name=Stampo di calcolo per incisore -item.appliedenergistics2.material.LogicProcessorPress.name=Stampo di logica per incisore -item.appliedenergistics2.material.EngProcessorPrint.name=Circuito di ingegneria stampato -item.appliedenergistics2.material.CalcProcessorPrint.name=Circuito di calcolo stampato -item.appliedenergistics2.material.LogicProcessorPrint.name=Circuito di logica stampato -item.appliedenergistics2.material.SiliconPress.name=Stampo di silicone per incisore -item.appliedenergistics2.material.SiliconPrint.name=Silicone stampato -item.appliedenergistics2.material.NamePress.name=Stampo di nomi per incisore -item.appliedenergistics2.material.SkyDust.name=Polvere di roccia del cielo -item.appliedenergistics2.material.CardCrafting.name=Scheda di fabbricazione +item.appliedenergistics2.crystal_seed.certus.name=Seme di quarzo certus +item.appliedenergistics2.crystal_seed.nether.name=Seme di quarzo degli Inferi +item.appliedenergistics2.crystal_seed.fluix.name=Seme di fluix +item.appliedenergistics2.material.invalid_type.name=Quest'oggetto è disabilitato. +item.appliedenergistics2.material.advanced_card.name=Scheda avanzata +item.appliedenergistics2.material.annihilation_core.name=Nucleo di annientamento +item.appliedenergistics2.material.basic_card.name=Scheda base +item.appliedenergistics2.material.blank_pattern.name=Modello vuoto +item.appliedenergistics2.material.calculation_processor.name=Processore di calcolo +item.appliedenergistics2.material.card_capacity.name=Sceda per capacità +item.appliedenergistics2.material.card_fuzzy.name=Scheda vaga +item.appliedenergistics2.material.card_inverter.name=Scheda invertita +item.appliedenergistics2.material.card_redstone.name=Sceda pietrarossa +item.appliedenergistics2.material.card_speed.name=Sceda acceleratore +item.appliedenergistics2.material.cell2_spatial_part.name=Componente per spazio da 2³ +item.appliedenergistics2.material.cell16_spatial_part.name=Componente per spazio da 16³ +item.appliedenergistics2.material.cell128_spatial_part.name=Componente per spazio da 128³ +item.appliedenergistics2.material.cell1k_part.name=Componente per immagazzinaggio da 1k ME +item.appliedenergistics2.material.cell4k_part.name=Componente per immagazzinaggio da 4k ME +item.appliedenergistics2.material.cell16k_part.name=Componente per immagazzinaggio da 16k ME +item.appliedenergistics2.material.cell64k_part.name=Componente per immagazzinaggio da 64k ME +item.appliedenergistics2.material.certus_quartz_crystal.name=Cristallo di quarzo certus +item.appliedenergistics2.material.certus_quartz_crystal_charged.name=Cristallo di quarzo certus carico +item.appliedenergistics2.material.certus_quartz_dust.name=Polvere di quarzo certus +item.appliedenergistics2.material.empty_storage_cell.name=Custodia per cella ME +item.appliedenergistics2.material.ender_dust.name=Polvere d'omega +item.appliedenergistics2.material.engineering_processor.name=Processore di ingegneria +item.appliedenergistics2.material.flour.name=Farina +item.appliedenergistics2.material.fluix_crystal.name=Cristallo di Fluix +item.appliedenergistics2.material.fluix_dust.name=Polvere di Fluix +item.appliedenergistics2.material.fluix_pearl.name=Perla di Fluix +item.appliedenergistics2.material.formation_core.name=Nucleo di formazione +item.appliedenergistics2.material.gold_dust.name=Polvere d'oro +item.appliedenergistics2.material.iron_dust.name=Polvere di ferro +item.appliedenergistics2.material.logic_processor.name=Processore logico +item.appliedenergistics2.material.logic_processor_asm.name=Processore logico incompleto +item.appliedenergistics2.material.matter_ball.name=Sfera di materia +item.appliedenergistics2.material.nether_quartz_dust.name=Polvere di quarzo degli Inferi +item.appliedenergistics2.material.purified_certus_quartz_crystal.name=Cristallo di quarzo certus puro +item.appliedenergistics2.material.purified_fluix_crystal.name=Cristallo di fluix puro +item.appliedenergistics2.material.purified_nether_quartz_crystal.name=Cristallo di quarzo degli Inferi puro +item.appliedenergistics2.material.quantum_entangled_singularity.name=Singolarità quantistico incrociato +item.appliedenergistics2.material.silicon.name=Silicone +item.appliedenergistics2.material.singularity.name=Singolarità +item.appliedenergistics2.material.wireless.name=Ricevitore wireless +item.appliedenergistics2.material.wireless_booster.name=Amplificatori wireless +item.appliedenergistics2.material.wooden_gear.name=Ingranaggio di legno +item.appliedenergistics2.material.engineering_processor_press.name=Stampo di ingegneria per incisore +item.appliedenergistics2.material.calculation_processor_press.name=Stampo di calcolo per incisore +item.appliedenergistics2.material.logic_processor_press.name=Stampo di logica per incisore +item.appliedenergistics2.material.engineering_processor_print.name=Circuito di ingegneria stampato +item.appliedenergistics2.material.calculation_processor_print.name=Circuito di calcolo stampato +item.appliedenergistics2.material.logic_processor_print.name=Circuito di logica stampato +item.appliedenergistics2.material.silicon_press.name=Stampo di silicone per incisore +item.appliedenergistics2.material.silicon_print.name=Silicone stampato +item.appliedenergistics2.material.name_press.name=Stampo di nomi per incisore +item.appliedenergistics2.material.sky_dust.name=Polvere di roccia del cielo +item.appliedenergistics2.material.card_crafting.name=Scheda di fabbricazione -item.appliedenergistics2.multi_part.AnnihilationPlane.name=Piano annientatore ME -item.appliedenergistics2.multi_part.CableAnchor.name=Ancoraggio per cavi -item.appliedenergistics2.multi_part.CableCovered.name=Cavo comperto ME -item.appliedenergistics2.multi_part.CableGlass.name=Cavo di vetro ME -item.appliedenergistics2.multi_part.CableSmart.name=Cavo intelligente ME -item.appliedenergistics2.multi_part.CableDense.name=Cavo denso ME -item.appliedenergistics2.multi_part.StorageMonitor.name=Monitor per deposito ME -item.appliedenergistics2.multi_part.ConversionMonitor.name=Monitor convertitore ME -item.appliedenergistics2.multi_part.CraftingTerminal.name=Terminale con banco da lavoro ME -item.appliedenergistics2.multi_part.SemiDarkMonitor.name=Pannello illuminato -item.appliedenergistics2.multi_part.Monitor.name=Pannello illuminato chiaro -item.appliedenergistics2.multi_part.DarkMonitor.name=Pannello illuminato scuro -item.appliedenergistics2.multi_part.ExportBus.name=Bus esportatore ME -item.appliedenergistics2.multi_part.FormationPlane.name=Piano di formazione ME -item.appliedenergistics2.multi_part.ImportBus.name=Bus importatore ME -item.appliedenergistics2.multi_part.Interface.name=Interfaccia ME -item.appliedenergistics2.multi_part.LevelEmitter.name=Emettitore di pietrarossa ME -item.appliedenergistics2.multi_part.P2PTunnel.name=P2P Tunnel -item.appliedenergistics2.multi_part.PatternTerminal.name=Terminale per modelli ME -item.appliedenergistics2.multi_part.QuartzFiber.name=Fibra quarzo -item.appliedenergistics2.multi_part.StorageBus.name=Bus di immagazzinaggio ME -item.appliedenergistics2.multi_part.Terminal.name=Terminale ME -item.appliedenergistics2.multi_part.InvertedToggleBus.name=Bus alternatore inverso ME -item.appliedenergistics2.multi_part.ToggleBus.name=Bus alternatore ME -item.appliedenergistics2.multi_part.CraftingMonitor.name=Monitor per fabbricazione ME -item.appliedenergistics2.multi_part.InterfaceTerminal.name=Terminale con interfaccia ME +item.appliedenergistics2.multi_part.annihilation_plane.name=Piano annientatore ME +item.appliedenergistics2.multi_part.cable_anchor.name=Ancoraggio per cavi +item.appliedenergistics2.multi_part.cable_covered.name=Cavo comperto ME +item.appliedenergistics2.multi_part.cable_glass.name=Cavo di vetro ME +item.appliedenergistics2.multi_part.cable_smart.name=Cavo intelligente ME +item.appliedenergistics2.multi_part.cable_dense_smart.name=Cavo denso ME +item.appliedenergistics2.multi_part.storage_monitor.name=Monitor per deposito ME +item.appliedenergistics2.multi_part.conversion_monitor.name=Monitor convertitore ME +item.appliedenergistics2.multi_part.crafting_terminal.name=Terminale con banco da lavoro ME +item.appliedenergistics2.multi_part.semi_dark_monitor.name=Pannello illuminato +item.appliedenergistics2.multi_part.monitor.name=Pannello illuminato chiaro +item.appliedenergistics2.multi_part.dark_monitor.name=Pannello illuminato scuro +item.appliedenergistics2.multi_part.export_bus.name=Bus esportatore ME +item.appliedenergistics2.multi_part.formation_plane.name=Piano di formazione ME +item.appliedenergistics2.multi_part.import_bus.name=Bus importatore ME +item.appliedenergistics2.multi_part.interface.name=Interfaccia ME +item.appliedenergistics2.multi_part.level_emitter.name=Emettitore di pietrarossa ME +item.appliedenergistics2.multi_part.p2p_tunnel.name=P2P Tunnel +item.appliedenergistics2.multi_part.pattern_terminal.name=Terminale per modelli ME +item.appliedenergistics2.multi_part.quartz_fiber.name=Fibra quarzo +item.appliedenergistics2.multi_part.storage_bus.name=Bus di immagazzinaggio ME +item.appliedenergistics2.multi_part.terminal.name=Terminale ME +item.appliedenergistics2.multi_part.inverted_toggle_bus.name=Bus alternatore inverso ME +item.appliedenergistics2.multi_part.toggle_bus.name=Bus alternatore ME +item.appliedenergistics2.multi_part.crafting_monitor.name=Monitor per fabbricazione ME +item.appliedenergistics2.multi_part.interface_terminal.name=Terminale con interfaccia ME item.appliedenergistics2.spatial_storage_cell_128_cubed.name=Cella di immagazzinaggio per spazio da 128³ item.appliedenergistics2.spatial_storage_cell_16_cubed.name=Cella di immagazzinaggio per spazio da 16³ diff --git a/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang b/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang index 574d305b3..d763a108b 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang @@ -329,91 +329,91 @@ item.appliedenergistics2.encoded_pattern.name=쓰여진 패턴 item.appliedenergistics2.view_cell.name=View Cell item.appliedenergistics2.facade.name=케이블 덮개 -item.appliedenergistics2.crystal_seed.Certus.name=세투스 석영 씨앗 -item.appliedenergistics2.crystal_seed.Nether.name=지옥 석영 씨앗 -item.appliedenergistics2.crystal_seed.Fluix.name=액정 씨앗 -item.appliedenergistics2.material.InvalidType.name=이 아이템은 비활성화됨 -item.appliedenergistics2.material.AdvCard.name=Advanced Card -item.appliedenergistics2.material.AnnihilationCore.name=Annihilation Core -item.appliedenergistics2.material.BasicCard.name=기본 카드 -item.appliedenergistics2.material.BlankPattern.name=빈 패턴 -item.appliedenergistics2.material.CalcProcessor.name=Calculation Processor -item.appliedenergistics2.material.CardCapacity.name=Capacity Card -item.appliedenergistics2.material.CardFuzzy.name=Fuzzy Card -item.appliedenergistics2.material.CardInverter.name=Inverter Card -item.appliedenergistics2.material.CardRedstone.name=레드스톤 카드 -item.appliedenergistics2.material.CardSpeed.name=Acceleration Card -item.appliedenergistics2.material.Cell2SpatialPart.name=2³ 시공 요소 -item.appliedenergistics2.material.Cell16SpatialPart.name=16³ 시공 요소 -item.appliedenergistics2.material.Cell128SpatialPart.name=128³ 시공 요소 -item.appliedenergistics2.material.Cell1kPart.name=1k ME 저장 요소 -item.appliedenergistics2.material.Cell4kPart.name=4k ME 저장 요소 -item.appliedenergistics2.material.Cell16kPart.name=16k ME 저장 요소 -item.appliedenergistics2.material.Cell64kPart.name=64k ME 저장 요소 -item.appliedenergistics2.material.CertusQuartzCrystal.name=세투스 석영 결정체 -item.appliedenergistics2.material.CertusQuartzCrystalCharged.name=충전된 세투스 석영 결정체 -item.appliedenergistics2.material.CertusQuartzDust.name=세투스 석영 가루 -item.appliedenergistics2.material.EmptyStorageCell.name=빈 ME 저장 셀 -item.appliedenergistics2.material.EnderDust.name=엔더 가루 -item.appliedenergistics2.material.EngProcessor.name=공학 처리기 -item.appliedenergistics2.material.Flour.name=Flour -item.appliedenergistics2.material.FluixCrystal.name=액정 결정체 -item.appliedenergistics2.material.FluixDust.name=액정 가루 -item.appliedenergistics2.material.FluixPearl.name=액정 진주 -item.appliedenergistics2.material.FormationCore.name=형성 코어 -item.appliedenergistics2.material.GoldDust.name=금 가루 -item.appliedenergistics2.material.IronDust.name=철 가루 -item.appliedenergistics2.material.LogicProcessor.name=논리 처리기 -item.appliedenergistics2.material.LogicProcessorAsm.name=미완성된 논리 처리기 -item.appliedenergistics2.material.MatterBall.name=물질 공 -item.appliedenergistics2.material.NetherQuartzDust.name=지옥 석영 가루 -item.appliedenergistics2.material.PurifiedCertusQuartzCrystal.name=순수한 세투스 석영 결정체 -item.appliedenergistics2.material.PurifiedFluixCrystal.name=순수한 액정 결정체 -item.appliedenergistics2.material.PurifiedNetherQuartzCrystal.name=순수한 지옥 석영 결정체 -item.appliedenergistics2.material.QESingularity.name=양자얽힘 특이점 -item.appliedenergistics2.material.Silicon.name=실리콘 -item.appliedenergistics2.material.Singularity.name=특이점 -item.appliedenergistics2.material.Wireless.name=무선 수신기 -item.appliedenergistics2.material.WirelessBooster.name=무선 기지국 -item.appliedenergistics2.material.WoodenGear.name=나무 톱니바퀴 -item.appliedenergistics2.material.EngProcessorPress.name=공학 회로 프레스 -item.appliedenergistics2.material.CalcProcessorPress.name=계산 회로 프레스 -item.appliedenergistics2.material.LogicProcessorPress.name=논리 회로 프레스 -item.appliedenergistics2.material.EngProcessorPrint.name=인쇄된 공학 회로 -item.appliedenergistics2.material.CalcProcessorPrint.name=인쇄된 계산 회로 -item.appliedenergistics2.material.LogicProcessorPrint.name=인쇄된 논리 회로 -item.appliedenergistics2.material.SiliconPress.name=실리콘 프레스 -item.appliedenergistics2.material.SiliconPrint.name=인쇄된 실리콘 -item.appliedenergistics2.material.NamePress.name=이름 프레스 -item.appliedenergistics2.material.SkyDust.name=천령석 가루 -item.appliedenergistics2.material.CardCrafting.name=조합 카드 +item.appliedenergistics2.crystal_seed.certus.name=세투스 석영 씨앗 +item.appliedenergistics2.crystal_seed.nether.name=지옥 석영 씨앗 +item.appliedenergistics2.crystal_seed.fluix.name=액정 씨앗 +item.appliedenergistics2.material.invalid_type.name=이 아이템은 비활성화됨 +item.appliedenergistics2.material.advanced_card.name=Advanced Card +item.appliedenergistics2.material.annihilation_core.name=Annihilation Core +item.appliedenergistics2.material.basic_card.name=기본 카드 +item.appliedenergistics2.material.blank_pattern.name=빈 패턴 +item.appliedenergistics2.material.calculation_processor.name=Calculation Processor +item.appliedenergistics2.material.card_capacity.name=Capacity Card +item.appliedenergistics2.material.card_fuzzy.name=Fuzzy Card +item.appliedenergistics2.material.card_inverter.name=Inverter Card +item.appliedenergistics2.material.card_redstone.name=레드스톤 카드 +item.appliedenergistics2.material.card_speed.name=Acceleration Card +item.appliedenergistics2.material.cell2_spatial_part.name=2³ 시공 요소 +item.appliedenergistics2.material.cell16_spatial_part.name=16³ 시공 요소 +item.appliedenergistics2.material.cell128_spatial_part.name=128³ 시공 요소 +item.appliedenergistics2.material.cell1k_part.name=1k ME 저장 요소 +item.appliedenergistics2.material.cell4k_part.name=4k ME 저장 요소 +item.appliedenergistics2.material.cell16k_part.name=16k ME 저장 요소 +item.appliedenergistics2.material.cell64k_part.name=64k ME 저장 요소 +item.appliedenergistics2.material.certus_quartz_crystal.name=세투스 석영 결정체 +item.appliedenergistics2.material.certus_quartz_crystal_charged.name=충전된 세투스 석영 결정체 +item.appliedenergistics2.material.certus_quartz_dust.name=세투스 석영 가루 +item.appliedenergistics2.material.empty_storage_cell.name=빈 ME 저장 셀 +item.appliedenergistics2.material.ender_dust.name=엔더 가루 +item.appliedenergistics2.material.engineering_processor.name=공학 처리기 +item.appliedenergistics2.material.flour.name=Flour +item.appliedenergistics2.material.fluix_crystal.name=액정 결정체 +item.appliedenergistics2.material.fluix_dust.name=액정 가루 +item.appliedenergistics2.material.fluix_pearl.name=액정 진주 +item.appliedenergistics2.material.formation_core.name=형성 코어 +item.appliedenergistics2.material.gold_dust.name=금 가루 +item.appliedenergistics2.material.iron_dust.name=철 가루 +item.appliedenergistics2.material.logic_processor.name=논리 처리기 +item.appliedenergistics2.material.logic_processor_asm.name=미완성된 논리 처리기 +item.appliedenergistics2.material.matter_ball.name=물질 공 +item.appliedenergistics2.material.nether_quartz_dust.name=지옥 석영 가루 +item.appliedenergistics2.material.purified_certus_quartz_crystal.name=순수한 세투스 석영 결정체 +item.appliedenergistics2.material.purified_fluix_crystal.name=순수한 액정 결정체 +item.appliedenergistics2.material.purified_nether_quartz_crystal.name=순수한 지옥 석영 결정체 +item.appliedenergistics2.material.quantum_entangled_singularity.name=양자얽힘 특이점 +item.appliedenergistics2.material.silicon.name=실리콘 +item.appliedenergistics2.material.singularity.name=특이점 +item.appliedenergistics2.material.wireless.name=무선 수신기 +item.appliedenergistics2.material.wireless_booster.name=무선 기지국 +item.appliedenergistics2.material.wooden_gear.name=나무 톱니바퀴 +item.appliedenergistics2.material.engineering_processor_press.name=공학 회로 프레스 +item.appliedenergistics2.material.calculation_processor_press.name=계산 회로 프레스 +item.appliedenergistics2.material.logic_processor_press.name=논리 회로 프레스 +item.appliedenergistics2.material.engineering_processor_print.name=인쇄된 공학 회로 +item.appliedenergistics2.material.calculation_processor_print.name=인쇄된 계산 회로 +item.appliedenergistics2.material.logic_processor_print.name=인쇄된 논리 회로 +item.appliedenergistics2.material.silicon_press.name=실리콘 프레스 +item.appliedenergistics2.material.silicon_print.name=인쇄된 실리콘 +item.appliedenergistics2.material.name_press.name=이름 프레스 +item.appliedenergistics2.material.sky_dust.name=천령석 가루 +item.appliedenergistics2.material.card_crafting.name=조합 카드 -item.appliedenergistics2.multi_part.AnnihilationPlane.name=ME 소멸 평면 -item.appliedenergistics2.multi_part.CableAnchor.name=케이블 앵커 -item.appliedenergistics2.multi_part.CableCovered.name=ME 차폐 케이블 -item.appliedenergistics2.multi_part.CableGlass.name=ME 유리 케이블 -item.appliedenergistics2.multi_part.CableSmart.name=ME 스마트 케이블 -item.appliedenergistics2.multi_part.CableDense.name=ME 조밀 케이블 -item.appliedenergistics2.multi_part.StorageMonitor.name=ME 저장고 모니터 -item.appliedenergistics2.multi_part.ConversionMonitor.name=ME 변환 모니터 -item.appliedenergistics2.multi_part.CraftingTerminal.name=ME 조합 단말기 -item.appliedenergistics2.multi_part.SemiDarkMonitor.name=조명판 -item.appliedenergistics2.multi_part.Monitor.name=밝은 조명판 -item.appliedenergistics2.multi_part.DarkMonitor.name=어두운 조명판 -item.appliedenergistics2.multi_part.ExportBus.name=ME Export 버스 -item.appliedenergistics2.multi_part.FormationPlane.name=ME 생성 평면 -item.appliedenergistics2.multi_part.ImportBus.name=ME 입력 버스 -item.appliedenergistics2.multi_part.Interface.name=ME 인터페이스 -item.appliedenergistics2.multi_part.LevelEmitter.name=ME 레벨 측정기 -item.appliedenergistics2.multi_part.P2PTunnel.name=P2P 터널 -item.appliedenergistics2.multi_part.PatternTerminal.name=ME 패턴 터미널 -item.appliedenergistics2.multi_part.QuartzFiber.name=Quartz Fiber -item.appliedenergistics2.multi_part.StorageBus.name=ME 저장 요소 -item.appliedenergistics2.multi_part.Terminal.name=ME 터미널 -item.appliedenergistics2.multi_part.InvertedToggleBus.name=ME 반전된 토글 버스 -item.appliedenergistics2.multi_part.ToggleBus.name=ME 토글 버스 -item.appliedenergistics2.multi_part.CraftingMonitor.name=ME 제작 과정 모니터 -item.appliedenergistics2.multi_part.InterfaceTerminal.name=ME 인터페이스 터미널 +item.appliedenergistics2.multi_part.annihilation_plane.name=ME 소멸 평면 +item.appliedenergistics2.multi_part.cable_anchor.name=케이블 앵커 +item.appliedenergistics2.multi_part.cable_covered.name=ME 차폐 케이블 +item.appliedenergistics2.multi_part.cable_glass.name=ME 유리 케이블 +item.appliedenergistics2.multi_part.cable_smart.name=ME 스마트 케이블 +item.appliedenergistics2.multi_part.cable_dense_smart.name=ME 조밀 케이블 +item.appliedenergistics2.multi_part.storage_monitor.name=ME 저장고 모니터 +item.appliedenergistics2.multi_part.conversion_monitor.name=ME 변환 모니터 +item.appliedenergistics2.multi_part.crafting_terminal.name=ME 조합 단말기 +item.appliedenergistics2.multi_part.semi_dark_monitor.name=조명판 +item.appliedenergistics2.multi_part.monitor.name=밝은 조명판 +item.appliedenergistics2.multi_part.dark_monitor.name=어두운 조명판 +item.appliedenergistics2.multi_part.export_bus.name=ME Export 버스 +item.appliedenergistics2.multi_part.formation_plane.name=ME 생성 평면 +item.appliedenergistics2.multi_part.import_bus.name=ME 입력 버스 +item.appliedenergistics2.multi_part.interface.name=ME 인터페이스 +item.appliedenergistics2.multi_part.level_emitter.name=ME 레벨 측정기 +item.appliedenergistics2.multi_part.p2p_tunnel.name=P2P 터널 +item.appliedenergistics2.multi_part.pattern_terminal.name=ME 패턴 터미널 +item.appliedenergistics2.multi_part.quartz_fiber.name=Quartz Fiber +item.appliedenergistics2.multi_part.storage_bus.name=ME 저장 요소 +item.appliedenergistics2.multi_part.terminal.name=ME 터미널 +item.appliedenergistics2.multi_part.inverted_toggle_bus.name=ME 반전된 토글 버스 +item.appliedenergistics2.multi_part.toggle_bus.name=ME 토글 버스 +item.appliedenergistics2.multi_part.crafting_monitor.name=ME 제작 과정 모니터 +item.appliedenergistics2.multi_part.interface_terminal.name=ME 인터페이스 터미널 item.appliedenergistics2.spatial_storage_cell_128_cubed.name=128³ 시공 셀 item.appliedenergistics2.spatial_storage_cell_16_cubed.name=16³ 시공 셀 diff --git a/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang b/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang index e1cbd88c3..63d67b44f 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang @@ -372,93 +372,93 @@ item.appliedenergistics2.encoded_pattern.name=Padrão Codificado item.appliedenergistics2.view_cell.name=Ver Célula item.appliedenergistics2.facade.name=Fachada de Cabos -item.appliedenergistics2.crystal_seed.Certus.name=Semente de Quartzo Certus -item.appliedenergistics2.crystal_seed.Nether.name=Semente de Quartzo do Nether -item.appliedenergistics2.crystal_seed.Fluix.name=Semente de Fluix -item.appliedenergistics2.material.InvalidType.name=Esse item está Desativado. -item.appliedenergistics2.material.AdvCard.name=Cartão Avançado -item.appliedenergistics2.material.AnnihilationCore.name=Núcleo de Aniquilação -item.appliedenergistics2.material.BasicCard.name=Cartão Básico -item.appliedenergistics2.material.BlankPattern.name=Padrão em Branco -item.appliedenergistics2.material.CalcProcessor.name=Processador de Cálculo -item.appliedenergistics2.material.CardCapacity.name=Cartão de Capacidade -item.appliedenergistics2.material.CardFuzzy.name=Cartão Impreciso -item.appliedenergistics2.material.CardInverter.name=Cartão Inversor -item.appliedenergistics2.material.CardRedstone.name=Cartão de Redstone -item.appliedenergistics2.material.CardSpeed.name=Cartão de Aceleração -item.appliedenergistics2.material.Cell2SpatialPart.name=Componente Espacial 2³ -item.appliedenergistics2.material.Cell16SpatialPart.name=Componente Espacial 16³ -item.appliedenergistics2.material.Cell128SpatialPart.name=Componente Espacial 128³ -item.appliedenergistics2.material.Cell1kPart.name=Componente de Armazenamento ME de 1k -item.appliedenergistics2.material.Cell4kPart.name=Componente de Armazenamento ME de 4k -item.appliedenergistics2.material.Cell16kPart.name=Componente de Armazenamento ME de 16k -item.appliedenergistics2.material.Cell64kPart.name=Componente de Armazenamento ME de 64k -item.appliedenergistics2.material.CertusQuartzCrystal.name=Cristal de Quartzo Certus -item.appliedenergistics2.material.CertusQuartzCrystalCharged.name=Cristal Carregado de Quartzo Certus -item.appliedenergistics2.material.CertusQuartzDust.name=Pó de Quartzo Certus -item.appliedenergistics2.material.EmptyStorageCell.name=Encaixe de Armazenamento ME -item.appliedenergistics2.material.EnderDust.name=Pó do Fim -item.appliedenergistics2.material.EngProcessor.name=Processador de Engenharia -item.appliedenergistics2.material.Flour.name=Farinha -item.appliedenergistics2.material.FluixCrystal.name=Cristal de Fluix -item.appliedenergistics2.material.FluixDust.name=Pó de Fluix -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.LogicProcessor.name=Processador Lógico -item.appliedenergistics2.material.LogicProcessorAsm.name=Processador Lógico Inacabado -item.appliedenergistics2.material.MatterBall.name=Bola de Matéria -item.appliedenergistics2.material.NetherQuartzDust.name=Pó de Quartzo do Nether -item.appliedenergistics2.material.PurifiedCertusQuartzCrystal.name=Cristal Puro de Quartzo Certus -item.appliedenergistics2.material.PurifiedFluixCrystal.name=Cristal Fluix Puro -item.appliedenergistics2.material.PurifiedNetherQuartzCrystal.name=Cristal Puro de Quartzo do Nether -item.appliedenergistics2.material.QESingularity.name=Singularidade Quanticamente Entrelaçada -item.appliedenergistics2.material.Silicon.name=Silício -item.appliedenergistics2.material.Singularity.name=Singularidade -item.appliedenergistics2.material.Wireless.name=Receptor Sem Fio -item.appliedenergistics2.material.WirelessBooster.name=Amplificador Sem Fio -item.appliedenergistics2.material.WoodenGear.name=Engrenagem de Madeira -item.appliedenergistics2.material.EngProcessorPress.name=Prensa Inscritora de Engenharia -item.appliedenergistics2.material.CalcProcessorPress.name=Prensa Inscritora de Cálculo -item.appliedenergistics2.material.LogicProcessorPress.name=Prensa Inscritora Lógica -item.appliedenergistics2.material.EngProcessorPrint.name=Circuito Impresso de Engenharia -item.appliedenergistics2.material.CalcProcessorPrint.name=Circuito Impresso de Cálculo -item.appliedenergistics2.material.LogicProcessorPrint.name=Circuito Impresso Lógico -item.appliedenergistics2.material.SiliconPress.name=Compressa Inscitora de Silício -item.appliedenergistics2.material.SiliconPrint.name=Silício Impresso -item.appliedenergistics2.material.NamePress.name=Prensa Inscritora de Nome -item.appliedenergistics2.material.SkyDust.name=Pó de Pedra do Céu -item.appliedenergistics2.material.CardCrafting.name=Cartão de Fabricação +item.appliedenergistics2.crystal_seed.certus.name=Semente de Quartzo Certus +item.appliedenergistics2.crystal_seed.nether.name=Semente de Quartzo do Nether +item.appliedenergistics2.crystal_seed.fluix.name=Semente de Fluix +item.appliedenergistics2.material.invalid_type.name=Esse item está Desativado. +item.appliedenergistics2.material.advanced_card.name=Cartão Avançado +item.appliedenergistics2.material.annihilation_core.name=Núcleo de Aniquilação +item.appliedenergistics2.material.basic_card.name=Cartão Básico +item.appliedenergistics2.material.blank_pattern.name=Padrão em Branco +item.appliedenergistics2.material.calculation_processor.name=Processador de Cálculo +item.appliedenergistics2.material.card_capacity.name=Cartão de Capacidade +item.appliedenergistics2.material.card_fuzzy.name=Cartão Impreciso +item.appliedenergistics2.material.card_inverter.name=Cartão Inversor +item.appliedenergistics2.material.card_redstone.name=Cartão de Redstone +item.appliedenergistics2.material.card_speed.name=Cartão de Aceleração +item.appliedenergistics2.material.cell2_spatial_part.name=Componente Espacial 2³ +item.appliedenergistics2.material.cell16_spatial_part.name=Componente Espacial 16³ +item.appliedenergistics2.material.cell128_spatial_part.name=Componente Espacial 128³ +item.appliedenergistics2.material.cell1k_part.name=Componente de Armazenamento ME de 1k +item.appliedenergistics2.material.cell4k_part.name=Componente de Armazenamento ME de 4k +item.appliedenergistics2.material.cell16k_part.name=Componente de Armazenamento ME de 16k +item.appliedenergistics2.material.cell64k_part.name=Componente de Armazenamento ME de 64k +item.appliedenergistics2.material.certus_quartz_crystal.name=Cristal de Quartzo Certus +item.appliedenergistics2.material.certus_quartz_crystal_charged.name=Cristal Carregado de Quartzo Certus +item.appliedenergistics2.material.certus_quartz_dust.name=Pó de Quartzo Certus +item.appliedenergistics2.material.empty_storage_cell.name=Encaixe de Armazenamento ME +item.appliedenergistics2.material.ender_dust.name=Pó do Fim +item.appliedenergistics2.material.engineering_processor.name=Processador de Engenharia +item.appliedenergistics2.material.flour.name=Farinha +item.appliedenergistics2.material.fluix_crystal.name=Cristal de Fluix +item.appliedenergistics2.material.fluix_dust.name=Pó de Fluix +item.appliedenergistics2.material.fluix_pearl.name=Pérola de Fluix +item.appliedenergistics2.material.formation_core.name=Núcleo de Formação +item.appliedenergistics2.material.gold_dust.name=Pó de Ouro +item.appliedenergistics2.material.iron_dust.name=Pó de Ferro +item.appliedenergistics2.material.logic_processor.name=Processador Lógico +item.appliedenergistics2.material.logic_processor_asm.name=Processador Lógico Inacabado +item.appliedenergistics2.material.matter_ball.name=Bola de Matéria +item.appliedenergistics2.material.nether_quartz_dust.name=Pó de Quartzo do Nether +item.appliedenergistics2.material.purified_certus_quartz_crystal.name=Cristal Puro de Quartzo Certus +item.appliedenergistics2.material.purified_fluix_crystal.name=Cristal Fluix Puro +item.appliedenergistics2.material.purified_nether_quartz_crystal.name=Cristal Puro de Quartzo do Nether +item.appliedenergistics2.material.quantum_entangled_singularity.name=Singularidade Quanticamente Entrelaçada +item.appliedenergistics2.material.silicon.name=Silício +item.appliedenergistics2.material.singularity.name=Singularidade +item.appliedenergistics2.material.wireless.name=Receptor Sem Fio +item.appliedenergistics2.material.wireless_booster.name=Amplificador Sem Fio +item.appliedenergistics2.material.wooden_gear.name=Engrenagem de Madeira +item.appliedenergistics2.material.engineering_processor_press.name=Prensa Inscritora de Engenharia +item.appliedenergistics2.material.calculation_processor_press.name=Prensa Inscritora de Cálculo +item.appliedenergistics2.material.logic_processor_press.name=Prensa Inscritora Lógica +item.appliedenergistics2.material.engineering_processor_print.name=Circuito Impresso de Engenharia +item.appliedenergistics2.material.calculation_processor_print.name=Circuito Impresso de Cálculo +item.appliedenergistics2.material.logic_processor_print.name=Circuito Impresso Lógico +item.appliedenergistics2.material.silicon_press.name=Compressa Inscitora de Silício +item.appliedenergistics2.material.silicon_print.name=Silício Impresso +item.appliedenergistics2.material.name_press.name=Prensa Inscritora de Nome +item.appliedenergistics2.material.sky_dust.name=Pó de Pedra do Céu +item.appliedenergistics2.material.card_crafting.name=Cartão de Fabricação -item.appliedenergistics2.multi_part.AnnihilationPlane.name=Plano de Aniquilação ME -item.appliedenergistics2.multi_part.IdentityAnnihilationPlane.name=Plano de Aniquilação de identidade ME -item.appliedenergistics2.multi_part.CableAnchor.name=Cabo Âncora -item.appliedenergistics2.multi_part.CableCovered.name=Cabo Coberto ME -item.appliedenergistics2.multi_part.CableGlass.name=Cabo de Vidro ME -item.appliedenergistics2.multi_part.CableSmart.name=Cabo Inteligente ME -item.appliedenergistics2.multi_part.CableDense.name=Cabo Denso ME -item.appliedenergistics2.multi_part.StorageMonitor.name=Monitor de Armazenamento ME -item.appliedenergistics2.multi_part.ConversionMonitor.name=Monitor de Conversão ME -item.appliedenergistics2.multi_part.CraftingTerminal.name=Terminal de Fabricação ME -item.appliedenergistics2.multi_part.SemiDarkMonitor.name=Painel Iluminado -item.appliedenergistics2.multi_part.Monitor.name=Painel Brilhante Iluminado -item.appliedenergistics2.multi_part.DarkMonitor.name=Painel Escuro Iluminado -item.appliedenergistics2.multi_part.ExportBus.name=Barramento de Exportação ME -item.appliedenergistics2.multi_part.FormationPlane.name=Plano de Formação ME -item.appliedenergistics2.multi_part.ImportBus.name=Barramento de Importação ME -item.appliedenergistics2.multi_part.Interface.name=Interface ME -item.appliedenergistics2.multi_part.LevelEmitter.name=Emissor de Nível ME -item.appliedenergistics2.multi_part.P2PTunnel.name=Tùnel P2P -item.appliedenergistics2.multi_part.PatternTerminal.name=Terminal de Padrões ME -item.appliedenergistics2.multi_part.QuartzFiber.name=Fibra de Quartzo -item.appliedenergistics2.multi_part.StorageBus.name=Barramento de Armazenamento ME -item.appliedenergistics2.multi_part.Terminal.name=Terminal ME -item.appliedenergistics2.multi_part.InvertedToggleBus.name=Barramento de Alternância Invertido ME -item.appliedenergistics2.multi_part.ToggleBus.name=Barramento de Alternância ME -item.appliedenergistics2.multi_part.CraftingMonitor.name=Monitor de Fabricação ME -item.appliedenergistics2.multi_part.InterfaceTerminal.name=Terminal de Interface ME -item.appliedenergistics2.multi_part.InvalidType.name=Item Desabilitado +item.appliedenergistics2.multi_part.annihilation_plane.name=Plano de Aniquilação ME +item.appliedenergistics2.multi_part.identity_annihilation_plane.name=Plano de Aniquilação de identidade ME +item.appliedenergistics2.multi_part.cable_anchor.name=Cabo Âncora +item.appliedenergistics2.multi_part.cable_covered.name=Cabo Coberto ME +item.appliedenergistics2.multi_part.cable_glass.name=Cabo de Vidro ME +item.appliedenergistics2.multi_part.cable_smart.name=Cabo Inteligente ME +item.appliedenergistics2.multi_part.cable_dense_smart.name=Cabo Denso ME +item.appliedenergistics2.multi_part.storage_monitor.name=Monitor de Armazenamento ME +item.appliedenergistics2.multi_part.conversion_monitor.name=Monitor de Conversão ME +item.appliedenergistics2.multi_part.crafting_terminal.name=Terminal de Fabricação ME +item.appliedenergistics2.multi_part.semi_dark_monitor.name=Painel Iluminado +item.appliedenergistics2.multi_part.monitor.name=Painel Brilhante Iluminado +item.appliedenergistics2.multi_part.dark_monitor.name=Painel Escuro Iluminado +item.appliedenergistics2.multi_part.export_bus.name=Barramento de Exportação ME +item.appliedenergistics2.multi_part.formation_plane.name=Plano de Formação ME +item.appliedenergistics2.multi_part.import_bus.name=Barramento de Importação ME +item.appliedenergistics2.multi_part.interface.name=Interface ME +item.appliedenergistics2.multi_part.level_emitter.name=Emissor de Nível ME +item.appliedenergistics2.multi_part.p2p_tunnel.name=Tùnel P2P +item.appliedenergistics2.multi_part.pattern_terminal.name=Terminal de Padrões ME +item.appliedenergistics2.multi_part.quartz_fiber.name=Fibra de Quartzo +item.appliedenergistics2.multi_part.storage_bus.name=Barramento de Armazenamento ME +item.appliedenergistics2.multi_part.terminal.name=Terminal ME +item.appliedenergistics2.multi_part.inverted_toggle_bus.name=Barramento de Alternância Invertido ME +item.appliedenergistics2.multi_part.toggle_bus.name=Barramento de Alternância ME +item.appliedenergistics2.multi_part.crafting_monitor.name=Monitor de Fabricação ME +item.appliedenergistics2.multi_part.interface_terminal.name=Terminal de Interface ME +item.appliedenergistics2.multi_part.invalid_type.name=Item Desabilitado item.appliedenergistics2.spatial_storage_cell_128_cubed.name=Célula de Armazenamento Espacial 128³ item.appliedenergistics2.spatial_storage_cell_16_cubed.name=Célula de Armazenamento Espacial 16³ diff --git a/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang b/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang index ff2a58663..cc6cb53fb 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang @@ -229,88 +229,88 @@ item.appliedenergistics2.encoded_pattern.name=Model Codat item.appliedenergistics2.view_cell.name=Vizionează Celulă item.appliedenergistics2.facade.name=Faţadă de Cablu -item.appliedenergistics2.crystal_seed.Certus.name=Sămânţă de Cuarţ Certus -item.appliedenergistics2.crystal_seed.Nether.name=Sămânţă de Cuarţ de Iad -item.appliedenergistics2.crystal_seed.Fluix.name=Sămânţă de Fluix -item.appliedenergistics2.material.AdvCard.name=Cartelă Avansată -item.appliedenergistics2.material.AnnihilationCore.name=Centru de Anihilaţie -item.appliedenergistics2.material.BasicCard.name=Cartelă de Bază -item.appliedenergistics2.material.BlankPattern.name=Model Gol -item.appliedenergistics2.material.CalcProcessor.name=Procesor de Calculare -item.appliedenergistics2.material.CardCapacity.name=Cartelă de Capacitate -item.appliedenergistics2.material.CardFuzzy.name=Cartelă Fuzzy -item.appliedenergistics2.material.CardInverter.name=Cartelă Invertoare -item.appliedenergistics2.material.CardRedstone.name=Cartelă de Piatră-Roşie -item.appliedenergistics2.material.CardSpeed.name=Cartelă de Accelerare -item.appliedenergistics2.material.Cell2SpatialPart.name=Component Spaţial 2³ -item.appliedenergistics2.material.Cell16SpatialPart.name=Component Spaţial 16³ -item.appliedenergistics2.material.Cell128SpatialPart.name=Component Spaţial 128³ -item.appliedenergistics2.material.Cell1kPart.name=Component de Stocare ME 1k -item.appliedenergistics2.material.Cell4kPart.name=Component de Stocare ME 4k -item.appliedenergistics2.material.Cell16kPart.name=Component de Stocare ME 16k -item.appliedenergistics2.material.Cell64kPart.name=Component de Stocare ME 64k -item.appliedenergistics2.material.CertusQuartzCrystal.name=Cristal de Cuarţ Certus -item.appliedenergistics2.material.CertusQuartzCrystalCharged.name=Cristal de Cuarţ Certus Încărcat -item.appliedenergistics2.material.CertusQuartzDust.name=Praf de Cuarţ Certus -item.appliedenergistics2.material.EmptyStorageCell.name=Carcasă de Stocare ME -item.appliedenergistics2.material.EnderDust.name=Praf de Sfârșit -item.appliedenergistics2.material.EngProcessor.name=Processor de Inginerie -item.appliedenergistics2.material.Flour.name=Făina -item.appliedenergistics2.material.FluixCrystal.name=Cristal Fluix -item.appliedenergistics2.material.FluixDust.name=Praf Fluix -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.LogicProcessor.name=Procesor de Logică -item.appliedenergistics2.material.LogicProcessorAsm.name=Procesor de Logică Neterminat -item.appliedenergistics2.material.MatterBall.name=Minge de Materie -item.appliedenergistics2.material.NetherQuartzDust.name=Praf de Cuarţ de Iad -item.appliedenergistics2.material.PurifiedCertusQuartzCrystal.name=Cristal de Cuarţ Certus Pur -item.appliedenergistics2.material.PurifiedFluixCrystal.name=Cristal de Cuarţ Fluix Pur -item.appliedenergistics2.material.PurifiedNetherQuartzCrystal.name=Cristal de Cuarţ de Iad Pur -item.appliedenergistics2.material.QESingularity.name=Singularitate de Quantum Legată -item.appliedenergistics2.material.Silicon.name=Silicon -item.appliedenergistics2.material.Singularity.name=Singularitate -item.appliedenergistics2.material.Wireless.name=Receptor de Wireless -item.appliedenergistics2.material.WirelessBooster.name=Amplificator Wireless -item.appliedenergistics2.material.WoodenGear.name=Roată de Lemn -item.appliedenergistics2.material.EngProcessorPress.name=Presă de Inginerie de Inscripţioner -item.appliedenergistics2.material.CalcProcessorPress.name=Presă de Calculare de Inscripţioner -item.appliedenergistics2.material.LogicProcessorPress.name=Presă de Logică de Inscripţioner -item.appliedenergistics2.material.EngProcessorPrint.name=Circuit Imprimat de Inginerie -item.appliedenergistics2.material.CalcProcessorPrint.name=Circuit Imprimat de Calculare -item.appliedenergistics2.material.LogicProcessorPrint.name=Circuit Imprimat de Logică -item.appliedenergistics2.material.SiliconPress.name=Presă de Silicon de Inscripţioner -item.appliedenergistics2.material.SiliconPrint.name=Silicon Imprimat -item.appliedenergistics2.material.NamePress.name=Presă de Nume de Inscripţioner -item.appliedenergistics2.material.SkyDust.name=Praf de Piatra-Cerului +item.appliedenergistics2.crystal_seed.certus.name=Sămânţă de Cuarţ Certus +item.appliedenergistics2.crystal_seed.nether.name=Sămânţă de Cuarţ de Iad +item.appliedenergistics2.crystal_seed.fluix.name=Sămânţă de Fluix +item.appliedenergistics2.material.advanced_card.name=Cartelă Avansată +item.appliedenergistics2.material.annihilation_core.name=Centru de Anihilaţie +item.appliedenergistics2.material.basic_card.name=Cartelă de Bază +item.appliedenergistics2.material.blank_pattern.name=Model Gol +item.appliedenergistics2.material.calculation_processor.name=Procesor de Calculare +item.appliedenergistics2.material.card_capacity.name=Cartelă de Capacitate +item.appliedenergistics2.material.card_fuzzy.name=Cartelă Fuzzy +item.appliedenergistics2.material.card_inverter.name=Cartelă Invertoare +item.appliedenergistics2.material.card_redstone.name=Cartelă de Piatră-Roşie +item.appliedenergistics2.material.card_speed.name=Cartelă de Accelerare +item.appliedenergistics2.material.cell2_spatial_part.name=Component Spaţial 2³ +item.appliedenergistics2.material.cell16_spatial_part.name=Component Spaţial 16³ +item.appliedenergistics2.material.cell128_spatial_part.name=Component Spaţial 128³ +item.appliedenergistics2.material.cell1k_part.name=Component de Stocare ME 1k +item.appliedenergistics2.material.cell4k_part.name=Component de Stocare ME 4k +item.appliedenergistics2.material.cell16k_part.name=Component de Stocare ME 16k +item.appliedenergistics2.material.cell64k_part.name=Component de Stocare ME 64k +item.appliedenergistics2.material.certus_quartz_crystal.name=Cristal de Cuarţ Certus +item.appliedenergistics2.material.certus_quartz_crystal_charged.name=Cristal de Cuarţ Certus Încărcat +item.appliedenergistics2.material.certus_quartz_dust.name=Praf de Cuarţ Certus +item.appliedenergistics2.material.empty_storage_cell.name=Carcasă de Stocare ME +item.appliedenergistics2.material.ender_dust.name=Praf de Sfârșit +item.appliedenergistics2.material.engineering_processor.name=Processor de Inginerie +item.appliedenergistics2.material.flour.name=Făina +item.appliedenergistics2.material.fluix_crystal.name=Cristal Fluix +item.appliedenergistics2.material.fluix_dust.name=Praf Fluix +item.appliedenergistics2.material.fluix_pearl.name=Perlă Fluix +item.appliedenergistics2.material.formation_core.name=Centru de Formaţie +item.appliedenergistics2.material.gold_dust.name=Praf de Aur +item.appliedenergistics2.material.iron_dust.name=Praf de Fier +item.appliedenergistics2.material.logic_processor.name=Procesor de Logică +item.appliedenergistics2.material.logic_processor_asm.name=Procesor de Logică Neterminat +item.appliedenergistics2.material.matter_ball.name=Minge de Materie +item.appliedenergistics2.material.nether_quartz_dust.name=Praf de Cuarţ de Iad +item.appliedenergistics2.material.purified_certus_quartz_crystal.name=Cristal de Cuarţ Certus Pur +item.appliedenergistics2.material.purified_fluix_crystal.name=Cristal de Cuarţ Fluix Pur +item.appliedenergistics2.material.purified_nether_quartz_crystal.name=Cristal de Cuarţ de Iad Pur +item.appliedenergistics2.material.quantum_entangled_singularity.name=Singularitate de Quantum Legată +item.appliedenergistics2.material.silicon.name=Silicon +item.appliedenergistics2.material.singularity.name=Singularitate +item.appliedenergistics2.material.wireless.name=Receptor de Wireless +item.appliedenergistics2.material.wireless_booster.name=Amplificator Wireless +item.appliedenergistics2.material.wooden_gear.name=Roată de Lemn +item.appliedenergistics2.material.engineering_processor_press.name=Presă de Inginerie de Inscripţioner +item.appliedenergistics2.material.calculation_processor_press.name=Presă de Calculare de Inscripţioner +item.appliedenergistics2.material.logic_processor_press.name=Presă de Logică de Inscripţioner +item.appliedenergistics2.material.engineering_processor_print.name=Circuit Imprimat de Inginerie +item.appliedenergistics2.material.calculation_processor_print.name=Circuit Imprimat de Calculare +item.appliedenergistics2.material.logic_processor_print.name=Circuit Imprimat de Logică +item.appliedenergistics2.material.silicon_press.name=Presă de Silicon de Inscripţioner +item.appliedenergistics2.material.silicon_print.name=Silicon Imprimat +item.appliedenergistics2.material.name_press.name=Presă de Nume de Inscripţioner +item.appliedenergistics2.material.sky_dust.name=Praf de Piatra-Cerului -item.appliedenergistics2.multi_part.AnnihilationPlane.name=Lan de Anihilaţie -item.appliedenergistics2.multi_part.CableAnchor.name=Ancoră de Cablu -item.appliedenergistics2.multi_part.CableCovered.name=Cablu Acoperit ME -item.appliedenergistics2.multi_part.CableGlass.name=Cablu de Sticlă ME -item.appliedenergistics2.multi_part.CableSmart.name=Cablu Deştept ME -item.appliedenergistics2.multi_part.CableDense.name=Cablu Dens ME -item.appliedenergistics2.multi_part.StorageMonitor.name=Monitor de Stocare ME -item.appliedenergistics2.multi_part.ConversionMonitor.name=Monitor de Conversie ME -item.appliedenergistics2.multi_part.CraftingTerminal.name=Terminal de Craftare ME -item.appliedenergistics2.multi_part.SemiDarkMonitor.name=Panou Iluminat -item.appliedenergistics2.multi_part.Monitor.name=Panou Iluminat Deschis -item.appliedenergistics2.multi_part.DarkMonitor.name=Panou Iluminat Închis -item.appliedenergistics2.multi_part.ExportBus.name=Punct de Export ME -item.appliedenergistics2.multi_part.FormationPlane.name=Lan de Formaţie ME -item.appliedenergistics2.multi_part.ImportBus.name=Punct de Import ME -item.appliedenergistics2.multi_part.Interface.name=Interfaţă ME -item.appliedenergistics2.multi_part.LevelEmitter.name=Emiţător Nivel ME -item.appliedenergistics2.multi_part.P2PTunnel.name=Tunel P2P -item.appliedenergistics2.multi_part.PatternTerminal.name=Terminal de Model ME -item.appliedenergistics2.multi_part.QuartzFiber.name=Fibră de Cuarţ -item.appliedenergistics2.multi_part.StorageBus.name=Punct de Stocare ME -item.appliedenergistics2.multi_part.Terminal.name=Terminal ME -item.appliedenergistics2.multi_part.InvertedToggleBus.name=Punct Invertat de Activare ME -item.appliedenergistics2.multi_part.ToggleBus.name=Punct de Activare ME -item.appliedenergistics2.multi_part.CraftingMonitor.name=Monitor de Craftare ME +item.appliedenergistics2.multi_part.annihilation_plane.name=Lan de Anihilaţie +item.appliedenergistics2.multi_part.cable_anchor.name=Ancoră de Cablu +item.appliedenergistics2.multi_part.cable_covered.name=Cablu Acoperit ME +item.appliedenergistics2.multi_part.cable_glass.name=Cablu de Sticlă ME +item.appliedenergistics2.multi_part.cable_smart.name=Cablu Deştept ME +item.appliedenergistics2.multi_part.cable_dense_smart.name=Cablu Dens ME +item.appliedenergistics2.multi_part.storage_monitor.name=Monitor de Stocare ME +item.appliedenergistics2.multi_part.conversion_monitor.name=Monitor de Conversie ME +item.appliedenergistics2.multi_part.crafting_terminal.name=Terminal de Craftare ME +item.appliedenergistics2.multi_part.semi_dark_monitor.name=Panou Iluminat +item.appliedenergistics2.multi_part.monitor.name=Panou Iluminat Deschis +item.appliedenergistics2.multi_part.dark_monitor.name=Panou Iluminat Închis +item.appliedenergistics2.multi_part.export_bus.name=Punct de Export ME +item.appliedenergistics2.multi_part.formation_plane.name=Lan de Formaţie ME +item.appliedenergistics2.multi_part.import_bus.name=Punct de Import ME +item.appliedenergistics2.multi_part.interface.name=Interfaţă ME +item.appliedenergistics2.multi_part.level_emitter.name=Emiţător Nivel ME +item.appliedenergistics2.multi_part.p2p_tunnel.name=Tunel P2P +item.appliedenergistics2.multi_part.pattern_terminal.name=Terminal de Model ME +item.appliedenergistics2.multi_part.quartz_fiber.name=Fibră de Cuarţ +item.appliedenergistics2.multi_part.storage_bus.name=Punct de Stocare ME +item.appliedenergistics2.multi_part.terminal.name=Terminal ME +item.appliedenergistics2.multi_part.inverted_toggle_bus.name=Punct Invertat de Activare ME +item.appliedenergistics2.multi_part.toggle_bus.name=Punct de Activare ME +item.appliedenergistics2.multi_part.crafting_monitor.name=Monitor de Craftare ME item.appliedenergistics2.spatial_storage_cell_128_cubed.name=128³ Celulă Spaţială de Stocare item.appliedenergistics2.spatial_storage_cell_16_cubed.name=Celulă Spaţială de Stocare 16³ diff --git a/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang b/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang index f702a1305..9d74298d2 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang @@ -376,93 +376,93 @@ item.appliedenergistics2.encoded_pattern.name=Кодированный шабл item.appliedenergistics2.view_cell.name=Ячейка представления item.appliedenergistics2.facade.name=Кабельный фасад -item.appliedenergistics2.crystal_seed.Certus.name=Семя истинного кварца -item.appliedenergistics2.crystal_seed.Nether.name=Семя кварца Нижнего мира -item.appliedenergistics2.crystal_seed.Fluix.name=Изменчивое семя -item.appliedenergistics2.material.InvalidType.name=Этот предмет отключен. -item.appliedenergistics2.material.AdvCard.name=Продвинутая карта -item.appliedenergistics2.material.AnnihilationCore.name=Ядро истребления -item.appliedenergistics2.material.BasicCard.name=Базовая карта -item.appliedenergistics2.material.BlankPattern.name=Пустой шаблон -item.appliedenergistics2.material.CalcProcessor.name=Вычислительный процессор -item.appliedenergistics2.material.CardCapacity.name=Карта ёмкости -item.appliedenergistics2.material.CardFuzzy.name=Карта нечёткости -item.appliedenergistics2.material.CardInverter.name=Карта инвертирования -item.appliedenergistics2.material.CardRedstone.name=Карта красного камня -item.appliedenergistics2.material.CardSpeed.name=Карта ускорения -item.appliedenergistics2.material.Cell2SpatialPart.name=2³ пространственный компонент -item.appliedenergistics2.material.Cell16SpatialPart.name=16³ пространственный компонент -item.appliedenergistics2.material.Cell128SpatialPart.name=128³ пространственный компонент -item.appliedenergistics2.material.Cell1kPart.name=1К МЭ компонент хранения -item.appliedenergistics2.material.Cell4kPart.name=4К МЭ компонент хранения -item.appliedenergistics2.material.Cell16kPart.name=16К МЭ компонент хранения -item.appliedenergistics2.material.Cell64kPart.name=64К МЭ компонент хранения -item.appliedenergistics2.material.CertusQuartzCrystal.name=Кристалл истинного кварца -item.appliedenergistics2.material.CertusQuartzCrystalCharged.name=Заряженный кристалл истинного кварца -item.appliedenergistics2.material.CertusQuartzDust.name=Пыль истинного кварца -item.appliedenergistics2.material.EmptyStorageCell.name=МЭ корпус ячейки хранения -item.appliedenergistics2.material.EnderDust.name=Пыль Края -item.appliedenergistics2.material.EngProcessor.name=Инженерный процессор -item.appliedenergistics2.material.Flour.name=Мука -item.appliedenergistics2.material.FluixCrystal.name=Изменчивый кристалл -item.appliedenergistics2.material.FluixDust.name=Изменчивая пыль -item.appliedenergistics2.material.FluixPearl.name=Изменчивая жемчужина -item.appliedenergistics2.material.FormationCore.name=Ядро формирования -item.appliedenergistics2.material.GoldDust.name=Золотая пыль -item.appliedenergistics2.material.IronDust.name=Железная пыль -item.appliedenergistics2.material.LogicProcessor.name=Логический процессор -item.appliedenergistics2.material.LogicProcessorAsm.name=Незаконченный логический процессор -item.appliedenergistics2.material.MatterBall.name=Шарик материи -item.appliedenergistics2.material.NetherQuartzDust.name=Пыль кварца Нижнего мира -item.appliedenergistics2.material.PurifiedCertusQuartzCrystal.name=Чистый кристалл истинного кварца -item.appliedenergistics2.material.PurifiedFluixCrystal.name=Чистый изменчивый кристалл -item.appliedenergistics2.material.PurifiedNetherQuartzCrystal.name=Чистый кристалл кварца Нижнего мира -item.appliedenergistics2.material.QESingularity.name=Квантовая запутанная сингулярность -item.appliedenergistics2.material.Silicon.name=Кремний -item.appliedenergistics2.material.Singularity.name=Сингулярность -item.appliedenergistics2.material.Wireless.name=Беспроводной приёмник -item.appliedenergistics2.material.WirelessBooster.name=Беспроводной усилитель -item.appliedenergistics2.material.WoodenGear.name=Деревянная шестерня -item.appliedenergistics2.material.EngProcessorPress.name=Инженерный пресс для высекателя -item.appliedenergistics2.material.CalcProcessorPress.name=Вычислительный пресс для высекателя -item.appliedenergistics2.material.LogicProcessorPress.name=Логический пресс для высекателя -item.appliedenergistics2.material.EngProcessorPrint.name=Отпечатанный инженерный контур -item.appliedenergistics2.material.CalcProcessorPrint.name=Отпечатанный вычислительный контур -item.appliedenergistics2.material.LogicProcessorPrint.name=Отпечатанный логический контур -item.appliedenergistics2.material.SiliconPress.name=Кремниевый пресс для высекателя -item.appliedenergistics2.material.SiliconPrint.name=Отпечатанный кремний -item.appliedenergistics2.material.NamePress.name=Именующий пресс для высекателя -item.appliedenergistics2.material.SkyDust.name=Пыль небесного камня -item.appliedenergistics2.material.CardCrafting.name=Карта создания +item.appliedenergistics2.crystal_seed.certus.name=Семя истинного кварца +item.appliedenergistics2.crystal_seed.nether.name=Семя кварца Нижнего мира +item.appliedenergistics2.crystal_seed.fluix.name=Изменчивое семя +item.appliedenergistics2.material.invalid_type.name=Этот предмет отключен. +item.appliedenergistics2.material.advanced_card.name=Продвинутая карта +item.appliedenergistics2.material.annihilation_core.name=Ядро истребления +item.appliedenergistics2.material.basic_card.name=Базовая карта +item.appliedenergistics2.material.blank_pattern.name=Пустой шаблон +item.appliedenergistics2.material.calculation_processor.name=Вычислительный процессор +item.appliedenergistics2.material.card_capacity.name=Карта ёмкости +item.appliedenergistics2.material.card_fuzzy.name=Карта нечёткости +item.appliedenergistics2.material.card_inverter.name=Карта инвертирования +item.appliedenergistics2.material.card_redstone.name=Карта красного камня +item.appliedenergistics2.material.card_speed.name=Карта ускорения +item.appliedenergistics2.material.cell2_spatial_part.name=2³ пространственный компонент +item.appliedenergistics2.material.cell16_spatial_part.name=16³ пространственный компонент +item.appliedenergistics2.material.cell128_spatial_part.name=128³ пространственный компонент +item.appliedenergistics2.material.cell1k_part.name=1К МЭ компонент хранения +item.appliedenergistics2.material.cell4k_part.name=4К МЭ компонент хранения +item.appliedenergistics2.material.cell16k_part.name=16К МЭ компонент хранения +item.appliedenergistics2.material.cell64k_part.name=64К МЭ компонент хранения +item.appliedenergistics2.material.certus_quartz_crystal.name=Кристалл истинного кварца +item.appliedenergistics2.material.certus_quartz_crystal_charged.name=Заряженный кристалл истинного кварца +item.appliedenergistics2.material.certus_quartz_dust.name=Пыль истинного кварца +item.appliedenergistics2.material.empty_storage_cell.name=МЭ корпус ячейки хранения +item.appliedenergistics2.material.ender_dust.name=Пыль Края +item.appliedenergistics2.material.engineering_processor.name=Инженерный процессор +item.appliedenergistics2.material.flour.name=Мука +item.appliedenergistics2.material.fluix_crystal.name=Изменчивый кристалл +item.appliedenergistics2.material.fluix_dust.name=Изменчивая пыль +item.appliedenergistics2.material.fluix_pearl.name=Изменчивая жемчужина +item.appliedenergistics2.material.formation_core.name=Ядро формирования +item.appliedenergistics2.material.gold_dust.name=Золотая пыль +item.appliedenergistics2.material.iron_dust.name=Железная пыль +item.appliedenergistics2.material.logic_processor.name=Логический процессор +item.appliedenergistics2.material.logic_processor_asm.name=Незаконченный логический процессор +item.appliedenergistics2.material.matter_ball.name=Шарик материи +item.appliedenergistics2.material.nether_quartz_dust.name=Пыль кварца Нижнего мира +item.appliedenergistics2.material.purified_certus_quartz_crystal.name=Чистый кристалл истинного кварца +item.appliedenergistics2.material.purified_fluix_crystal.name=Чистый изменчивый кристалл +item.appliedenergistics2.material.purified_nether_quartz_crystal.name=Чистый кристалл кварца Нижнего мира +item.appliedenergistics2.material.quantum_entangled_singularity.name=Квантовая запутанная сингулярность +item.appliedenergistics2.material.silicon.name=Кремний +item.appliedenergistics2.material.singularity.name=Сингулярность +item.appliedenergistics2.material.wireless.name=Беспроводной приёмник +item.appliedenergistics2.material.wireless_booster.name=Беспроводной усилитель +item.appliedenergistics2.material.wooden_gear.name=Деревянная шестерня +item.appliedenergistics2.material.engineering_processor_press.name=Инженерный пресс для высекателя +item.appliedenergistics2.material.calculation_processor_press.name=Вычислительный пресс для высекателя +item.appliedenergistics2.material.logic_processor_press.name=Логический пресс для высекателя +item.appliedenergistics2.material.engineering_processor_print.name=Отпечатанный инженерный контур +item.appliedenergistics2.material.calculation_processor_print.name=Отпечатанный вычислительный контур +item.appliedenergistics2.material.logic_processor_print.name=Отпечатанный логический контур +item.appliedenergistics2.material.silicon_press.name=Кремниевый пресс для высекателя +item.appliedenergistics2.material.silicon_print.name=Отпечатанный кремний +item.appliedenergistics2.material.name_press.name=Именующий пресс для высекателя +item.appliedenergistics2.material.sky_dust.name=Пыль небесного камня +item.appliedenergistics2.material.card_crafting.name=Карта создания -item.appliedenergistics2.multi_part.AnnihilationPlane.name=МЭ плоскость истребления -item.appliedenergistics2.multi_part.IdentityAnnihilationPlane.name=МЭ личная плоскость истребления -item.appliedenergistics2.multi_part.CableAnchor.name=Кабельный якорь -item.appliedenergistics2.multi_part.CableCovered.name=МЭ закрытый кабель -item.appliedenergistics2.multi_part.CableGlass.name=МЭ стеклянный кабель -item.appliedenergistics2.multi_part.CableSmart.name=МЭ умный кабель -item.appliedenergistics2.multi_part.CableDense.name=МЭ плотный кабель -item.appliedenergistics2.multi_part.StorageMonitor.name=МЭ монитор хранения -item.appliedenergistics2.multi_part.ConversionMonitor.name=МЭ монитор преобразования -item.appliedenergistics2.multi_part.CraftingTerminal.name=МЭ терминал создания -item.appliedenergistics2.multi_part.SemiDarkMonitor.name=Осветительная панель -item.appliedenergistics2.multi_part.Monitor.name=Яркая осветительная панель -item.appliedenergistics2.multi_part.DarkMonitor.name=Тёмная осветительная панель -item.appliedenergistics2.multi_part.ExportBus.name=МЭ шина экспорта -item.appliedenergistics2.multi_part.FormationPlane.name=МЭ плоскость формирования -item.appliedenergistics2.multi_part.ImportBus.name=МЭ шина импорта -item.appliedenergistics2.multi_part.Interface.name=МЭ интерфейс -item.appliedenergistics2.multi_part.LevelEmitter.name=МЭ излучатель уровня -item.appliedenergistics2.multi_part.P2PTunnel.name=Туннель точка-точка -item.appliedenergistics2.multi_part.PatternTerminal.name=МЭ терминал шаблонов -item.appliedenergistics2.multi_part.QuartzFiber.name=Кварцевое оптическое волокно -item.appliedenergistics2.multi_part.StorageBus.name=МЭ шина хранения -item.appliedenergistics2.multi_part.Terminal.name=МЭ терминал -item.appliedenergistics2.multi_part.InvertedToggleBus.name=МЭ инвертированная шина переключения -item.appliedenergistics2.multi_part.ToggleBus.name=МЭ шина переключения -item.appliedenergistics2.multi_part.CraftingMonitor.name=МЭ монитор создания -item.appliedenergistics2.multi_part.InterfaceTerminal.name=МЭ терминал интерфейсов -item.appliedenergistics2.multi_part.InvalidType.name=Отключенный предмет +item.appliedenergistics2.multi_part.annihilation_plane.name=МЭ плоскость истребления +item.appliedenergistics2.multi_part.identity_annihilation_plane.name=МЭ личная плоскость истребления +item.appliedenergistics2.multi_part.cable_anchor.name=Кабельный якорь +item.appliedenergistics2.multi_part.cable_covered.name=МЭ закрытый кабель +item.appliedenergistics2.multi_part.cable_glass.name=МЭ стеклянный кабель +item.appliedenergistics2.multi_part.cable_smart.name=МЭ умный кабель +item.appliedenergistics2.multi_part.cable_dense_smart.name=МЭ плотный кабель +item.appliedenergistics2.multi_part.storage_monitor.name=МЭ монитор хранения +item.appliedenergistics2.multi_part.conversion_monitor.name=МЭ монитор преобразования +item.appliedenergistics2.multi_part.crafting_terminal.name=МЭ терминал создания +item.appliedenergistics2.multi_part.semi_dark_monitor.name=Осветительная панель +item.appliedenergistics2.multi_part.monitor.name=Яркая осветительная панель +item.appliedenergistics2.multi_part.dark_monitor.name=Тёмная осветительная панель +item.appliedenergistics2.multi_part.export_bus.name=МЭ шина экспорта +item.appliedenergistics2.multi_part.formation_plane.name=МЭ плоскость формирования +item.appliedenergistics2.multi_part.import_bus.name=МЭ шина импорта +item.appliedenergistics2.multi_part.interface.name=МЭ интерфейс +item.appliedenergistics2.multi_part.level_emitter.name=МЭ излучатель уровня +item.appliedenergistics2.multi_part.p2p_tunnel.name=Туннель точка-точка +item.appliedenergistics2.multi_part.pattern_terminal.name=МЭ терминал шаблонов +item.appliedenergistics2.multi_part.quartz_fiber.name=Кварцевое оптическое волокно +item.appliedenergistics2.multi_part.storage_bus.name=МЭ шина хранения +item.appliedenergistics2.multi_part.terminal.name=МЭ терминал +item.appliedenergistics2.multi_part.inverted_toggle_bus.name=МЭ инвертированная шина переключения +item.appliedenergistics2.multi_part.toggle_bus.name=МЭ шина переключения +item.appliedenergistics2.multi_part.crafting_monitor.name=МЭ монитор создания +item.appliedenergistics2.multi_part.interface_terminal.name=МЭ терминал интерфейсов +item.appliedenergistics2.multi_part.invalid_type.name=Отключенный предмет item.appliedenergistics2.spatial_storage_cell_128_cubed.name=128³ пространственная ячейка хранения item.appliedenergistics2.spatial_storage_cell_16_cubed.name=16³ пространственная ячейка хранения diff --git a/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang b/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang index 1c06992fa..7ef37e44d 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang @@ -372,93 +372,93 @@ item.appliedenergistics2.encoded_pattern.name=编码样板 item.appliedenergistics2.view_cell.name=显示元件 item.appliedenergistics2.facade.name=线缆伪装板 -item.appliedenergistics2.crystal_seed.Certus.name=赛特斯石英种子 -item.appliedenergistics2.crystal_seed.Nether.name=下界石英种子 -item.appliedenergistics2.crystal_seed.Fluix.name=福鲁伊克斯种子 -item.appliedenergistics2.material.InvalidType.name=该物品被禁用. -item.appliedenergistics2.material.AdvCard.name=高级卡 -item.appliedenergistics2.material.AnnihilationCore.name=破坏核心 -item.appliedenergistics2.material.BasicCard.name=基础卡 -item.appliedenergistics2.material.BlankPattern.name=空白样板 -item.appliedenergistics2.material.CalcProcessor.name=运算处理器 -item.appliedenergistics2.material.CardCapacity.name=容量卡 -item.appliedenergistics2.material.CardFuzzy.name=模糊卡 -item.appliedenergistics2.material.CardInverter.name=反相卡 -item.appliedenergistics2.material.CardRedstone.name=红石卡 -item.appliedenergistics2.material.CardSpeed.name=加速卡 -item.appliedenergistics2.material.Cell2SpatialPart.name=2³-空间组件 -item.appliedenergistics2.material.Cell16SpatialPart.name=16³-空间组件 -item.appliedenergistics2.material.Cell128SpatialPart.name=128³-空间组件 -item.appliedenergistics2.material.Cell1kPart.name=1k-ME存储组件 -item.appliedenergistics2.material.Cell4kPart.name=4k-ME存储组件 -item.appliedenergistics2.material.Cell16kPart.name=16k-ME存储组件 -item.appliedenergistics2.material.Cell64kPart.name=64k-ME存储组件 -item.appliedenergistics2.material.CertusQuartzCrystal.name=赛特斯石英水晶 -item.appliedenergistics2.material.CertusQuartzCrystalCharged.name=充能赛特斯石英水晶 -item.appliedenergistics2.material.CertusQuartzDust.name=赛特斯石英粉 -item.appliedenergistics2.material.EmptyStorageCell.name=ME存储外壳 -item.appliedenergistics2.material.EnderDust.name=末影粉 -item.appliedenergistics2.material.EngProcessor.name=工程处理器 -item.appliedenergistics2.material.Flour.name=面粉 -item.appliedenergistics2.material.FluixCrystal.name=福鲁伊克斯水晶 -item.appliedenergistics2.material.FluixDust.name=福鲁伊克斯粉 -item.appliedenergistics2.material.FluixPearl.name=福鲁伊克斯珍珠 -item.appliedenergistics2.material.FormationCore.name=成型核心 -item.appliedenergistics2.material.GoldDust.name=金粉 -item.appliedenergistics2.material.IronDust.name=铁粉 -item.appliedenergistics2.material.LogicProcessor.name=逻辑处理器 -item.appliedenergistics2.material.LogicProcessorAsm.name=半成品-逻辑处理器 -item.appliedenergistics2.material.MatterBall.name=物质球 -item.appliedenergistics2.material.NetherQuartzDust.name=下界石英粉 -item.appliedenergistics2.material.PurifiedCertusQuartzCrystal.name=高纯赛特斯石英水晶 -item.appliedenergistics2.material.PurifiedFluixCrystal.name=高纯福鲁伊克斯水晶 -item.appliedenergistics2.material.PurifiedNetherQuartzCrystal.name=高纯下界石英水晶 -item.appliedenergistics2.material.QESingularity.name=量子缠绕态奇点 -item.appliedenergistics2.material.Silicon.name=硅 -item.appliedenergistics2.material.Singularity.name=奇点 -item.appliedenergistics2.material.Wireless.name=无线接收器 -item.appliedenergistics2.material.WirelessBooster.name=无线信号增幅器 -item.appliedenergistics2.material.WoodenGear.name=木齿轮 -item.appliedenergistics2.material.EngProcessorPress.name=工程压印模板 -item.appliedenergistics2.material.CalcProcessorPress.name=运算压印模板 -item.appliedenergistics2.material.LogicProcessorPress.name=逻辑压印模板 -item.appliedenergistics2.material.EngProcessorPrint.name=工程电路板 -item.appliedenergistics2.material.CalcProcessorPrint.name=运算电路板 -item.appliedenergistics2.material.LogicProcessorPrint.name=逻辑电路板 -item.appliedenergistics2.material.SiliconPress.name=硅压印模板 -item.appliedenergistics2.material.SiliconPrint.name=硅板 -item.appliedenergistics2.material.NamePress.name=名称压印模板 -item.appliedenergistics2.material.SkyDust.name=陨石粉 -item.appliedenergistics2.material.CardCrafting.name=合成卡 +item.appliedenergistics2.crystal_seed.certus.name=赛特斯石英种子 +item.appliedenergistics2.crystal_seed.nether.name=下界石英种子 +item.appliedenergistics2.crystal_seed.fluix.name=福鲁伊克斯种子 +item.appliedenergistics2.material.invalid_type.name=该物品被禁用. +item.appliedenergistics2.material.advanced_card.name=高级卡 +item.appliedenergistics2.material.annihilation_core.name=破坏核心 +item.appliedenergistics2.material.basic_card.name=基础卡 +item.appliedenergistics2.material.blank_pattern.name=空白样板 +item.appliedenergistics2.material.calculation_processor.name=运算处理器 +item.appliedenergistics2.material.card_capacity.name=容量卡 +item.appliedenergistics2.material.card_fuzzy.name=模糊卡 +item.appliedenergistics2.material.card_inverter.name=反相卡 +item.appliedenergistics2.material.card_redstone.name=红石卡 +item.appliedenergistics2.material.card_speed.name=加速卡 +item.appliedenergistics2.material.cell2_spatial_part.name=2³-空间组件 +item.appliedenergistics2.material.cell16_spatial_part.name=16³-空间组件 +item.appliedenergistics2.material.cell128_spatial_part.name=128³-空间组件 +item.appliedenergistics2.material.cell1k_part.name=1k-ME存储组件 +item.appliedenergistics2.material.cell4k_part.name=4k-ME存储组件 +item.appliedenergistics2.material.cell16k_part.name=16k-ME存储组件 +item.appliedenergistics2.material.cell64k_part.name=64k-ME存储组件 +item.appliedenergistics2.material.certus_quartz_crystal.name=赛特斯石英水晶 +item.appliedenergistics2.material.certus_quartz_crystal_charged.name=充能赛特斯石英水晶 +item.appliedenergistics2.material.certus_quartz_dust.name=赛特斯石英粉 +item.appliedenergistics2.material.empty_storage_cell.name=ME存储外壳 +item.appliedenergistics2.material.ender_dust.name=末影粉 +item.appliedenergistics2.material.engineering_processor.name=工程处理器 +item.appliedenergistics2.material.flour.name=面粉 +item.appliedenergistics2.material.fluix_crystal.name=福鲁伊克斯水晶 +item.appliedenergistics2.material.fluix_dust.name=福鲁伊克斯粉 +item.appliedenergistics2.material.fluix_pearl.name=福鲁伊克斯珍珠 +item.appliedenergistics2.material.formation_core.name=成型核心 +item.appliedenergistics2.material.gold_dust.name=金粉 +item.appliedenergistics2.material.iron_dust.name=铁粉 +item.appliedenergistics2.material.logic_processor.name=逻辑处理器 +item.appliedenergistics2.material.logic_processor_asm.name=半成品-逻辑处理器 +item.appliedenergistics2.material.matter_ball.name=物质球 +item.appliedenergistics2.material.nether_quartz_dust.name=下界石英粉 +item.appliedenergistics2.material.purified_certus_quartz_crystal.name=高纯赛特斯石英水晶 +item.appliedenergistics2.material.purified_fluix_crystal.name=高纯福鲁伊克斯水晶 +item.appliedenergistics2.material.purified_nether_quartz_crystal.name=高纯下界石英水晶 +item.appliedenergistics2.material.quantum_entangled_singularity.name=量子缠绕态奇点 +item.appliedenergistics2.material.silicon.name=硅 +item.appliedenergistics2.material.singularity.name=奇点 +item.appliedenergistics2.material.wireless.name=无线接收器 +item.appliedenergistics2.material.wireless_booster.name=无线信号增幅器 +item.appliedenergistics2.material.wooden_gear.name=木齿轮 +item.appliedenergistics2.material.engineering_processor_press.name=工程压印模板 +item.appliedenergistics2.material.calculation_processor_press.name=运算压印模板 +item.appliedenergistics2.material.logic_processor_press.name=逻辑压印模板 +item.appliedenergistics2.material.engineering_processor_print.name=工程电路板 +item.appliedenergistics2.material.calculation_processor_print.name=运算电路板 +item.appliedenergistics2.material.logic_processor_print.name=逻辑电路板 +item.appliedenergistics2.material.silicon_press.name=硅压印模板 +item.appliedenergistics2.material.silicon_print.name=硅板 +item.appliedenergistics2.material.name_press.name=名称压印模板 +item.appliedenergistics2.material.sky_dust.name=陨石粉 +item.appliedenergistics2.material.card_crafting.name=合成卡 -item.appliedenergistics2.multi_part.AnnihilationPlane.name=ME破坏面板 -item.appliedenergistics2.multi_part.IdentityAnnihilationPlane.name=ME精准破坏面板 -item.appliedenergistics2.multi_part.CableAnchor.name=线缆锚 -item.appliedenergistics2.multi_part.CableCovered.name=ME包层线缆 -item.appliedenergistics2.multi_part.CableGlass.name=ME玻璃线缆 -item.appliedenergistics2.multi_part.CableSmart.name=ME智能线缆 -item.appliedenergistics2.multi_part.CableDense.name=ME致密线缆 -item.appliedenergistics2.multi_part.StorageMonitor.name=ME存储监控器 -item.appliedenergistics2.multi_part.ConversionMonitor.name=ME交换监控器 -item.appliedenergistics2.multi_part.CraftingTerminal.name=ME合成终端 -item.appliedenergistics2.multi_part.SemiDarkMonitor.name=照明面板 -item.appliedenergistics2.multi_part.Monitor.name=亮色照明面板 -item.appliedenergistics2.multi_part.DarkMonitor.name=暗色照明面板 -item.appliedenergistics2.multi_part.ExportBus.name=ME输出总线 -item.appliedenergistics2.multi_part.FormationPlane.name=ME成型面板 -item.appliedenergistics2.multi_part.ImportBus.name=ME输入总线 -item.appliedenergistics2.multi_part.Interface.name=ME接口 -item.appliedenergistics2.multi_part.LevelEmitter.name=ME标准发信器 -item.appliedenergistics2.multi_part.P2PTunnel.name=P2P通道 -item.appliedenergistics2.multi_part.PatternTerminal.name=ME样板终端 -item.appliedenergistics2.multi_part.QuartzFiber.name=石英纤维 -item.appliedenergistics2.multi_part.StorageBus.name=ME存储总线 -item.appliedenergistics2.multi_part.Terminal.name=ME终端 -item.appliedenergistics2.multi_part.InvertedToggleBus.name=ME反相触发总线 -item.appliedenergistics2.multi_part.ToggleBus.name=ME触发总线 -item.appliedenergistics2.multi_part.CraftingMonitor.name=ME合成监控器 -item.appliedenergistics2.multi_part.InterfaceTerminal.name=ME接口终端 -item.appliedenergistics2.multi_part.InvalidType.name=已禁用 +item.appliedenergistics2.multi_part.annihilation_plane.name=ME破坏面板 +item.appliedenergistics2.multi_part.identity_annihilation_plane.name=ME精准破坏面板 +item.appliedenergistics2.multi_part.cable_anchor.name=线缆锚 +item.appliedenergistics2.multi_part.cable_covered.name=ME包层线缆 +item.appliedenergistics2.multi_part.cable_glass.name=ME玻璃线缆 +item.appliedenergistics2.multi_part.cable_smart.name=ME智能线缆 +item.appliedenergistics2.multi_part.cable_dense_smart.name=ME致密线缆 +item.appliedenergistics2.multi_part.storage_monitor.name=ME存储监控器 +item.appliedenergistics2.multi_part.conversion_monitor.name=ME交换监控器 +item.appliedenergistics2.multi_part.crafting_terminal.name=ME合成终端 +item.appliedenergistics2.multi_part.semi_dark_monitor.name=照明面板 +item.appliedenergistics2.multi_part.monitor.name=亮色照明面板 +item.appliedenergistics2.multi_part.dark_monitor.name=暗色照明面板 +item.appliedenergistics2.multi_part.export_bus.name=ME输出总线 +item.appliedenergistics2.multi_part.formation_plane.name=ME成型面板 +item.appliedenergistics2.multi_part.import_bus.name=ME输入总线 +item.appliedenergistics2.multi_part.interface.name=ME接口 +item.appliedenergistics2.multi_part.level_emitter.name=ME标准发信器 +item.appliedenergistics2.multi_part.p2p_tunnel.name=P2P通道 +item.appliedenergistics2.multi_part.pattern_terminal.name=ME样板终端 +item.appliedenergistics2.multi_part.quartz_fiber.name=石英纤维 +item.appliedenergistics2.multi_part.storage_bus.name=ME存储总线 +item.appliedenergistics2.multi_part.terminal.name=ME终端 +item.appliedenergistics2.multi_part.inverted_toggle_bus.name=ME反相触发总线 +item.appliedenergistics2.multi_part.toggle_bus.name=ME触发总线 +item.appliedenergistics2.multi_part.crafting_monitor.name=ME合成监控器 +item.appliedenergistics2.multi_part.interface_terminal.name=ME接口终端 +item.appliedenergistics2.multi_part.invalid_type.name=已禁用 item.appliedenergistics2.spatial_storage_cell_128_cubed.name=128³-空间存储元件 item.appliedenergistics2.spatial_storage_cell_16_cubed.name=16³-空间存储元件 diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_adv_card.json b/src/main/resources/assets/appliedenergistics2/models/item/material_adv_card.json deleted file mode 100644 index 99386b5d5..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/material_adv_card.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "appliedenergistics2:items/material_adv_card" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_advanced_card.json b/src/main/resources/assets/appliedenergistics2/models/item/material_advanced_card.json new file mode 100644 index 000000000..383ef768c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_advanced_card.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_advanced_card" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor.json deleted file mode 100644 index 8f741134b..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "appliedenergistics2:items/material_calc_processor" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_press.json deleted file mode 100644 index 8bb4647dd..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_press.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "appliedenergistics2:items/material_calc_processor_press" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_print.json b/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_print.json deleted file mode 100644 index b86a69124..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_print.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "appliedenergistics2:items/material_calc_processor_print" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_calculation_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/material_calculation_processor.json new file mode 100644 index 000000000..7742c5a27 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_calculation_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_calculation_processor" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_calculation_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/material_calculation_processor_press.json new file mode 100644 index 000000000..cbb51ff61 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_calculation_processor_press.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_calculation_processor_press" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_calculation_processor_print.json b/src/main/resources/assets/appliedenergistics2/models/item/material_calculation_processor_print.json new file mode 100644 index 000000000..2340e7d5d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_calculation_processor_print.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_calculation_processor_print" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor.json deleted file mode 100644 index e8247cb43..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "appliedenergistics2:items/material_eng_processor" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_press.json deleted file mode 100644 index 2cd5d57f1..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_press.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "appliedenergistics2:items/material_eng_processor_press" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_print.json b/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_print.json deleted file mode 100644 index 4d90ffda7..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_print.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "appliedenergistics2:items/material_eng_processor_print" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_engineering_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/material_engineering_processor.json new file mode 100644 index 000000000..a268935bc --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_engineering_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_engineering_processor" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_engineering_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/material_engineering_processor_press.json new file mode 100644 index 000000000..44f4fd12f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_engineering_processor_press.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_engineering_processor_press" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_engineering_processor_print.json b/src/main/resources/assets/appliedenergistics2/models/item/material_engineering_processor_print.json new file mode 100644 index 000000000..cec70a3f5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_engineering_processor_print.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_engineering_processor_print" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_qesingularity.json b/src/main/resources/assets/appliedenergistics2/models/item/material_qesingularity.json deleted file mode 100644 index 6a7ed9d50..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/material_qesingularity.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "appliedenergistics2:items/material_qesingularity" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_quantum_entangled_singularity.json b/src/main/resources/assets/appliedenergistics2/models/item/material_quantum_entangled_singularity.json new file mode 100644 index 000000000..09c205a78 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_quantum_entangled_singularity.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_quantum_entangled_singularity" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_black.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_black.json deleted file mode 100644 index c12c9e4e9..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_black.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/black" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_blue.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_blue.json deleted file mode 100644 index ce990ce36..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/blue" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_brown.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_brown.json deleted file mode 100644 index bd03055fd..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_brown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/brown" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_cyan.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_cyan.json deleted file mode 100644 index f75cce811..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_cyan.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/cyan" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_gray.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_gray.json deleted file mode 100644 index 9a8dfeef8..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_gray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/gray" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_green.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_green.json deleted file mode 100644 index 2d3f50253..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_green.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/green" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_light_blue.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_light_blue.json deleted file mode 100644 index af6e5022e..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_light_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/light_blue" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_light_gray.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_light_gray.json deleted file mode 100644 index b9350dfa9..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_light_gray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/light_gray" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lime.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lime.json deleted file mode 100644 index 8c958551c..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/lime" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_magenta.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_magenta.json deleted file mode 100644 index b3649b5b7..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_magenta.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/magenta" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_orange.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_orange.json deleted file mode 100644 index e61d99ee1..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_orange.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/orange" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_pink.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_pink.json deleted file mode 100644 index f1da7c8eb..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_pink.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/pink" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_purple.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_purple.json deleted file mode 100644 index 08f605950..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_purple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/purple" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_red.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_red.json deleted file mode 100644 index 291772221..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_red.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/red" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_base.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_base.json similarity index 95% rename from src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_base.json index 21869cbc5..3b25e196d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_base.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/part/part", "textures": { - "channels": "appliedenergistics2:parts/cable/dense/0" + "channels": "appliedenergistics2:parts/cable/dense_smart/0" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_black.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_black.json new file mode 100644 index 000000000..e2f9651b3 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_black.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/black" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_blue.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_blue.json new file mode 100644 index 000000000..1baf563d4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/blue" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_brown.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_brown.json new file mode 100644 index 000000000..5240d0bb5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/brown" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_cyan.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_cyan.json new file mode 100644 index 000000000..40dadbfb1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/cyan" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_gray.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_gray.json new file mode 100644 index 000000000..5b27f9155 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/gray" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_green.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_green.json new file mode 100644 index 000000000..f26623582 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_green.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/green" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_light_blue.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_light_blue.json new file mode 100644 index 000000000..45107087a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/light_blue" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_light_gray.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_light_gray.json new file mode 100644 index 000000000..9b002160a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_light_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/light_gray" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_lime.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_lime.json new file mode 100644 index 000000000..f0ecdc65e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/lime" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_magenta.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_magenta.json new file mode 100644 index 000000000..03d1e32a8 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/magenta" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_orange.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_orange.json new file mode 100644 index 000000000..f5c5b38b9 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/orange" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_pink.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_pink.json new file mode 100644 index 000000000..e4c14b302 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/pink" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_purple.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_purple.json new file mode 100644 index 000000000..05578e409 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/purple" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_red.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_red.json new file mode 100644 index 000000000..a62e66bf7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_red.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/red" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_transparent.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_transparent.json new file mode 100644 index 000000000..7d0e34f1c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_transparent.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/transparent" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_white.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_white.json new file mode 100644 index 000000000..a8a1a2bdc --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_white.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/white" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_yellow.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_yellow.json new file mode 100644 index 000000000..b62ceed0a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense_smart/yellow" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_transparent.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_transparent.json deleted file mode 100644 index c01c30cc9..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_transparent.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/transparent" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_white.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_white.json deleted file mode 100644 index af70b3c45..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_white.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/white" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_yellow.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_yellow.json deleted file mode 100644 index e0297473c..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_yellow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:item/part/cable_dense_base", - "textures": { - "base": "appliedenergistics2:parts/cable/dense/yellow" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/center.json similarity index 90% rename from src/main/resources/assets/appliedenergistics2/models/part/cable/dense/center.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/center.json index e4c2c9921..29b9add36 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/center.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/center.json @@ -1,6 +1,6 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/dense/${color}" + "base": "appliedenergistics2:parts/cable/dense_smart/${color}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/connection.json similarity index 90% rename from src/main/resources/assets/appliedenergistics2/models/part/cable/dense/connection.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/connection.json index 6f6902424..93435efc7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/connection.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/connection.json @@ -1,7 +1,7 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/dense/${color}", - "channels": "appliedenergistics2:parts/cable/dense/${channels}" + "base": "appliedenergistics2:parts/cable/dense_smart/${color}", + "channels": "appliedenergistics2:parts/cable/dense_smart/${channels}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/straight.json similarity index 90% rename from src/main/resources/assets/appliedenergistics2/models/part/cable/dense/straight.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/straight.json index 3ca700a1c..9402e505f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/straight.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/straight.json @@ -1,7 +1,7 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/dense/${color}", - "channels": "appliedenergistics2:parts/cable/dense/${channels}" + "base": "appliedenergistics2:parts/cable/dense_smart/${color}", + "channels": "appliedenergistics2:parts/cable/dense_smart/${channels}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json index 0f6fa54ef..32c82271e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json @@ -11,7 +11,7 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "material.PurifiedCertusQuartzCrystal" + "part": "material.purified_certus_quartz_crystal" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block_pure.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block_pure.json index 15826099c..5763fcdb6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block_pure.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block_pure.json @@ -11,7 +11,7 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/light_detector.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/light_detector.json index 4b457e401..ea74a63a5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/light_detector.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/light_detector.json @@ -14,11 +14,11 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedNetherQuartzCrystal" + "part": "material.purified_nether_quartz_crystal" } ], "b": { "item": "minecraft:iron_ingot" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_block_pure.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_block_pure.json index ff93e8566..65aee8948 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_block_pure.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_block_pure.json @@ -12,7 +12,7 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "material.PurifiedNetherQuartzCrystal" + "part": "material.purified_nether_quartz_crystal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json index 87b93b937..07e4d0e8d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json @@ -13,7 +13,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystalCharged" + "part": "material.certus_quartz_crystal_charged" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/advcard.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/advancedcard.json similarity index 81% rename from src/main/resources/assets/appliedenergistics2/recipes/materials/advcard.json rename to src/main/resources/assets/appliedenergistics2/recipes/materials/advancedcard.json index 8be21e777..312b3d03b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/advcard.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/advancedcard.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.AdvCard" + "material": "material.advanced_card" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.AdvCard", + "part": "material.advanced_card", "count": 2 }, "type": "appliedenergistics2:part_shaped", @@ -31,7 +31,7 @@ }, "d": { "type": "appliedenergistics2:part", - "part": "material.CalcProcessor" + "part": "material.calculation_processor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json index 125bf3ae3..65983a298 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.AnnihilationCore" + "material": "material.annihilation_core" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.AnnihilationCore", + "part": "material.annihilation_core", "count": 2 }, "type": "appliedenergistics2:part_shaped", @@ -26,12 +26,12 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedNetherQuartzCrystal" + "part": "material.purified_nether_quartz_crystal" } ], "c": { "type": "appliedenergistics2:part", - "part": "material.LogicProcessor" + "part": "material.logic_processor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json index 126e84d88..222ebcebf 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.BasicCard" + "material": "material.basic_card" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.BasicCard", + "part": "material.basic_card", "count": 2 }, "type": "appliedenergistics2:part_shaped", @@ -31,7 +31,7 @@ }, "d": { "type": "appliedenergistics2:part", - "part": "material.CalcProcessor" + "part": "material.calculation_processor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json index 8305791e7..842e2a13c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.CardCapacity" + "material": "material.card_capacity" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.CardCapacity" + "part": "material.card_capacity" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ @@ -18,16 +18,16 @@ }, { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystalCharged" + "part": "material.certus_quartz_crystal_charged" }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedCertusQuartzCrystal" + "part": "material.purified_certus_quartz_crystal" } ], { "type": "appliedenergistics2:part", - "part": "material.BasicCard" + "part": "material.basic_card" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json index 6cf964544..ce3e60b60 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.CardCrafting" + "material": "material.card_capacity" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.CardCrafting" + "part": "material.card_capacity" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ @@ -17,7 +17,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.BasicCard" + "part": "material.basic_card" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json index 05e203b09..edca5ee65 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json @@ -2,18 +2,18 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.CardFuzzy" + "material": "material.card_fuzzy" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.CardFuzzy" + "part": "material.card_fuzzy" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.AdvCard" + "part": "material.advanced_card" }, { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json index e990abd61..8a70d537e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.CardInverter" + "material": "material.card_inverter" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.CardInverter" + "part": "material.card_inverter" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ @@ -16,7 +16,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.AdvCard" + "part": "material.advanced_card" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardredstone.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardredstone.json index f258dd667..e8d876afd 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardredstone.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardredstone.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.CardRedstone" + "material": "material.card_redstone" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.CardRedstone" + "part": "material.card_redstone" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ @@ -16,7 +16,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.BasicCard" + "part": "material.basic_card" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardspeed.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardspeed.json index cd65bb664..f2bc718af 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cardspeed.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cardspeed.json @@ -2,18 +2,18 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.CardSpeed" + "material": "material.card_speed" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.CardSpeed" + "part": "material.card_speed" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.AdvCard" + "part": "material.advanced_card" }, [ { @@ -22,7 +22,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ] ] diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json b/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json index 3ea2670c2..20c792192 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/formationcore.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.FormationCore" + "material": "material.formation_core" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.FormationCore", + "part": "material.formation_core", "count": 2 }, "type": "appliedenergistics2:part_shaped", @@ -26,16 +26,16 @@ }, { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystalCharged" + "part": "material.certus_quartz_crystal_charged" }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedCertusQuartzCrystal" + "part": "material.purified_certus_quartz_crystal" } ], "c": { "type": "appliedenergistics2:part", - "part": "material.LogicProcessor" + "part": "material.logic_processor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json index 18a0cc936..a027dd33e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.CertusQuartzCrystal" + "material": "material.certus_quartz_crystal" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystal", + "part": "material.certus_quartz_crystal", "count": 4 }, "type": "appliedenergistics2:part_shapeless", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json index aa036c624..d51cbff7e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.CertusQuartzCrystal" + "material": "material.certus_quartz_crystal" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystal", + "part": "material.certus_quartz_crystal", "count": 4 }, "type": "appliedenergistics2:part_shapeless", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json index 1fe0678e9..9dcc686e4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.CertusQuartzCrystal" + "material": "material.certus_quartz_crystal" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystal", + "part": "material.certus_quartz_crystal", "count": 4 }, "type": "appliedenergistics2:part_shapeless", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json index 06d106766..d8619ce8e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.FluixCrystal" + "material": "material.fluix_crystal" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.FluixCrystal", + "part": "material.fluix_crystal", "count": 4 }, "type": "appliedenergistics2:part_shapeless", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json index 6447aa1e0..f34942269 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.FluixPearl" + "material": "material.fluix_crystal" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.FluixPearl" + "part": "material.fluix_crystal" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -30,7 +30,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone_1.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone_1.json index 1e9825860..c150a7a8b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone_1.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone_1.json @@ -20,7 +20,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystalCharged" + "part": "material.certus_quartz_crystal_charged" } ], "a": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone_woodengear.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone_woodengear.json index 0e295f611..5ffe8944b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone_woodengear.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone_woodengear.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "appliedenergistics2:material_exists", - "material": "material.WoodenGear" + "material": "material.wooden_gear" } ], "result": { "type": "appliedenergistics2:part", - "part": "material.WoodenGear" + "part": "material.wooden_gear" }, "type": "appliedenergistics2:part_shaped", "pattern": [ diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors_sky_compass.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors_sky_compass.json index 1ba2ac85b..3cef4f076 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors_sky_compass.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors_sky_compass.json @@ -15,7 +15,7 @@ }, "b": { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystalCharged" + "part": "material.certus_quartz_crystal_charged" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_comparator.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_comparator.json index a23a1ad4a..4576d15b8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_comparator.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_comparator.json @@ -16,7 +16,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedNetherQuartzCrystal" + "part": "material.purified_nether_quartz_crystal" } ], "a": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json index 08e9f2b94..d200dddc8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json @@ -29,7 +29,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedNetherQuartzCrystal" + "part": "material.purified_nether_quartz_crystal" } ], "c": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cell_workbench.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cell_workbench.json index 97557415e..82aadf5cb 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cell_workbench.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cell_workbench.json @@ -23,7 +23,7 @@ }, "b": { "type": "appliedenergistics2:part", - "part": "material.CalcProcessor" + "part": "material.calculation_processor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.json index 9580304e0..487da366b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.json @@ -11,11 +11,11 @@ "key": { "c": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "b": { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" }, "a": { "item": "appliedenergistics2:smooth_sky_stone_block" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json index 8f2fe5220..01c4a07a0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json @@ -20,7 +20,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json index 8a95af658..5fd04839d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json @@ -14,7 +14,7 @@ }, "b": { "type": "appliedenergistics2:part", - "part": "material.CalcProcessor" + "part": "material.calculation_processor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json index 94ee82690..3d0accc41 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json @@ -23,7 +23,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json index a329d9363..b7d15e81d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json @@ -19,11 +19,11 @@ }, { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystalCharged" + "part": "material.certus_quartz_crystal_charged" }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedCertusQuartzCrystal" + "part": "material.purified_certus_quartz_crystal" } ], "b": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.json index 0981d025c..8e7d19ef7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.json @@ -23,7 +23,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface.json index 0f2b6813c..04a0f8785 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface.json @@ -11,7 +11,7 @@ "key": { "d": { "type": "appliedenergistics2:part", - "part": "material.FormationCore" + "part": "material.formation_core" }, "b": [ { @@ -32,7 +32,7 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "material.AnnihilationCore" + "part": "material.annihilation_core" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json index 4c4e4ff58..6edfe2b3c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json @@ -6,7 +6,7 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "part.Interface" + "part": "part.interface" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json index 83c2d36b1..f82131956 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.Interface" + "part": "part.interface" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_port.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_port.json index 4994d81b9..203098270 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_port.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io_port.json @@ -31,7 +31,7 @@ }, "e": { "type": "appliedenergistics2:part", - "part": "material.LogicProcessor" + "part": "material.logic_processor" }, "c": [ { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_link.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_link.json index 7fc807c94..828e1708b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_link.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_link.json @@ -14,7 +14,7 @@ }, "b": { "type": "appliedenergistics2:part", - "part": "material.FluixPearl" + "part": "material.fluix_crystal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_ring.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_ring.json index 955382e17..95c6c0bc7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_ring.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum_ring.json @@ -11,12 +11,12 @@ "key": { "c": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "e": [ { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" } ], "a": { @@ -28,7 +28,7 @@ }, "b": { "type": "appliedenergistics2:part", - "part": "material.LogicProcessor" + "part": "material.logic_processor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.json index 21b8994ac..14839deea 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.json @@ -11,11 +11,11 @@ "key": { "d": { "type": "appliedenergistics2:part", - "part": "material.Cell16kPart" + "part": "material.cell16k_part" }, "e": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "b": { "item": "appliedenergistics2:chest" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_port.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_port.json index b3352dc48..94f637aa8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_port.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_port.json @@ -24,7 +24,7 @@ ], "e": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "d": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json index d0e5f1a73..fc82a30f9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json @@ -37,7 +37,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_chest.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_chest.json index 108efdea7..dc1cbb4f7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_chest.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_chest.json @@ -24,7 +24,7 @@ ], "b": { "type": "appliedenergistics2:part", - "part": "part.Terminal" + "part": "part.terminal" }, "d": { "type": "forge:ore_dict", @@ -51,7 +51,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_drive.json b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_drive.json index 86b77c800..f00ca13c6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_drive.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage_drive.json @@ -11,7 +11,7 @@ "key": { "b": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "a": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_black.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_black.json similarity index 81% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_black.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_black.json index 8ca9a52a7..8871c9a92 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_black.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.black", + "part": "cable_dense_smart.black", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, "b": { "type": "forge:ore_dict", "ore": "dyeBlack" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_blue.json similarity index 81% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_blue.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_blue.json index b025f8d91..77fe6fb2f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_blue.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.blue", + "part": "cable_dense_smart.blue", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, "b": { "type": "forge:ore_dict", "ore": "dyeBlue" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_brown.json similarity index 81% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_brown.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_brown.json index e473cc7ad..ddd178b7c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_brown.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.brown", + "part": "cable_dense_smart.brown", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json similarity index 81% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_cyan.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json index e653981c8..70f5628a6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.cyan", + "part": "cable_dense_smart.cyan", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, "b": { "type": "forge:ore_dict", "ore": "dyeCyan" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json similarity index 90% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_fluix.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json index 8e3b2f4c0..6dcac22ed 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.fluix" + "part": "cable_dense_smart.fluix" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ @@ -18,4 +18,4 @@ "ore": "dustGlowstone" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_fluix_clean.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json similarity index 76% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_fluix_clean.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json index 70e54215c..0520f36c8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_fluix_clean.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json @@ -1,16 +1,16 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.fluix" + "part": "cable_dense_smart.fluix" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, { "item": "minecraft:water_bucket" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_gray.json similarity index 81% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_gray.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_gray.json index 0a3948b8a..e729f9ba9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_gray.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.gray", + "part": "cable_dense_smart.gray", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, "b": { "type": "forge:ore_dict", "ore": "dyeGray" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_green.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_green.json similarity index 81% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_green.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_green.json index 82f8a3b64..adce70606 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_green.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.green", + "part": "cable_dense_smart.green", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json similarity index 80% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_light_blue.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json index e49c329c6..d5d4c24fe 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.light_blue", + "part": "cable_dense_smart.light_blue", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, "b": { "type": "forge:ore_dict", "ore": "dyeLightBlue" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json similarity index 80% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_light_gray.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json index 3f06fbbc5..04e985c1c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.light_gray", + "part": "cable_dense_smart.light_gray", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, "b": { "type": "forge:ore_dict", "ore": "dyeLightGray" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_lime.json similarity index 81% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_lime.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_lime.json index c5be8d8ad..5a0a01389 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_lime.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.lime", + "part": "cable_dense_smart.lime", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, "b": { "type": "forge:ore_dict", "ore": "dyeLime" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json similarity index 80% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_magenta.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json index fa24a94a1..9d6f1175d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.magenta", + "part": "cable_dense_smart.magenta", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, "b": { "type": "forge:ore_dict", "ore": "dyeMagenta" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_orange.json similarity index 80% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_orange.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_orange.json index e93af4a66..3b0645048 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_orange.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.orange", + "part": "cable_dense_smart.orange", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, "b": { "type": "forge:ore_dict", "ore": "dyeOrange" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_pink.json similarity index 81% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_pink.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_pink.json index af3904b80..be00aa23e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_pink.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.pink", + "part": "cable_dense_smart.pink", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, "b": { "type": "forge:ore_dict", "ore": "dyePink" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_purple.json similarity index 80% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_purple.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_purple.json index 213a81d5c..b64cce896 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_purple.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.purple", + "part": "cable_dense_smart.purple", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_red.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_red.json similarity index 81% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_red.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_red.json index 868eeca59..a30de5519 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_red.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.red", + "part": "cable_dense_smart.red", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, "b": { "type": "forge:ore_dict", "ore": "dyeRed" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_white.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_white.json similarity index 81% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_white.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_white.json index be5d773c4..5636dc7c8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_white.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.white", + "part": "cable_dense_smart.white", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" }, "b": { "type": "forge:ore_dict", "ore": "dyeWhite" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json similarity index 80% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_yellow.json rename to src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json index 5a9bddffc..6e8522cad 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "cable_dense.yellow", + "part": "cable_dense_smart.yellow", "count": 8 }, "type": "appliedenergistics2:part_shaped", @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "cable_dense" + "part": "cable_dense_smart" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix.json index 403020f1c..ab92eb811 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass_fluix.json @@ -8,7 +8,7 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "part.QuartzFiber" + "part": "part.quartz_fiber" }, [ { @@ -17,7 +17,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ], [ @@ -27,7 +27,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ] ] diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty_storage_cell.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty_storage_cell.json index fd32d917e..0f6569664 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty_storage_cell.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty_storage_cell.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "material.EmptyStorageCell" + "part": "material.empty_storage_cell" }, "type": "appliedenergistics2:part_shaped", "pattern": [ diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components.json index 2e13eaed7..074f71c49 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "material.Cell2SpatialPart" + "part": "material.cell2_spatial_part" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -12,7 +12,7 @@ "key": { "c": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "a": { "type": "forge:ore_dict", @@ -20,7 +20,7 @@ }, "b": { "type": "appliedenergistics2:part", - "part": "material.FluixPearl" + "part": "material.fluix_crystal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_0.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_0.json index 40500d648..bb49e54ca 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_0.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_0.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "material.Cell16SpatialPart" + "part": "material.cell16_spatial_part" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -12,11 +12,11 @@ "key": { "c": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "b": { "type": "appliedenergistics2:part", - "part": "material.Cell2SpatialPart" + "part": "material.cell2_spatial_part" }, "a": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_1.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_1.json index 6a715df35..063f611eb 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_1.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components_1.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "material.Cell128SpatialPart" + "part": "material.cell128_spatial_part" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -12,11 +12,11 @@ "key": { "c": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "b": { "type": "appliedenergistics2:part", - "part": "material.Cell16SpatialPart" + "part": "material.cell16_spatial_part" }, "a": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json index b3cd72d00..c56cdde18 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json @@ -22,7 +22,7 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "material.Cell128SpatialPart" + "part": "material.cell128_spatial_part" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json index 5b250c192..fbda07997 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json @@ -6,11 +6,11 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.EmptyStorageCell" + "part": "material.empty_storage_cell" }, { "type": "appliedenergistics2:part", - "part": "material.Cell128SpatialPart" + "part": "material.cell128_spatial_part" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json index dfbf078a1..465655ba3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json @@ -18,7 +18,7 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "material.Cell16SpatialPart" + "part": "material.cell16_spatial_part" }, "b": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json index 0920fd4ac..f47e75113 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json @@ -6,11 +6,11 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.EmptyStorageCell" + "part": "material.empty_storage_cell" }, { "type": "appliedenergistics2:part", - "part": "material.Cell16SpatialPart" + "part": "material.cell16_spatial_part" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json index f11293dac..08a0aafcf 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json @@ -22,7 +22,7 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "material.Cell2SpatialPart" + "part": "material.cell2_spatial_part" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json index 84a610eea..7a14a1f99 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json @@ -6,11 +6,11 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.EmptyStorageCell" + "part": "material.empty_storage_cell" }, { "type": "appliedenergistics2:part", - "part": "material.Cell2SpatialPart" + "part": "material.cell2_spatial_part" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k.json index caef1bcfe..5e9b943db 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k.json @@ -14,7 +14,7 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "material.Cell16kPart" + "part": "material.cell16k_part" }, "d": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json index 64e8fe899..5b4329a70 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json @@ -6,11 +6,11 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.Cell16kPart" + "part": "material.cell16k_part" }, { "type": "appliedenergistics2:part", - "part": "material.EmptyStorageCell" + "part": "material.empty_storage_cell" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k.json index bcc6780ff..9324d1b2a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k.json @@ -22,7 +22,7 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "material.Cell1kPart" + "part": "material.cell1k_part" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json index ecff34483..2aa43fc4a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json @@ -6,11 +6,11 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.EmptyStorageCell" + "part": "material.empty_storage_cell" }, { "type": "appliedenergistics2:part", - "part": "material.Cell1kPart" + "part": "material.cell1k_part" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k.json index 26d977ab9..125091357 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k.json @@ -22,7 +22,7 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "material.Cell4kPart" + "part": "material.cell4k_part" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json index e4d47ab81..0af8cf8d7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json @@ -6,11 +6,11 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.EmptyStorageCell" + "part": "material.empty_storage_cell" }, { "type": "appliedenergistics2:part", - "part": "material.Cell4kPart" + "part": "material.cell4k_part" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k.json index cfdc40821..141c3af91 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k.json @@ -22,7 +22,7 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "material.Cell64kPart" + "part": "material.cell64k_part" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json index 8ebf20d9e..687a77dfc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json @@ -6,11 +6,11 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.EmptyStorageCell" + "part": "material.empty_storage_cell" }, { "type": "appliedenergistics2:part", - "part": "material.Cell64kPart" + "part": "material.cell64k_part" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json index 2aa99c1f7..e38d7e0eb 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "material.Cell16kPart" + "part": "material.cell16k_part" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -12,14 +12,14 @@ "key": { "b": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "d": { "item": "appliedenergistics2:quartz_glass" }, "c": { "type": "appliedenergistics2:part", - "part": "material.Cell4kPart" + "part": "material.cell4k_part" }, "a": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json index 10be36c87..d4b3d39c1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "material.Cell1kPart" + "part": "material.cell1k_part" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -21,16 +21,16 @@ }, { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystalCharged" + "part": "material.certus_quartz_crystal_charged" }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedCertusQuartzCrystal" + "part": "material.purified_certus_quartz_crystal" } ], "c": { "type": "appliedenergistics2:part", - "part": "material.LogicProcessor" + "part": "material.logic_processor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json index 56a767741..e8d08e8d6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "material.Cell4kPart" + "part": "material.cell4k_part" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -19,11 +19,11 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "material.Cell1kPart" + "part": "material.cell1k_part" }, "b": { "type": "appliedenergistics2:part", - "part": "material.CalcProcessor" + "part": "material.calculation_processor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json index b711589f2..c057c80b5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "material.Cell64kPart" + "part": "material.cell64k_part" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -12,11 +12,11 @@ "key": { "b": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "c": { "type": "appliedenergistics2:part", - "part": "material.Cell16kPart" + "part": "material.cell16k_part" }, "d": { "item": "appliedenergistics2:quartz_glass" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell.json index e113fafec..d62eacc69 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell.json @@ -27,11 +27,11 @@ }, { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystalCharged" + "part": "material.certus_quartz_crystal_charged" }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedCertusQuartzCrystal" + "part": "material.purified_certus_quartz_crystal" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell_storage.json index e034f798f..c4173352f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view_cell_storage.json @@ -6,7 +6,7 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.EmptyStorageCell" + "part": "material.empty_storage_cell" }, [ { @@ -15,11 +15,11 @@ }, { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystalCharged" + "part": "material.certus_quartz_crystal_charged" }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedCertusQuartzCrystal" + "part": "material.purified_certus_quartz_crystal" } ] ] diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json index 95951b4ed..d49f93b54 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json @@ -6,7 +6,7 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, { "item": "appliedenergistics2:crafting_unit" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json index 02bac54a6..507eaab7a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json @@ -6,7 +6,7 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "part.StorageMonitor" + "part": "part.storage_monitor" }, { "item": "appliedenergistics2:crafting_unit" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json index 6d8469f93..a290bafab 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json @@ -6,7 +6,7 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.Cell16kPart" + "part": "material.cell16k_part" }, { "item": "appliedenergistics2:crafting_unit" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json index 5d831e107..342c23093 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json @@ -9,7 +9,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.Cell1kPart" + "part": "material.cell1k_part" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json index 803bb3990..e98a7306b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json @@ -6,7 +6,7 @@ "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.Cell4kPart" + "part": "material.cell4k_part" }, { "item": "appliedenergistics2:crafting_unit" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json index 66c81481f..b5ca14cf2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json @@ -9,7 +9,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.Cell64kPart" + "part": "material.cell64k_part" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json index d1608dd4a..7c4e3a9e4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json @@ -15,7 +15,7 @@ }, "d": { "type": "appliedenergistics2:part", - "part": "material.LogicProcessor" + "part": "material.logic_processor" }, "c": [ { @@ -33,7 +33,7 @@ ], "b": { "type": "appliedenergistics2:part", - "part": "material.CalcProcessor" + "part": "material.calculation_processor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/molecular_assembler.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/molecular_assembler.json index 166b54b46..673bfaab8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/molecular_assembler.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/molecular_assembler.json @@ -11,7 +11,7 @@ "key": { "e": { "type": "appliedenergistics2:part", - "part": "material.FormationCore" + "part": "material.formation_core" }, "b": { "item": "appliedenergistics2:quartz_glass" @@ -26,7 +26,7 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "material.AnnihilationCore" + "part": "material.annihilation_core" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns_blank.json b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns_blank.json index f880968af..dfd79e6a9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns_blank.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns_blank.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "material.BlankPattern" + "part": "material.blank_pattern" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -24,11 +24,11 @@ }, { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystalCharged" + "part": "material.certus_quartz_crystal_charged" }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedCertusQuartzCrystal" + "part": "material.purified_certus_quartz_crystal" } ], "b": { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.json index 3c91be15f..d815063fc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.CableAnchor", + "part": "part.cable_anchor", "count": 3 }, "type": "appliedenergistics2:part_shapeless", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus.json index 3007cd1ab..9614c29aa 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.ExportBus" + "part": "part.export_bus" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -11,7 +11,7 @@ "key": { "b": { "type": "appliedenergistics2:part", - "part": "material.FormationCore" + "part": "material.formation_core" }, "a": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus.json index f15204370..18ddf1d43 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.ImportBus" + "part": "part.import_bus" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -18,7 +18,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.AnnihilationCore" + "part": "material.annihilation_core" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/level_emitter.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/level_emitter.json index eb6ea6770..743df213f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/level_emitter.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/level_emitter.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.LevelEmitter" + "part": "part.level_emitter" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ @@ -10,7 +10,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.CalcProcessor" + "part": "material.calculation_processor" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_conversion.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_conversion.json index ac8aa3b0b..0edeb2fbe 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_conversion.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_conversion.json @@ -1,21 +1,21 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.ConversionMonitor" + "part": "part.conversion_monitor" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.FormationCore" + "part": "material.formation_core" }, { "type": "appliedenergistics2:part", - "part": "part.StorageMonitor" + "part": "part.storage_monitor" }, { "type": "appliedenergistics2:part", - "part": "material.AnnihilationCore" + "part": "material.annihilation_core" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_storage.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_storage.json index 5576d9e09..5ddcde668 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_storage.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors_storage.json @@ -1,13 +1,13 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.StorageMonitor" + "part": "part.storage_monitor" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "part.LevelEmitter" + "part": "part.level_emitter" }, [ { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json index 2d1a9ca7a..270b2b4bd 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json @@ -1,13 +1,13 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.DarkMonitor" + "part": "part.dark_monitor" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "part.Monitor" + "part": "part.monitor" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_monitor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_monitor.json index 92d529c09..4b7b758c1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_monitor.json @@ -1,13 +1,13 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.Monitor" + "part": "part.monitor" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "part.SemiDarkMonitor" + "part": "part.semi_dark_monitor" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json index 15e4b4114..9d6f31c31 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.SemiDarkMonitor", + "part": "part.semi_dark_monitor", "count": 3 }, "type": "appliedenergistics2:part_shaped", diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json index 3ed959a35..0d4aadcf1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json @@ -1,13 +1,13 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.SemiDarkMonitor" + "part": "part.semi_dark_monitor" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "part.DarkMonitor" + "part": "part.dark_monitor" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json index 90689467c..220cce535 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.AnnihilationPlane" + "part": "part.annihilation_plane" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -20,12 +20,12 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ], "c": { "type": "appliedenergistics2:part", - "part": "material.AnnihilationCore" + "part": "material.annihilation_core" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json index ad969d776..f5551a365 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.AnnihilationPlane" + "part": "part.annihilation_plane" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -21,12 +21,12 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ], "c": { "type": "appliedenergistics2:part", - "part": "material.AnnihilationCore" + "part": "material.annihilation_core" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json index ee4f6668a..c5d7bf80b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json @@ -1,17 +1,17 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.IdentityAnnihilationPlane" + "part": "part.identity_annihilation_plane" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "part.AnnihilationPlane" + "part": "part.annihilation_plane" }, { "type": "appliedenergistics2:part", - "part": "material.FluixPearl" + "part": "material.fluix_pearl" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation.json index 4062943e0..4cc1b0931 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.FormationPlane" + "part": "part.formation_plane" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -11,7 +11,7 @@ "key": { "c": { "type": "appliedenergistics2:part", - "part": "material.FormationCore" + "part": "material.formation_core" }, "b": { "type": "forge:ore_dict", @@ -24,8 +24,8 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_alt.json index b4e137989..ee4611895 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes_formation_alt.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.FormationPlane" + "part": "part.formation_plane" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -12,7 +12,7 @@ "key": { "c": { "type": "appliedenergistics2:part", - "part": "material.FormationCore" + "part": "material.formation_core" }, "a": { "type": "forge:ore_dict", @@ -25,8 +25,8 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json index 59c6c2600..0cf36f7bc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.QuartzFiber", + "part": "part.quartz_fiber", "count": 3 }, "type": "appliedenergistics2:part_shaped", @@ -35,4 +35,4 @@ } ] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus.json index 43931a049..0610115b9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.StorageBus" + "part": "part.storage_bus" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ @@ -14,11 +14,11 @@ }, { "type": "appliedenergistics2:part", - "part": "part.Interface" + "part": "part.interface" } ], { "item": "minecraft:piston" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.json index 91b7ee317..902ba0457 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.json @@ -1,13 +1,13 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.Terminal" + "part": "part.terminal" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.FormationCore" + "part": "material.formation_core" }, [ { @@ -17,11 +17,11 @@ ], { "type": "appliedenergistics2:part", - "part": "material.LogicProcessor" + "part": "material.logic_processor" }, { "type": "appliedenergistics2:part", - "part": "material.AnnihilationCore" + "part": "material.annihilation_core" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_crafting.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_crafting.json index 4f257312d..4214e7000 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_crafting.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_crafting.json @@ -1,13 +1,13 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.CraftingTerminal" + "part": "part.crafting_terminal" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "part.Terminal" + "part": "part.terminal" }, { "type": "forge:ore_dict", @@ -15,7 +15,7 @@ }, { "type": "appliedenergistics2:part", - "part": "material.CalcProcessor" + "part": "material.calculation_processor" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_interface.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_interface.json index 92e59ea08..5ab5c3529 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_interface.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_interface.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.InterfaceTerminal" + "part": "part.interface_terminal" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ @@ -13,7 +13,7 @@ ], { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, [ { @@ -21,8 +21,8 @@ }, { "type": "appliedenergistics2:part", - "part": "part.Interface" + "part": "part.interface" } ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_pattern.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_pattern.json index 5fb5cee9f..a99eacf44 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_pattern.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_pattern.json @@ -1,17 +1,17 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.PatternTerminal" + "part": "part.pattern_terminal" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, { "type": "appliedenergistics2:part", - "part": "part.CraftingTerminal" + "part": "part.crafting_terminal" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus.json index bd95eddfd..b4ce83bc6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.ToggleBus" + "part": "part.toggle_bus" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -32,4 +32,4 @@ } ] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json index 2611eaa0b..0a17b5c51 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json @@ -1,13 +1,13 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.ToggleBus" + "part": "part.toggle_bus" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "part.InvertedToggleBus" + "part": "part.inverted_toggle_bus" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json index 12fd966f5..3dcea02dd 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json @@ -1,13 +1,13 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.InvertedToggleBus" + "part": "part.inverted_toggle_bus" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ { "type": "appliedenergistics2:part", - "part": "part.ToggleBus" + "part": "part.toggle_bus" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json index de6c14374..d6b50e718 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels_me.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "part.P2PTunnelME" + "part": "part.p2p_tunnel_me" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -12,7 +12,7 @@ "key": { "b": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "a": { "type": "forge:ore_dict", @@ -25,8 +25,8 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_access_point.json b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_access_point.json index c5774ffed..d305e1701 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_access_point.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_access_point.json @@ -11,7 +11,7 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "material.Wireless" + "part": "material.wireless" }, "c": [ { @@ -29,7 +29,7 @@ ], "b": { "type": "appliedenergistics2:part", - "part": "material.CalcProcessor" + "part": "material.calculation_processor" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_booster.json b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_booster.json index 9c0894ba7..692f89a35 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_booster.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_booster.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "material.WirelessBooster", + "part": "material.wireless_booster", "count": 2 }, "type": "appliedenergistics2:part_shaped", @@ -21,11 +21,11 @@ }, { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystalCharged" + "part": "material.certus_quartz_crystal_charged" }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedCertusQuartzCrystal" + "part": "material.purified_certus_quartz_crystal" } ], "a": { @@ -43,4 +43,4 @@ } ] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_part.json b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_part.json index 81fa3f145..a8efcc6a5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_part.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_part.json @@ -1,7 +1,7 @@ { "result": { "type": "appliedenergistics2:part", - "part": "material.Wireless" + "part": "material.wireless" }, "type": "appliedenergistics2:part_shaped", "pattern": [ @@ -16,11 +16,11 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "part.QuartzFiber" + "part": "part.quartz_fiber" }, "a": { "type": "appliedenergistics2:part", - "part": "material.FluixPearl" + "part": "material.fluix_pearl" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_terminal.json b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_terminal.json index 76e24cef6..b4ae269c4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless_terminal.json @@ -11,14 +11,14 @@ "key": { "b": { "type": "appliedenergistics2:part", - "part": "part.Terminal" + "part": "part.terminal" }, "c": { "item": "appliedenergistics2:dense_energy_cell" }, "a": { "type": "appliedenergistics2:part", - "part": "material.Wireless" + "part": "material.wireless" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/matter_cannon.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/matter_cannon.json index 1dce3cccc..82bceb0cd 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/matter_cannon.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/matter_cannon.json @@ -11,7 +11,7 @@ "key": { "b": { "type": "appliedenergistics2:part", - "part": "material.FormationCore" + "part": "material.formation_core" }, "a": { "type": "forge:ore_dict", @@ -19,10 +19,10 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "material.Cell4kPart" + "part": "material.cell4k_part" }, "d": { "item": "appliedenergistics2:energy_cell" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_charged_staff.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_charged_staff.json index 8701f98b4..13cad9214 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_charged_staff.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_charged_staff.json @@ -15,7 +15,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.CertusQuartzCrystalCharged" + "part": "material.certus_quartz_crystal_charged" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json index 729ba3fa8..77937174c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json @@ -11,7 +11,7 @@ "key": { "c": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "d": { "type": "forge:ore_dict", @@ -27,8 +27,8 @@ }, { "type": "appliedenergistics2:part", - "part": "material.PurifiedFluixCrystal" + "part": "material.purified_fluix_crystal" } ] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_biometric_card.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_biometric_card.json index 1019b39ef..e1826e554 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_biometric_card.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_biometric_card.json @@ -10,7 +10,7 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "material.EngProcessor" + "part": "material.engineering_processor" }, "b": { "type": "forge:ore_dict", @@ -25,4 +25,4 @@ "ore": "ingotGold" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_color_applicator.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_color_applicator.json index 572be19b1..fd8a59f3f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_color_applicator.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_color_applicator.json @@ -11,7 +11,7 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "material.FormationCore" + "part": "material.formation_core" }, "b": { "type": "forge:ore_dict", @@ -19,10 +19,10 @@ }, "c": { "type": "appliedenergistics2:part", - "part": "material.Cell4kPart" + "part": "material.cell4k_part" }, "d": { "item": "appliedenergistics2:energy_cell" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_memory_card.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_memory_card.json index fe81195d8..df1593880 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_memory_card.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_memory_card.json @@ -22,7 +22,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.CalcProcessor" + "part": "material.calculation_processor" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_portable_cell.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_portable_cell.json index d2c9842ac..ec4e6a58b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_portable_cell.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_portable_cell.json @@ -15,7 +15,7 @@ }, "b": { "type": "appliedenergistics2:part", - "part": "material.Cell1kPart" + "part": "material.cell1k_part" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_tool.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_tool.json index 29c8e349a..e4c088cb2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network_tool.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network_tool.json @@ -24,7 +24,7 @@ ], { "type": "appliedenergistics2:part", - "part": "material.CalcProcessor" + "part": "material.calculation_processor" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_black.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_black.json index 8abe011c9..a95a214ab 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_black.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_black.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_blue.json index e06bd1e57..d6f445f85 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_blue.json @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" }, "b": { "type": "forge:ore_dict", "ore": "dyeBlue" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_brown.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_brown.json index 34aa2f446..f3ab6c8a7 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_brown.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_brown.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_cyan.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_cyan.json index a0eca6b42..9dd1b7ca8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_cyan.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_cyan.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_gray.json index ce2424c4d..5baec29b3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_gray.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_green.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_green.json index 64300e7cd..9daa722d5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_green.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_green.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_blue.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_blue.json index 2d29dcebc..ae7c8935e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_blue.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_blue.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_gray.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_gray.json index 4b633d6ca..1e78f2736 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_gray.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_light_gray.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lime.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lime.json index 1f02d6316..590b357f5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lime.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_lime.json @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" }, "b": { "type": "forge:ore_dict", "ore": "dyeLime" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_magenta.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_magenta.json index 6aaac2a31..be197eab9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_magenta.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_magenta.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_orange.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_orange.json index 84a79b434..c9bea9b52 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_orange.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_orange.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_pink.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_pink.json index d809dfc98..695f65a1e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_pink.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_pink.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_purple.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_purple.json index a5f1da24d..0dec3a165 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_purple.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_purple.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_red.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_red.json index 87c98ec71..50a1c1a38 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_red.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_red.json @@ -13,11 +13,11 @@ "key": { "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" }, "b": { "type": "forge:ore_dict", "ore": "dyeRed" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_white.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_white.json index 9cd85a0ac..d339cd085 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_white.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_white.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_yellow.json b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_yellow.json index 3288722d1..942728bd4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_yellow.json +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs_yellow.json @@ -17,7 +17,7 @@ }, "a": { "type": "appliedenergistics2:part", - "part": "material.MatterBall" + "part": "material.matter_ball" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/material_adv_card.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_advanced_card.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/material_adv_card.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_advanced_card.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/material_calc_processor.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_calculation_processor.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/material_calc_processor.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_calculation_processor.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/material_calc_processor_press.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_calculation_processor_press.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/material_calc_processor_press.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_calculation_processor_press.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/material_calc_processor_print.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_calculation_processor_print.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/material_calc_processor_print.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_calculation_processor_print.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/material_eng_processor.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_engineering_processor.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/material_eng_processor.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_engineering_processor.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/material_eng_processor_press.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_engineering_processor_press.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/material_eng_processor_press.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_engineering_processor_press.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/material_eng_processor_print.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_engineering_processor_print.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/material_eng_processor_print.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_engineering_processor_print.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/material_qesingularity.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_quantum_entangled_singularity.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/material_qesingularity.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_quantum_entangled_singularity.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/White.png b/src/main/resources/assets/appliedenergistics2/textures/items/white.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/White.png rename to src/main/resources/assets/appliedenergistics2/textures/items/white.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/black.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/black.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/black.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/brown.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/brown.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/cyan.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/cyan.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/green.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/green.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/green.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/lime.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/lime.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/magenta.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/magenta.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/orange.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/orange.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/pink.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/pink.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/purple.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/purple.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/red.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/red.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/red.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/transparent.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/transparent.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/white.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/white.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/white.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/white.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/yellow.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/yellow.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/0.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/0.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/0.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/0.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/1.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/1.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/1.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/1.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/10.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/10.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/10.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/10.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/11.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/11.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/11.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/11.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/12.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/12.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/12.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/12.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/13.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/13.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/13.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/13.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/14.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/14.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/14.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/14.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/15.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/15.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/15.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/15.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/16.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/16.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/16.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/16.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/17.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/17.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/17.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/17.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/18.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/18.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/18.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/18.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/19.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/19.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/19.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/19.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/2.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/2.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/2.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/2.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/20.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/20.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/20.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/20.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/21.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/21.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/21.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/21.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/22.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/22.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/22.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/22.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/23.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/23.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/23.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/23.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/24.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/24.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/24.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/24.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/25.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/25.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/25.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/25.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/26.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/26.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/26.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/26.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/27.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/27.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/27.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/27.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/28.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/28.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/28.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/28.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/29.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/29.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/29.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/29.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/3.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/3.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/3.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/3.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/30.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/30.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/30.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/30.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/31.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/31.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/31.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/31.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/32.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/32.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/32.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/32.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/4.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/4.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/4.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/4.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/5.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/5.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/5.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/5.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/6.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/6.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/6.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/6.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/7.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/7.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/7.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/7.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/8.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/8.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/8.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/8.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/9.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/9.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/9.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/9.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/black.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/black.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/black.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/brown.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/brown.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/cyan.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/cyan.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/green.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/green.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/green.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/lime.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/lime.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/magenta.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/magenta.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/orange.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/orange.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/pink.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/pink.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/purple.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/purple.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/red.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/red.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/red.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/transparent.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/transparent.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/white.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/white.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/white.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/white.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/yellow.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/yellow.png