diff --git a/src/main/java/appeng/core/features/AEFeature.java b/src/main/java/appeng/core/features/AEFeature.java index 49beded73..3bf522710 100644 --- a/src/main/java/appeng/core/features/AEFeature.java +++ b/src/main/java/appeng/core/features/AEFeature.java @@ -57,7 +57,7 @@ public enum AEFeature DenseEnergyCells( "HigherCapacity" ), DenseCables( "HigherCapacity" ), - P2PTunnelRF( "P2PTunnels" ), P2PTunnelME( "P2PTunnels" ), P2PTunnelItems( "P2PTunnels" ), P2PTunnelRedstone( "P2PTunnels" ), P2PTunnelEU( "P2PTunnels" ), P2PTunnelMJ( "P2PTunnels" ), P2PTunnelLiquids( "P2PTunnels" ), P2PTunnelLight( "P2PTunnels" ), + P2PTunnelRF( "P2PTunnels" ), P2PTunnelME( "P2PTunnels" ), P2PTunnelItems( "P2PTunnels" ), P2PTunnelRedstone( "P2PTunnels" ), P2PTunnelEU( "P2PTunnels" ), P2PTunnelLiquids( "P2PTunnels" ), P2PTunnelLight( "P2PTunnels" ), MassCannonBlockDamage( "BlockFeatures" ), TinyTNTBlockDamage( "BlockFeatures" ), Facades( "Facades" ), diff --git a/src/main/java/appeng/core/localization/GuiText.java b/src/main/java/appeng/core/localization/GuiText.java index 1e591dca2..c1851067c 100644 --- a/src/main/java/appeng/core/localization/GuiText.java +++ b/src/main/java/appeng/core/localization/GuiText.java @@ -44,7 +44,7 @@ public enum GuiText CraftingTerminal, FormationPlane, Inscriber, QuartzCuttingKnife, - METunnel, ItemTunnel, RedstoneTunnel, MJTunnel, EUTunnel, FluidTunnel, + METunnel, ItemTunnel, RedstoneTunnel, EUTunnel, FluidTunnel, StoredSize, CopyMode, CopyModeDesc, PatternTerminal, CraftingPattern, diff --git a/src/main/java/appeng/core/settings/TickRates.java b/src/main/java/appeng/core/settings/TickRates.java index 8fa6daf4d..ac2ac7d0c 100644 --- a/src/main/java/appeng/core/settings/TickRates.java +++ b/src/main/java/appeng/core/settings/TickRates.java @@ -33,8 +33,6 @@ public enum TickRates AnnihilationPlane( 2, 120 ), - MJTunnel( 1, 20 ), - METunnel( 5, 20 ), Inscriber( 1, 1 ), diff --git a/src/main/java/appeng/integration/IntegrationType.java b/src/main/java/appeng/integration/IntegrationType.java index d83f4600d..e0ac4d125 100644 --- a/src/main/java/appeng/integration/IntegrationType.java +++ b/src/main/java/appeng/integration/IntegrationType.java @@ -29,10 +29,6 @@ public enum IntegrationType BC( IntegrationSide.BOTH, "BuildCraft", "BuildCraft|Silicon" ), - MJ6( IntegrationSide.BOTH, "BuildCraft6 Power", null ), - - MJ5( IntegrationSide.BOTH, "BuildCraft5 Power", null ), - RF( IntegrationSide.BOTH, "RedstoneFlux Power - Tiles", "CoFHAPI" ), RFItem( IntegrationSide.BOTH, "RedstoneFlux Power - Items", "CoFHAPI" ), diff --git a/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang b/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang index be9dc4014..457a6c80a 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang @@ -71,7 +71,6 @@ gui.appliedenergistics2.METunnel=ME gui.appliedenergistics2.ItemTunnel=Předmět gui.appliedenergistics2.FluidTunnel=Tekutina gui.appliedenergistics2.RedstoneTunnel=Rudit -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.RFTunnel=RF gui.appliedenergistics2.LightTunnel=Světlo @@ -280,7 +279,6 @@ gui.tooltips.appliedenergistics2.ReportInaccessibleItemsYes=Ano: Předměty, kte gui.tooltips.appliedenergistics2.ReportInaccessibleItemsNo=Ne: Vidět budou pouze předměty, které mohou být vyextrahovány. gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=Minecraftové Jouly gui.appliedenergistics2.units.ic2=Jednotky energie gui.appliedenergistics2.units.mekanism=Jouly gui.appliedenergistics2.units.rotarycraft=Watty diff --git a/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang b/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang index ad435613f..ffee6d93f 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang @@ -71,7 +71,6 @@ gui.appliedenergistics2.METunnel=ME gui.appliedenergistics2.ItemTunnel=Item gui.appliedenergistics2.FluidTunnel=Flüssigkeiten gui.appliedenergistics2.RedstoneTunnel=Redstone -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.RFTunnel=RF gui.appliedenergistics2.LightTunnel=Licht @@ -280,7 +279,6 @@ gui.tooltips.appliedenergistics2.ReportInaccessibleItemsYes=Ja: Items, die nicht gui.tooltips.appliedenergistics2.ReportInaccessibleItemsNo=Nein: Nur extrahierbare Items werden sichtbar. gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=Minecraft Joules gui.appliedenergistics2.units.ic2=Energy Units gui.appliedenergistics2.units.mekanism=Joules gui.appliedenergistics2.units.rotarycraft=Watt diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang index 5b22c941d..17d7e3bd0 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang @@ -88,7 +88,6 @@ gui.appliedenergistics2.METunnel=ME gui.appliedenergistics2.ItemTunnel=Item gui.appliedenergistics2.FluidTunnel=Fluid gui.appliedenergistics2.RedstoneTunnel=Redstone -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.RFTunnel=RF gui.appliedenergistics2.LightTunnel=Light @@ -307,7 +306,6 @@ gui.tooltips.appliedenergistics2.ItemsRequestable=Items Requestable: %s // Units gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=Minecraft Joules gui.appliedenergistics2.units.ic2=Energy Units gui.appliedenergistics2.units.mekanism=Joules gui.appliedenergistics2.units.rotarycraft=Watts diff --git a/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang b/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang index 093ddb34c..98e6cfa45 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang @@ -71,7 +71,6 @@ gui.appliedenergistics2.METunnel=ME gui.appliedenergistics2.ItemTunnel=Objetos gui.appliedenergistics2.FluidTunnel=Fluidos gui.appliedenergistics2.RedstoneTunnel=Redstone -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.RFTunnel=RF gui.appliedenergistics2.LightTunnel=Luz @@ -264,7 +263,6 @@ gui.tooltips.appliedenergistics2.TerminalStyle_Tall=Terminal Centrada Alta gui.tooltips.appliedenergistics2.TerminalStyle_Small=Terminal Centrada Pequeña gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=Minecraft Joules gui.appliedenergistics2.units.ic2=Energy Units gui.appliedenergistics2.units.mekanism=Joules gui.appliedenergistics2.units.rotarycraft=Watts diff --git a/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang b/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang index 859c79d1b..ae62ff9ae 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang @@ -81,7 +81,6 @@ gui.appliedenergistics2.METunnel=ME gui.appliedenergistics2.ItemTunnel=Objet gui.appliedenergistics2.FluidTunnel=Fluide gui.appliedenergistics2.RedstoneTunnel=Redstone -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.RFTunnel=RF gui.appliedenergistics2.LightTunnel=Lumière @@ -293,7 +292,6 @@ gui.tooltips.appliedenergistics2.BlockPlacementYes=Les blocs seront placés comm gui.tooltips.appliedenergistics2.BlockPlacementNo=Les blocs seront jettés comme un élément. gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=Minecraft Joules gui.appliedenergistics2.units.ic2=Energy Units gui.appliedenergistics2.units.mekanism=Joules gui.appliedenergistics2.units.rotarycraft=Watts diff --git a/src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang b/src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang index 5ee0ff96c..0ea21aa3a 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang @@ -71,7 +71,6 @@ gui.appliedenergistics2.METunnel=ME gui.appliedenergistics2.ItemTunnel=Item gui.appliedenergistics2.FluidTunnel=Folyadék gui.appliedenergistics2.RedstoneTunnel=Vöröskő -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.RFTunnel=RF gui.appliedenergistics2.LightTunnel=Fény @@ -260,7 +259,6 @@ gui.tooltips.appliedenergistics2.TerminalStyle_Tall=Tall Centered Terminal gui.tooltips.appliedenergistics2.TerminalStyle_Small=Small Centered Terminal gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=Minecraft Joules gui.appliedenergistics2.units.ic2=Energy Units gui.appliedenergistics2.units.mekanism=Joules gui.appliedenergistics2.units.rotarycraft=Watts diff --git a/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang b/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang index 35579b540..eefcde4e4 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang @@ -84,7 +84,6 @@ gui.appliedenergistics2.METunnel=ME gui.appliedenergistics2.ItemTunnel=Oggetto gui.appliedenergistics2.FluidTunnel=Fluido gui.appliedenergistics2.RedstoneTunnel=Pietrarossa -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.RFTunnel=RF gui.appliedenergistics2.LightTunnel=Luce @@ -296,7 +295,6 @@ gui.tooltips.appliedenergistics2.BlockPlacementYes=I blocchi saranno piazzati co gui.tooltips.appliedenergistics2.BlockPlacementNo=I blocchi saranno fatti cadere come oggetti. gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=Minecraft Joules gui.appliedenergistics2.units.ic2=Energy Units gui.appliedenergistics2.units.mekanism=Joules gui.appliedenergistics2.units.rotarycraft=Watts diff --git a/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang b/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang index 2b03fc278..622260367 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang @@ -81,7 +81,6 @@ gui.appliedenergistics2.METunnel=ME gui.appliedenergistics2.ItemTunnel=아이템 gui.appliedenergistics2.FluidTunnel=액체 gui.appliedenergistics2.RedstoneTunnel=레드스톤 -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.RFTunnel=RF gui.appliedenergistics2.LightTunnel=빛 @@ -290,7 +289,6 @@ gui.tooltips.appliedenergistics2.ReportInaccessibleItemsYes=Yes: Items that cann gui.tooltips.appliedenergistics2.ReportInaccessibleItemsNo=No: Only extractable items will be visible. gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=마인크래프트 줄(MJ) gui.appliedenergistics2.units.ic2=에너지 단위(EU) gui.appliedenergistics2.units.mekanism=줄(J) gui.appliedenergistics2.units.rotarycraft=와트(W) diff --git a/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang b/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang index 7c79a304f..f50dcbc53 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang @@ -81,7 +81,6 @@ gui.appliedenergistics2.METunnel=ME gui.appliedenergistics2.ItemTunnel=Item gui.appliedenergistics2.FluidTunnel=Fluido gui.appliedenergistics2.RedstoneTunnel=Redstone -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.RFTunnel=RF gui.appliedenergistics2.LightTunnel=Luz @@ -290,7 +289,6 @@ gui.tooltips.appliedenergistics2.ReportInaccessibleItemsYes=Sim: Itens que não gui.tooltips.appliedenergistics2.ReportInaccessibleItemsNo=Não: Apenas itens extraíveis vão estar visíveis. gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=Minecraft Joules gui.appliedenergistics2.units.ic2=Energy Units gui.appliedenergistics2.units.mekanism=Joules gui.appliedenergistics2.units.rotarycraft=Watts diff --git a/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang b/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang index f7548c282..f77fa4020 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang @@ -62,7 +62,6 @@ gui.appliedenergistics2.METunnel=ME gui.appliedenergistics2.ItemTunnel=de Iteme gui.appliedenergistics2.FluidTunnel=de Fluide gui.appliedenergistics2.RedstoneTunnel=de Piatră-roşie -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.security.extract.name=Retrage @@ -192,7 +191,6 @@ gui.tooltips.appliedenergistics2.InventoryTweaks=Reordonare Inventar gui.tooltips.appliedenergistics2.TerminalStyle=Stil de Terminalgui.tooltips.appliedenergistics2.TerminalStyle_Full=Terminal de Ecran Maregui.tooltips.appliedenergistics2.TerminalStyle_Tall=Terminal Centrat Maregui.tooltips.appliedenergistics2.TerminalStyle_Small=Terminal Centrat Mic gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=Jouli de Minecraft gui.appliedenergistics2.units.ic2=Unități de Energie gui.appliedenergistics2.units.universalelectricity=Kilo Jouli gui.appliedenergistics2.units.rotarycraft=Wați diff --git a/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang b/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang index a655fd687..4739c8aa1 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang @@ -88,7 +88,6 @@ gui.appliedenergistics2.METunnel=МЭ gui.appliedenergistics2.ItemTunnel=Предмет gui.appliedenergistics2.FluidTunnel=Жидкость gui.appliedenergistics2.RedstoneTunnel=Красный камень -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.RFTunnel=RF gui.appliedenergistics2.LightTunnel=Свет @@ -307,7 +306,6 @@ gui.tooltips.appliedenergistics2.ItemsRequestable=Запрашиваемые п // Units gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=Minecraft Joules gui.appliedenergistics2.units.ic2=Energy Units gui.appliedenergistics2.units.mekanism=Joules gui.appliedenergistics2.units.rotarycraft=Watts diff --git a/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang b/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang index eb2329496..ed7af5c4c 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang @@ -88,7 +88,6 @@ gui.appliedenergistics2.METunnel=ME gui.appliedenergistics2.ItemTunnel=物品 gui.appliedenergistics2.FluidTunnel=液体 gui.appliedenergistics2.RedstoneTunnel=红石 -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.RFTunnel=RF gui.appliedenergistics2.LightTunnel=光 @@ -307,7 +306,6 @@ gui.tooltips.appliedenergistics2.ItemsRequestable=Items Requestable: %s // 单位 gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=MJ gui.appliedenergistics2.units.ic2=EU gui.appliedenergistics2.units.mekanism=Joules gui.appliedenergistics2.units.rotarycraft=Watts diff --git a/src/main/resources/assets/appliedenergistics2/lang/zh_TW.lang b/src/main/resources/assets/appliedenergistics2/lang/zh_TW.lang index 7dd2a9f8f..d26919361 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/zh_TW.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/zh_TW.lang @@ -71,7 +71,6 @@ gui.appliedenergistics2.METunnel=ME gui.appliedenergistics2.ItemTunnel=物品 gui.appliedenergistics2.FluidTunnel=液體 gui.appliedenergistics2.RedstoneTunnel=紅石 -gui.appliedenergistics2.MJTunnel=MJ gui.appliedenergistics2.EUTunnel=EU gui.appliedenergistics2.RFTunnel=RF gui.appliedenergistics2.LightTunnel=光 @@ -258,7 +257,6 @@ gui.tooltips.appliedenergistics2.TerminalStyle_Tall=長 gui.tooltips.appliedenergistics2.TerminalStyle_Small=短 gui.appliedenergistics2.units.appliedenergstics=AE -gui.appliedenergistics2.units.buildcraft=MJ gui.appliedenergistics2.units.ic2=EU gui.appliedenergistics2.units.universalelectricity=KJ gui.appliedenergistics2.units.rotarycraft=Watts