fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1278 from thatsIch/b-1277-no-mj-config

Browse Source 
Fixes #1277: Removed config option for MJ-P2P Tunnel
This commit is contained in:
thatsIch
2015-04-23 23:48:55 +02:00
parent 2c5a54c210 eca598516e
commit 8e75de8fb9
17 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/features/AEFeature.java
+1 -1
View File
@@ -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" ),
src/main/java/appeng/core/localization/GuiText.java
+1 -1
View File
@@ -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,
src/main/java/appeng/core/settings/TickRates.java
-2
View File
@@ -33,8 +33,6 @@ public enum TickRates
AnnihilationPlane( 2, 120 ),
MJTunnel( 1, 20 ),
METunnel( 5, 20 ),
Inscriber( 1, 1 ),
src/main/java/appeng/integration/IntegrationType.java
-4
View File
@@ -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" ),
src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang
-2
View File
@@ -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
src/main/resources/assets/appliedenergistics2/lang/de_DE.lang
-2
View File
@@ -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
src/main/resources/assets/appliedenergistics2/lang/en_US.lang
-2
View File
@@ -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
src/main/resources/assets/appliedenergistics2/lang/es_ES.lang
-2
View File
@@ -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
src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang
-2
View File
@@ -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
src/main/resources/assets/appliedenergistics2/lang/hu_HU.lang
-2
View File
@@ -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
src/main/resources/assets/appliedenergistics2/lang/it_IT.lang
-2
View File
@@ -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
src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang
-2
View File
@@ -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)
src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang
-2
View File
@@ -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
src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang
-2
View File
@@ -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
src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang
-2
View File
@@ -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
src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang
-2
View File
@@ -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
src/main/resources/assets/appliedenergistics2/lang/zh_TW.lang
-2
View File
@@ -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