Merge pull request #2100 from yueh/fix-2099

Fixes #2099: No neighbor update of Pressure P2P before IAirHandler is validated.

build.gradle

@@ -78,8 +78,12 @@ minecraft {
     version = minecraft_version + "-" + forge_version
 
     replaceIn "AEConfig.java"
+    replaceIn "package-info.java"
+
     replace "@version@", project.version
+    replace "@aeversion@", aeversion
     replace "@aechannel@", aechannel
+    replace "@aebuild@", aebuild
 
     // used when launching minecraft in dev env
     runDir = "run"

src/api/java/appeng/api/package-info.java

@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-@API( apiVersion = "rv2", owner = "appliedenergistics2", provides = "appliedenergistics2|API" ) package appeng.api;
+@API( apiVersion = "@aeversion@", owner = "appliedenergistics2", provides = "appliedenergistics2|API" ) package appeng.api;
 
 
 import cpw.mods.fml.common.API;

src/main/java/appeng/me/cache/NetworkMonitor.java

@@ -21,34 +21,295 @@ package appeng.me.cache;
 
 import java.util.Collection;
 import java.util.Deque;
+import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
+import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.annotation.Nonnegative;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+import appeng.api.config.AccessRestriction;
+import appeng.api.config.Actionable;
 import appeng.api.networking.events.MENetworkStorageEvent;
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IMEInventoryHandler;
+import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.IMEMonitorHandlerReceiver;
-import appeng.api.storage.MEMonitorHandler;
 import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;
 import appeng.me.storage.ItemWatcher;
 
 
-public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
+public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 {
+	@Nonnull
+	private static final Deque<NetworkMonitor<?>> GLOBAL_DEPTH = Lists.newLinkedList();
 
-	private static final Deque<NetworkMonitor<?>> DEPTH = new LinkedList<NetworkMonitor<?>>();
+	@Nonnull
 	private final GridStorageCache myGridCache;
+	@Nonnull
 	private final StorageChannel myChannel;
+	@Nonnull
+	private final IItemList<T> cachedList;
+	@Nonnull
+	private final Map<IMEMonitorHandlerReceiver<T>, Object> listeners;
+
 	private boolean sendEvent = false;
+	private boolean hasChanged = false;
+	@Nonnegative
+	private int localDepthSemaphore = 0;
 
 	public NetworkMonitor( final GridStorageCache cache, final StorageChannel chan )
 	{
-		super( null, chan );
 		this.myGridCache = cache;
 		this.myChannel = chan;
+		this.cachedList = (IItemList<T>) chan.createList();
+		this.listeners = new HashMap<IMEMonitorHandlerReceiver<T>, Object>();
+	}
+
+	@Override
+	public void addListener( final IMEMonitorHandlerReceiver<T> l, final Object verificationToken )
+	{
+		this.listeners.put( l, verificationToken );
+	}
+
+	@Override
+	public boolean canAccept( final T input )
+	{
+		return this.getHandler().canAccept( input );
+	}
+
+	@Override
+	public T extractItems( final T request, final Actionable mode, final BaseActionSource src )
+	{
+		if( mode == Actionable.SIMULATE )
+		{
+			return this.getHandler().extractItems( request, mode, src );
+		}
+
+		localDepthSemaphore++;
+		final T leftover = this.getHandler().extractItems( request, mode, src );
+		localDepthSemaphore--;
+
+		if( localDepthSemaphore == 0 )
+		{
+			this.monitorDifference( request.copy(), leftover, true, src );
+		}
+
+		return leftover;
+	}
+
+	@Override
+	public AccessRestriction getAccess()
+	{
+		return this.getHandler().getAccess();
+	}
+
+	@Override
+	public IItemList<T> getAvailableItems( final IItemList out )
+	{
+		return this.getHandler().getAvailableItems( out );
+	}
+
+	@Override
+	public StorageChannel getChannel()
+	{
+		return this.getHandler().getChannel();
+	}
+
+	@Override
+	public int getPriority()
+	{
+		return this.getHandler().getPriority();
+	}
+
+	@Override
+	public int getSlot()
+	{
+		return this.getHandler().getSlot();
+	}
+
+	@Nonnull
+	@Override
+	public IItemList<T> getStorageList()
+	{
+		if( this.hasChanged )
+		{
+			this.hasChanged = false;
+			this.cachedList.resetStatus();
+			return this.getAvailableItems( this.cachedList );
+		}
+
+		return this.cachedList;
+	}
+
+	@Override
+	public T injectItems( final T input, final Actionable mode, final BaseActionSource src )
+	{
+		if( mode == Actionable.SIMULATE )
+		{
+			return this.getHandler().injectItems( input, mode, src );
+		}
+
+		localDepthSemaphore++;
+		final T leftover = this.getHandler().injectItems( input, mode, src );
+		localDepthSemaphore--;
+
+		if( localDepthSemaphore == 0 )
+		{
+			this.monitorDifference( input.copy(), leftover, false, src );
+		}
+
+		return leftover;
+	}
+
+	@Override
+	public boolean isPrioritized( final T input )
+	{
+		return this.getHandler().isPrioritized( input );
+	}
+
+	@Override
+	public void removeListener( final IMEMonitorHandlerReceiver<T> l )
+	{
+		this.listeners.remove( l );
+	}
+
+	@Override
+	public boolean validForPass( final int i )
+	{
+		return this.getHandler().validForPass( i );
+	}
+
+	@Nullable
+	@SuppressWarnings( "unchecked" )
+	private IMEInventoryHandler<T> getHandler()
+	{
+		switch( this.myChannel )
+		{
+			case ITEMS:
+				return (IMEInventoryHandler<T>) this.myGridCache.getItemInventoryHandler();
+			case FLUIDS:
+				return (IMEInventoryHandler<T>) this.myGridCache.getFluidInventoryHandler();
+			default:
+		}
+		return null;
+	}
+
+	private Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> getListeners()
+	{
+		return this.listeners.entrySet().iterator();
+	}
+
+	private T monitorDifference( final IAEStack original, final T leftOvers, final boolean extraction, final BaseActionSource src )
+	{
+		final T diff = (T) original.copy();
+
+		if( extraction )
+		{
+			diff.setStackSize( leftOvers == null ? 0 : -leftOvers.getStackSize() );
+		}
+		else if( leftOvers != null )
+		{
+			diff.decStackSize( leftOvers.getStackSize() );
+		}
+
+		if( diff.getStackSize() != 0 )
+		{
+			this.postChangesToListeners( ImmutableList.of( diff ), src );
+		}
+
+		return leftOvers;
+	}
+
+	private void notifyListenersOfChange( final Iterable<T> diff, final BaseActionSource src )
+	{
+		this.hasChanged = true;
+		final Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = this.getListeners();
+
+		while( i.hasNext() )
+		{
+			final Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
+			final IMEMonitorHandlerReceiver<T> receiver = o.getKey();
+			if( receiver.isValid( o.getValue() ) )
+			{
+				receiver.postChange( this, diff, src );
+			}
+			else
+			{
+				i.remove();
+			}
+		}
+	}
+
+	private void postChangesToListeners( final Iterable<T> changes, final BaseActionSource src )
+	{
+		this.postChange( true, changes, src );
+	}
+
+	protected void postChange( final boolean add, final Iterable<T> changes, final BaseActionSource src )
+	{
+		if( localDepthSemaphore > 0 || GLOBAL_DEPTH.contains( this ) )
+		{
+			return;
+		}
+
+		GLOBAL_DEPTH.push( this );
+		localDepthSemaphore++;
+
+		this.sendEvent = true;
+
+		this.notifyListenersOfChange( changes, src );
+
+		for( final T changedItem : changes )
+		{
+			T difference = changedItem;
+
+			if( !add && changedItem != null )
+			{
+				difference = changedItem.copy();
+				difference.setStackSize( -changedItem.getStackSize() );
+			}
+
+			if( this.myGridCache.getInterestManager().containsKey( changedItem ) )
+			{
+				final Collection<ItemWatcher> list = this.myGridCache.getInterestManager().get( changedItem );
+
+				if( !list.isEmpty() )
+				{
+					IAEStack fullStack = this.getStorageList().findPrecise( changedItem );
+
+					if( fullStack == null )
+					{
+						fullStack = changedItem.copy();
+						fullStack.setStackSize( 0 );
+					}
+
+					this.myGridCache.getInterestManager().enableTransactions();
+
+					for( final ItemWatcher iw : list )
+					{
+						iw.getHost().onStackChange( this.getStorageList(), fullStack, difference, src, this.getChannel() );
+					}
+
+					this.myGridCache.getInterestManager().disableTransactions();
+				}
+			}
+		}
+
+		final NetworkMonitor<?> last = GLOBAL_DEPTH.pop();
+		localDepthSemaphore--;
+
+		if( last != this )
+		{
+			throw new IllegalStateException( "Invalid Access to Networked Storage API detected." );
+		}
 	}
 
 	void forceUpdate()
@@ -81,77 +342,4 @@ public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
 		}
 	}
 
-	@Override
-	protected IMEInventoryHandler getHandler()
-	{
-		switch( this.myChannel )
-		{
-			case ITEMS:
-				return this.myGridCache.getItemInventoryHandler();
-			case FLUIDS:
-				return this.myGridCache.getFluidInventoryHandler();
-			default:
-		}
-		return null;
-	}
-
-	@Override
-	protected void postChangesToListeners( final Iterable<T> changes, final BaseActionSource src )
-	{
-		this.postChange( true, changes, src );
-	}
-
-	protected void postChange( final boolean add, final Iterable<T> changes, final BaseActionSource src )
-	{
-		if( DEPTH.contains( this ) )
-		{
-			return;
-		}
-
-		DEPTH.push( this );
-
-		this.sendEvent = true;
-		this.notifyListenersOfChange( changes, src );
-
-		final IItemList<T> myStorageList = this.getStorageList();
-
-		for( final T changedItem : changes )
-		{
-			T difference = changedItem;
-
-			if( !add && changedItem != null )
-			{
-				( difference = changedItem.copy() ).setStackSize( -changedItem.getStackSize() );
-			}
-
-			if( this.myGridCache.getInterestManager().containsKey( changedItem ) )
-			{
-				final Collection<ItemWatcher> list = this.myGridCache.getInterestManager().get( changedItem );
-				if( !list.isEmpty() )
-				{
-					IAEStack fullStack = myStorageList.findPrecise( changedItem );
-					if( fullStack == null )
-					{
-						fullStack = changedItem.copy();
-						fullStack.setStackSize( 0 );
-					}
-
-					this.myGridCache.getInterestManager().enableTransactions();
-
-					for( final ItemWatcher iw : list )
-					{
-						iw.getHost().onStackChange( myStorageList, fullStack, difference, src, this.getChannel() );
-					}
-
-					this.myGridCache.getInterestManager().disableTransactions();
-				}
-			}
-		}
-
-		final NetworkMonitor<?> last = DEPTH.pop();
-		if( last != this )
-		{
-			throw new IllegalStateException( "Invalid Access to Networked Storage API detected." );
-		}
-	}
 }

src/main/java/appeng/parts/misc/PartStorageBus.java

@@ -412,16 +412,6 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 			return this.handler;
 		}
 
-		try
-		{
-			// force grid to update handlers...
-			this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
-		}
-		catch( final GridAccessException e )
-		{
-			// :3
-		}
-
 		this.handlerHash = newHandlerHash;
 		this.handler = null;
 		this.monitor = null;
@@ -504,6 +494,16 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 			}
 		}
 
+		try
+		{
+			// force grid to update handlers...
+			this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
+		}
+		catch( final GridAccessException e )
+		{
+			// :3
+		}
+
 		return this.handler;
 	}
 

src/main/java/appeng/parts/p2p/PartP2POpenComputers.java

@@ -24,7 +24,6 @@ import javax.annotation.Nullable;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.relauncher.Side;
@@ -39,29 +38,22 @@ import li.cil.oc.api.network.Node;
 import li.cil.oc.api.network.SidedEnvironment;
 import li.cil.oc.api.network.Visibility;
 
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.ticking.IGridTickable;
-import appeng.api.networking.ticking.TickRateModulation;
-import appeng.api.networking.ticking.TickingRequest;
-import appeng.core.AELog;
-import appeng.core.settings.TickRates;
-import appeng.hooks.TickHandler;
+import appeng.api.networking.events.MENetworkBootingStatusChange;
+import appeng.api.networking.events.MENetworkChannelsChanged;
+import appeng.api.networking.events.MENetworkEventSubscribe;
+import appeng.api.networking.events.MENetworkPowerStatusChange;
 import appeng.integration.IntegrationRegistry;
 import appeng.integration.IntegrationType;
-import appeng.me.GridAccessException;
 import appeng.transformer.annotations.Integration.Interface;
 import appeng.transformer.annotations.Integration.InterfaceList;
-import appeng.util.IWorldCallable;
 
 
 @InterfaceList( value = { @Interface( iface = "li.cil.oc.api.network.Environment", iname = IntegrationType.OpenComputers ), @Interface( iface = "li.cil.oc.api.network.SidedEnvironment", iname = IntegrationType.OpenComputers ) } )
-public final class PartP2POpenComputers extends PartP2PTunnel<PartP2POpenComputers> implements IGridTickable, Environment, SidedEnvironment
+public final class PartP2POpenComputers extends PartP2PTunnel<PartP2POpenComputers> implements Environment, SidedEnvironment
 {
 	@Nullable
 	private final Node node;
 
-	private final IWorldCallable<Void> updateCallback;
-
 	public PartP2POpenComputers( final ItemStack is )
 	{
 		super( is );
@@ -80,8 +72,24 @@ public final class PartP2POpenComputers extends PartP2PTunnel<PartP2POpenCompute
 		{
 			this.node = null; // to satisfy final
 		}
+	}
 
-		this.updateCallback = new UpdateCallback();
+	@MENetworkEventSubscribe
+	public void changeStateA( final MENetworkBootingStatusChange bs )
+	{
+		this.updateConnections();
+	}
+
+	@MENetworkEventSubscribe
+	public void changeStateB( final MENetworkChannelsChanged bs )
+	{
+		this.updateConnections();
+	}
+
+	@MENetworkEventSubscribe
+	public void changeStateC( final MENetworkPowerStatusChange bs )
+	{
+		this.updateConnections();
 	}
 
 	@Override
@@ -104,15 +112,7 @@ public final class PartP2POpenComputers extends PartP2PTunnel<PartP2POpenCompute
 	@Override
 	public void onTunnelNetworkChange()
 	{
-		super.onTunnelNetworkChange();
-		try
-		{
-			this.getProxy().getTick().wakeDevice( this.getProxy().getNode() );
-		}
-		catch( final GridAccessException e )
-		{
-			// ignore
-		}
+		this.updateConnections();
 	}
 
 	@Override
@@ -135,35 +135,6 @@ public final class PartP2POpenComputers extends PartP2PTunnel<PartP2POpenCompute
 		}
 	}
 
-	@Override
-	public TickingRequest getTickingRequest( final IGridNode node )
-	{
-		return new TickingRequest( TickRates.OpenComputersTunnel.getMin(), TickRates.OpenComputersTunnel.getMax(), true, false );
-	}
-
-	@Override
-	public TickRateModulation tickingRequest( final IGridNode node, final int ticksSinceLastCall )
-	{
-		try
-		{
-			if( !this.getProxy().getPath().isNetworkBooting() )
-			{
-				if( this.node() != null ) // Client side doesn't have nodes.
-				{
-					TickHandler.INSTANCE.addCallable( this.getTile().getWorldObj(), this.updateCallback );
-				}
-
-				return TickRateModulation.SLEEP;
-			}
-		}
-		catch( final GridAccessException e )
-		{
-			// ignore
-		}
-
-		return TickRateModulation.IDLE;
-	}
-
 	private void updateConnections()
 	{
 		if( this.getProxy().isPowered() && this.getProxy().isActive() )
@@ -171,31 +142,10 @@ public final class PartP2POpenComputers extends PartP2PTunnel<PartP2POpenCompute
 			// Make sure we're connected to existing OC nodes in the world.
 			Network.joinOrCreateNetwork( this.getTile() );
 
-			if( this.isOutput() )
+			if( this.isOutput() && this.getInput() != null && this.node != null )
 			{
-				if( this.getInput() != null && this.node != null )
-				{
-					Network.joinOrCreateNetwork( this.getInput().getTile() );
-					this.node.connect( this.getInput().node() );
-				}
-			}
-			else
-			{
-				try
-				{
-					for( final PartP2POpenComputers output : this.getOutputs() )
-					{
-						if( this.node != null )
-						{
-							Network.joinOrCreateNetwork( output.getTile() );
-							this.node.connect( output.node() );
-						}
-					}
-				}
-				catch( final GridAccessException e )
-				{
-					AELog.debug( e );
-				}
+				Network.joinOrCreateNetwork( this.getInput().getTile() );
+				this.node.connect( this.getInput().node() );
 			}
 		}
 		else if( this.node != null )
@@ -238,16 +188,4 @@ public final class PartP2POpenComputers extends PartP2PTunnel<PartP2POpenCompute
 	{
 		return side == this.getSide();
 	}
-
-	private final class UpdateCallback implements IWorldCallable<Void>
-	{
-		@Nullable
-		@Override
-		public Void call( final World world ) throws Exception
-		{
-			PartP2POpenComputers.this.updateConnections();
-
-			return null;
-		}
-	}
 }

src/main/java/appeng/parts/p2p/PartP2PPressure.java

@@ -58,6 +58,7 @@ public final class PartP2PPressure extends PartP2PTunnel<PartP2PPressure> implem
 	@Nonnull
 	private final IAirHandler handler;
 	private boolean isConnected = false;
+	private boolean isValid = false;
 
 	public PartP2PPressure( final ItemStack is )
 	{
@@ -87,14 +88,20 @@ public final class PartP2PPressure extends PartP2PTunnel<PartP2PPressure> implem
 	public void onNeighborChanged()
 	{
 		super.onNeighborChanged();
-		this.getInternalHandler().onNeighborChange();
+
+		if( this.isValid )
+		{
+			this.getInternalHandler().onNeighborChange();
+		}
 	}
 
 	@Override
 	public void addToWorld()
 	{
 		super.addToWorld();
+
 		this.getInternalHandler().validateI( this.getTile() );
+		this.isValid = true;
 	}
 
 	@Override
@@ -102,6 +109,7 @@ public final class PartP2PPressure extends PartP2PTunnel<PartP2PPressure> implem
 	{
 		super.removeFromWorld();
 
+		this.isValid = false;
 		if( this.isOutput() && this.getInput() != null )
 		{
 			this.getInternalHandler().removeConnection( this.getInput().getInternalHandler() );

src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang

@@ -177,7 +177,10 @@ gui.appliedenergistics2.Crafts=Fabrications
 gui.appliedenergistics2.And=et
 gui.appliedenergistics2.Creates=Crée
 gui.appliedenergistics2.With=avec
-gui.appliedenergistics2.InWorldCrafting=AE2 dans le monde
+gui.appliedenergistics2.Substitute=Utilisation de remplacements :
+gui.appliedenergistics2.Yes=Oui
+gui.appliedenergistics2.No=Non
+gui.appliedenergistics2.InWorldCrafting=Fabrications AE2 dans le monde
 gui.appliedenergistics2.inWorldFluix=Jetez 1 Quartz Certus chargé + 1 Quartz du Nether + poudre de Redstone dans une flaque tous ensemble et attendez un moment pour recevoir 2 Cristaux de Fluix.
 gui.appliedenergistics2.inWorldPurificationCertus=Jetez une graine de Quartz Certus faite a partir de la poudre de Quartz Certus et de sable dans une flaque d'eau. Pour accélerer le processus, ajoutez des accélérateurs de croissance de cristal.
 gui.appliedenergistics2.inWorldPurificationNether=Jetez une graine de Quartz du Nether faite a partir de la poudre de Quartz du Nether et de sable dans une flaque d'eau. Pour accélerer le processus, ajoutez des accélérateurs de croissance de cristal.
@@ -185,8 +188,9 @@ gui.appliedenergistics2.inWorldPurificationFluix=Jetez une graine de Fluix faite
 gui.appliedenergistics2.inWorldSingularity=Pour la créer, jetez 1 Singularité et 1 poudre d'Ender puis provoquez une explosion à proximité des éléments.
 gui.appliedenergistics2.ChargedQuartz=Un Quartz Certus chargé est obtenu en insérant un cristal de Quartz Certus dans le chargeur, puis en l'alimentant.
 gui.appliedenergistics2.ChargedQuartzFind=Le Quartz Certus chargé peut-être trouvé dans le monde assez rarement. Il parait identique au Quartz Certus normal sauf qu'il clignote.
-gui.appliedenergistics2.OfSecondOutput=%1$d%% Chance pour une sortie secondaire.
 gui.appliedenergistics2.NoSecondOutput=Pas de sortie secondaire
+gui.appliedenergistics2.OfSecondOutput=%1$d%% Chance pour une sortie secondaire.
+gui.appliedenergistics2.MultipleOutputs=%1$d%% une secondaire, %2$d%% une sortie tertiaire.
 gui.appliedenergistics2.SelectAmount=Sélectionnez la quantité
 gui.appliedenergistics2.CopyMode=Mode copie
 gui.appliedenergistics2.CopyModeDesc=Contrôle si le contenu du panneau de configuration est vidé quand vous retirez la cellule.
@@ -233,7 +237,8 @@ gui.appliedenergistics2.Nothing=Rien
 gui.tooltips.appliedenergistics2.Stash=Stocke des objets
 gui.tooltips.appliedenergistics2.StashDesc=Renvoie les objets de la grille de fabrication dans le réseau.
 gui.tooltips.appliedenergistics2.Substitutions=Remplacements du Ore-Dictionnary
-gui.tooltips.appliedenergistics2.SubstitutionsDesc=Editez les options de remplacement pour les composants en entrée.
+gui.tooltips.appliedenergistics2.SubstitutionsDescEnabled=Autorise le remplacement des composants en entrée.
+gui.tooltips.appliedenergistics2.SubstitutionsDescDisabled=Empêche le remplacement des composants en entrée.
 gui.tooltips.appliedenergistics2.SubstitutionsOn=Remplacements activés
 gui.tooltips.appliedenergistics2.SubstitutionsOff=Remplacements désactivés
 gui.tooltips.appliedenergistics2.Encode=Encoder un modèle

src/main/resources/assets/appliedenergistics2/lang/ja_JP.lang

@@ -0,0 +1,476 @@
+#ja_JP By Tier
+tile.appliedenergistics2.BlockCableBus.name=AE2ケーブル または バス
+tile.appliedenergistics2.BlockCellWorkbench.name=セル作業台
+tile.appliedenergistics2.BlockCharger.name=チャージ機
+tile.appliedenergistics2.BlockChest.name=MEチェスト
+tile.appliedenergistics2.BlockCondenser.name=マターコンプレッサ
+tile.appliedenergistics2.BlockController.name=MEコントローラ
+tile.appliedenergistics2.BlockCrank.name=木のクランク
+tile.appliedenergistics2.BlockCreativeEnergyCell.name=クリエイティブ用エナジーセル
+tile.appliedenergistics2.BlockDenseEnergyCell.name=高密度エネルギーセル
+tile.appliedenergistics2.BlockEnergyCell.name=エネルギーセル
+tile.appliedenergistics2.BlockDrive.name=MEドライブ
+tile.appliedenergistics2.BlockEnergyAcceptor.name=エネルギー受容体
+tile.appliedenergistics2.BlockGrinder.name=手動粉砕機
+tile.appliedenergistics2.BlockMatrixFrame.name=配列フレーム
+tile.appliedenergistics2.BlockIOPort.name=ME入出力ポート
+tile.appliedenergistics2.BlockInscriber.name=刻印機
+tile.appliedenergistics2.BlockInterface.name=MEインターフェース
+tile.appliedenergistics2.BlockNetworkEmitter.name=MEネットワークエミッター
+tile.appliedenergistics2.BlockQuantumLinkChamber.name=ME量子リンクチャンバー
+tile.appliedenergistics2.BlockQuantumRing.name=ME量子フィールドリンク
+tile.appliedenergistics2.BlockFluix.name=フルーシュブロック
+tile.appliedenergistics2.BlockQuartz.name=ケルタスクォーツブロック
+tile.appliedenergistics2.BlockQuartzChiseled.name=模様入りケルタスクォーツブロック
+tile.appliedenergistics2.BlockQuartzGlass.name=クォーツガラス
+tile.appliedenergistics2.BlockQuartzLamp.name=発光クォーツガラス
+tile.appliedenergistics2.BlockQuartzPillar.name=柱状ケルタスクォーツブロック
+tile.appliedenergistics2.BlockQuartzTorch.name=クオーツライト
+tile.appliedenergistics2.BlockLightDetector.name=レッドシグナルクオーツライト
+tile.appliedenergistics2.BlockSpatialIOPort.name=空間IOポート
+tile.appliedenergistics2.BlockSpatialPylon.name=空間送信鉄塔
+tile.appliedenergistics2.BlockTinyTNT.name=極小TNT
+tile.appliedenergistics2.BlockVibrationChamber.name=振動チャンバー
+tile.appliedenergistics2.BlockWireless.name=ME無線アクセスポイント
+tile.appliedenergistics2.OreQuartz.name=ケルタスクォーツ鉱石
+tile.appliedenergistics2.OreQuartzCharged.name=チャージケルタスクォーツ鉱石
+tile.appliedenergistics2.BlockSecurity.name=MEセキュリティターミナル
+tile.appliedenergistics2.BlockQuartzGrowthAccelerator.name=結晶成長加速機
+tile.appliedenergistics2.BlockSkyStone.name=スカイストーン
+tile.appliedenergistics2.BlockSkyStone.Block.name=スカイストーンブロック
+tile.appliedenergistics2.BlockSkyStone.Brick.name=スカイストーンレンガ
+tile.appliedenergistics2.BlockSkyStone.SmallBrick.name=スカイストーン小レンガ
+tile.appliedenergistics2.BlockSkyChest.name=スカイストーンチェスト
+tile.appliedenergistics2.BlockSkyChest.Block.name=スカイストーンブロックチェスト
+tile.appliedenergistics2.BlockSkyCompass.name=隕石探知コンパス
+tile.appliedenergistics2.BlockMolecularAssembler.name=ME分子組立機
+tile.appliedenergistics2.BlockCraftingMonitor.name=MEクラフティングモニター
+tile.appliedenergistics2.BlockCraftingStorage.name=1k クラフティングストレージ
+tile.appliedenergistics2.BlockCraftingStorage4k.name=4k クラフティングストレージ
+tile.appliedenergistics2.BlockCraftingStorage16k.name=16k クラフティングストレージ
+tile.appliedenergistics2.BlockCraftingStorage64k.name=64k クラフティングストレージ
+tile.appliedenergistics2.BlockCraftingAccelerator.name=MEクラフティングCPU
+tile.appliedenergistics2.BlockCraftingUnit.name=ME分子分子組立室
+
+chat.appliedenergistics2.ChestCannotReadStorageCell=MEチェストがストレージセルを読み取れませんでした
+chat.appliedenergistics2.OutOfRange=無線範囲外です
+chat.appliedenergistics2.InvalidMachine=無効な機械です
+chat.appliedenergistics2.LoadedSettings=正常に設定を読み込みました
+chat.appliedenergistics2.DeviceNotPowered=充電してください
+chat.appliedenergistics2.MachineNotPowered=機械にエネルギーがありません
+chat.appliedenergistics2.CommunicationError=ネットワークとの通信エラーが発生しました
+chat.appliedenergistics2.SavedSettings=正常に設定を保存しました
+chat.appliedenergistics2.AmmoDepleted=弾薬を使い切りました
+chat.appliedenergistics2.isNowLocked=モニターはロックされています
+chat.appliedenergistics2.isNowUnlocked=モニターはロックされていません
+
+itemGroup.appliedenergistics2=Applied Energistics 2
+itemGroup.appliedenergistics2.facades=Applied Energistics 2 - 偽装板
+
+gui.appliedenergistics2.Terminal=MEターミナル
+gui.appliedenergistics2.CraftingTerminal=MEクラフトターミナル
+gui.appliedenergistics2.METunnel=ME
+gui.appliedenergistics2.ItemTunnel=アイテム
+gui.appliedenergistics2.FluidTunnel=液体
+gui.appliedenergistics2.RedstoneTunnel=レッドストーン
+gui.appliedenergistics2.MJTunnel=MJ[BuildCraft](マインクラフトジュール)
+gui.appliedenergistics2.EUTunnel=EU[IndustrialCraft2](エネルギーユニット)
+gui.appliedenergistics2.RFTunnel=RF[ThermalExpantion](レッドストーンフラックス)
+
+gui.appliedenergistics2.security.extract.name=引き出す
+gui.appliedenergistics2.security.inject.name=入れる
+gui.appliedenergistics2.security.craft.name=クラフト
+gui.appliedenergistics2.security.build.name=組み立てる
+gui.appliedenergistics2.security.security.name=セキュリティ
+
+gui.appliedenergistics2.security.extract.tip=ユーザーはストレージからアイテムを引き出すことが許可されています
+gui.appliedenergistics2.security.inject.tip=ユーザーはストレージに新しいアイテムを入れることが許可されています
+gui.appliedenergistics2.security.craft.tip=ユーザーは新しいクラフトを開始することができます
+gui.appliedenergistics2.security.build.tip=ユーザはネットワークの物理構造を変更し、設定変更を行うことができます
+gui.appliedenergistics2.security.security.tip=ユーザーはアクセスして、ネットワークのセキュリティターミナルを変更できます
+
+gui.appliedenergistics2.inWorldCraftingPresses=金型は世界中の中で見つけることができる隕石の中心部に存在し、それらは(全4種)隕石探知コンパスを使用して探すことができます。また刻印機を使い、各種金型をセットして鉄ブロックをセットすると複製することが出来ます。
+
+
+gui.appliedenergistics2.Efficiency=効率
+gui.appliedenergistics2.RequiredPower=必要電力
+gui.appliedenergistics2.StoredPower=貯蔵電力
+gui.appliedenergistics2.MaxPower=最大電力
+gui.appliedenergistics2.QuartzCuttingKnife=クォーツナイフ
+gui.appliedenergistics2.Inscriber=刻印機
+gui.appliedenergistics2.Wireless=ME無線アクセスポイント
+gui.appliedenergistics2.WirelessTerminal=ME無線アクセスターミナル
+gui.appliedenergistics2.NoPermissions=アクセス権が選択されていません
+gui.appliedenergistics2.SecurityCardEditor=生体認証カードエディタ
+gui.appliedenergistics2.Encoded=エンコード済
+gui.appliedenergistics2.Priority=優先度
+gui.appliedenergistics2.StorageBus=MEストレージバス
+gui.appliedenergistics2.EnergyDrain=受動排出
+gui.appliedenergistics2.Installed=インストール済
+gui.appliedenergistics2.NetworkTool=ネットワークツール
+gui.appliedenergistics2.PowerUsageRate=エネルギー使用量
+gui.appliedenergistics2.PowerInputRate=エネルギー入力量
+gui.appliedenergistics2.PortableCell=ポータブルセル
+gui.appliedenergistics2.Security=MEセキュリティ
+gui.appliedenergistics2.CellWorkbench=セル作業台
+gui.appliedenergistics2.QuantumLinkChamber=量子リンクチャンバー
+gui.appliedenergistics2.IOPort=ME IOポート
+gui.appliedenergistics2.Chest=MEチェスト
+gui.appliedenergistics2.Condenser=マターコンデンサ
+gui.appliedenergistics2.Config=設定
+gui.appliedenergistics2.Drive=MEドライブ
+gui.appliedenergistics2.ExportBus=ME出力バス
+gui.appliedenergistics2.GrindStone=グラインドストーン
+gui.appliedenergistics2.ImportBus=ME入力バス
+gui.appliedenergistics2.Interface=MEインターフェース
+gui.appliedenergistics2.LevelEmitter=MEレベルエミッター
+gui.appliedenergistics2.Of=/
+gui.appliedenergistics2.Patterns=パターン
+gui.appliedenergistics2.SpatialIOPort=空間IOポート
+gui.appliedenergistics2.StoredEnergy=貯蔵エネルギー
+gui.appliedenergistics2.StoredItems=貯蔵アイテム
+gui.appliedenergistics2.Terminal=MEターミナル
+gui.appliedenergistics2.FormationPlane=結像面
+gui.appliedenergistics2.VibrationChamber=振動チャンバー
+gui.appliedenergistics2.NetworkDetails=ネットワークの詳細
+gui.appliedenergistics2.StorageCells=MEストレージセル
+gui.appliedenergistics2.IOBuses=ME入力/出力バス
+gui.appliedenergistics2.BytesUsed=バイト使用済み
+gui.appliedenergistics2.Types=タイプ
+gui.appliedenergistics2.Blank=空
+gui.appliedenergistics2.Unlinked=リンクされてません
+gui.appliedenergistics2.Linked=リンクされました
+gui.appliedenergistics2.StoredSize=格納サイズ
+gui.appliedenergistics2.SkyChest=スカイストーンチェスト
+gui.appliedenergistics2.PatternTerminal=MEパターンターミナル
+gui.appliedenergistics2.CraftingPattern=クラフトパターン
+gui.appliedenergistics2.MolecularAssembler=分子組立室
+gui.appliedenergistics2.ProcessingPattern=実行パターン
+gui.appliedenergistics2.Crafts=クラフト
+gui.appliedenergistics2.And=と
+gui.appliedenergistics2.Creates=作成
+gui.appliedenergistics2.With=で
+gui.appliedenergistics2.InWorldCrafting=AE2 世界でクラフト
+gui.appliedenergistics2.inWorldFluix=水たまりに1チャージケルタスクォーツ + 1ネザークォーツ + レッドストーンを落とし、しばらく待ってください
+gui.appliedenergistics2.inWorldPurification=水源にクォーツの粉と砂からクラフトしたクォーツの種を入れてください。処理を速くするには結晶成長加速機に隣接して水源を設置し、そこにクラフトした種を入れてください
+gui.appliedenergistics2.inWorldSingularity=作る為には一個のシンギュラリティとエンダーパールの粉を投げ、爆発に巻き込んでください
+gui.appliedenergistics2.ChargedQuartz=チャージケルタスクォーツは普通のケルタスクォーツをチャージ機にセットし、電力を供給することで作製されます
+gui.appliedenergistics2.ChargedQuartzFind=チャージケルタスクォーツは輝くことを除いて通常のケルタスクォーツに非常に似ています。見分け方は、青い靄です
+gui.appliedenergistics2.OfSecondOutput=%%の確率で副産物
+gui.appliedenergistics2.NoSecondOutput=副産物なし
+
+gui.tooltips.appliedenergistics2.Substitutions=Ore-辞書の置換
+gui.tooltips.appliedenergistics2.SubstitutionsDesc=入力構成要素の置換編集オプション
+gui.tooltips.appliedenergistics2.SubstitutionsOn=置換は有効です
+gui.tooltips.appliedenergistics2.SubstitutionsOff=置換は無効です
+gui.tooltips.appliedenergistics2.Encode=MEパターンエンコーダ
+gui.tooltips.appliedenergistics2.EncodeDescription=現在エンコードされているパターン、または使用できるブランクパターンに入力されたパターンを書き込みます
+gui.tooltips.appliedenergistics2.FuzzyMode=ファジー比較
+gui.tooltips.appliedenergistics2.FZPercent_25=25%%の分離損失
+gui.tooltips.appliedenergistics2.FZPercent_50=50%%の分離損失
+gui.tooltips.appliedenergistics2.FZPercent_75=75%%の分離損失
+gui.tooltips.appliedenergistics2.FZPercent_99=99%%の分離損失
+gui.tooltips.appliedenergistics2.SortOrder=昇順/降順
+gui.tooltips.appliedenergistics2.SortBy=並び替え方法
+gui.tooltips.appliedenergistics2.FZIgnoreAll=すべてマッチする
+gui.tooltips.appliedenergistics2.TransferDirection=転送方向
+gui.tooltips.appliedenergistics2.TransferToNetwork=ネットワークへ
+gui.tooltips.appliedenergistics2.TransferToStorageCell=MEストレージへ
+gui.tooltips.appliedenergistics2.ToggleSortDirection=昇順/降順の切替
+gui.tooltips.appliedenergistics2.StoredItems=格納アイテム
+gui.tooltips.appliedenergistics2.StoredCraftable=格納アイテム/クラフト可能アイテム
+gui.tooltips.appliedenergistics2.View=表示アイテム
+gui.tooltips.appliedenergistics2.RedstoneMode=レッドストーン制御
+gui.tooltips.appliedenergistics2.OperationMode=動作モード
+gui.tooltips.appliedenergistics2.NumberOfItems=アイテム数
+gui.tooltips.appliedenergistics2.ItemName=アイテム名称
+gui.tooltips.appliedenergistics2.PowerUnits=パワーユニット
+gui.tooltips.appliedenergistics2.IOMode=入出力モード
+gui.tooltips.appliedenergistics2.CondenserOutput=MEコンデンサ - 出力
+gui.tooltips.appliedenergistics2.PartitionStorage=パーテーションストレージ
+gui.tooltips.appliedenergistics2.Clear=クリア
+gui.tooltips.appliedenergistics2.TrashController=Shift/Spaceで有効
+gui.tooltips.appliedenergistics2.InterfaceBlockingMode=ブロッキングモード
+gui.tooltips.appliedenergistics2.InterfaceCraftingMode=クラフティングモード
+gui.tooltips.appliedenergistics2.Trash=アイテムを破棄する
+gui.tooltips.appliedenergistics2.MatterBalls=\n%s個のアイテムごとにマターボールに変換する
+gui.tooltips.appliedenergistics2.Singularity=\n%s個のアイテムごとにシンジュラリティに変換する
+gui.tooltips.appliedenergistics2.Read=出力のみ
+gui.tooltips.appliedenergistics2.Write=入力のみ
+gui.tooltips.appliedenergistics2.ReadWrite=入出力両方可能
+gui.tooltips.appliedenergistics2.AlwaysActive=常時処理
+gui.tooltips.appliedenergistics2.ActiveWithoutSignal=RS信号なし
+gui.tooltips.appliedenergistics2.ActiveWithSignal=RS信号あり
+gui.tooltips.appliedenergistics2.ActiveOnPulse=RSパルス
+gui.tooltips.appliedenergistics2.EmitLevelsBelow=設定値以下で出力
+gui.tooltips.appliedenergistics2.EmitLevelAbove=設定値以上で出力
+gui.tooltips.appliedenergistics2.SearchMode_Auto=オートサーチ
+gui.tooltips.appliedenergistics2.SearchMode_Standard=通常サーチ
+gui.tooltips.appliedenergistics2.SearchMode_NEIAuto=NEI連携オートサーチ
+gui.tooltips.appliedenergistics2.SearchMode_NEIStandard=NEI連携通常サーチ
+gui.tooltips.appliedenergistics2.SearchMode=ボックスサーチモード
+gui.tooltips.appliedenergistics2.PartitionStorageHint=現在の構成パーテーション
+gui.tooltips.appliedenergistics2.ClearSettings=コンフィグ/設定をクリア
+gui.tooltips.appliedenergistics2.Craftable=クラフト可能
+gui.tooltips.appliedenergistics2.MoveWhenEmpty=空になった時に移動
+gui.tooltips.appliedenergistics2.MoveWhenWorkIsDone=作業終了時に移動
+gui.tooltips.appliedenergistics2.MoveWhenFull=満杯になった時に移動
+gui.tooltips.appliedenergistics2.Disabled=無効
+gui.tooltips.appliedenergistics2.Enable=有効
+gui.tooltips.appliedenergistics2.Blocking=もしインベントリにアイテムがあるならクラフトしないでください
+gui.tooltips.appliedenergistics2.NonBlocking=目的のインベントリの内容を無視する
+gui.tooltips.appliedenergistics2.Craft=エクスポート中にアイテムをクラフトする
+gui.tooltips.appliedenergistics2.DontCraft=エクスポート中にあるアイテムだけでクラフトする
+gui.tooltips.appliedenergistics2.LevelType=レベルタイプ
+gui.tooltips.appliedenergistics2.LevelType_Energy=エネルギー
+gui.tooltips.appliedenergistics2.LevelType_Item=アイテム
+gui.tooltips.appliedenergistics2.InventoryTweaks=Inventory Tweaks
+gui.tooltips.appliedenergistics2.TerminalStyle=ターミナルスタイル
+gui.tooltips.appliedenergistics2.TerminalStyle_Full=フルスクリーンターミナル
+gui.tooltips.appliedenergistics2.TerminalStyle_Tall=高中央ターミナル
+gui.tooltips.appliedenergistics2.TerminalStyle_Small=小中央ターミナル
+gui.appliedenergistics2.InterfaceTerminal=MEインターフェースターミナル
+
+gui.appliedenergistics2.units.appliedenergstics=AE
+gui.appliedenergistics2.units.buildcraft=MJ[BuildCraft](マインクラフトジュール)
+gui.appliedenergistics2.units.ic2=EU[IndustrialCraft2](エネルギーユニット)
+gui.appliedenergistics2.units.universalelectricity=KJ[UniversalElectricity](キロジュール)
+gui.appliedenergistics2.units.rotarycraft=W[RotaryCraft](ワット)
+gui.appliedenergistics2.units.thermalexpansion=RF[ThermalExpantion](レッドストーンフラックス)
+
+gui.appliedenergistics2.White=白色
+gui.appliedenergistics2.Orange=橙色
+gui.appliedenergistics2.Magenta=赤紫色
+gui.appliedenergistics2.LightBlue=空色
+gui.appliedenergistics2.Yellow=黄色
+gui.appliedenergistics2.Lime=黄緑色
+gui.appliedenergistics2.Pink=桃色
+gui.appliedenergistics2.Gray=灰色
+gui.appliedenergistics2.LightGray=薄灰色
+gui.appliedenergistics2.Cyan=水色
+gui.appliedenergistics2.Purple=紫色
+gui.appliedenergistics2.Blue=青色
+gui.appliedenergistics2.Brown=茶色
+gui.appliedenergistics2.Green=緑色
+gui.appliedenergistics2.Red=赤色
+gui.appliedenergistics2.Black=黒色
+gui.appliedenergistics2.Fluix=フルーシュ
+gui.appliedenergistics2.MolecularAssembler=ME分子組立機
+item.appliedenergistics2.ItemPart.CraftingMonitor.name=ME クラフティングモニター
+
+waila.appliedenergistics2.DeviceOnline=装置はオンラインです
+waila.appliedenergistics2.DeviceOffline=装置はオフラインです
+waila.appliedenergistics2.DeviceMissingChannel=装置でチャンネルが見つかりません
+waila.appliedenergistics2.Locked=ロックされています
+waila.appliedenergistics2.Unlocked=ロックされてません
+waila.appliedenergistics2.Showing=表示中
+waila.appliedenergistics2.Contains=格納
+
+item.appliedenergistics2.ItemBasicStorageCell.1k.name=1k MEストレージセル
+item.appliedenergistics2.ItemBasicStorageCell.4k.name=4k MEストレージセル
+item.appliedenergistics2.ItemBasicStorageCell.16k.name=16k MEストレージセル
+item.appliedenergistics2.ItemBasicStorageCell.64k.name=64k MEストレージセル
+item.appliedenergistics2.ItemCreativeStorageCell.name=クリエイティブ用MEストレージセル
+item.appliedenergistics2.ItemEncodedPattern.name=エンコード済みパターン
+item.appliedenergistics2.ItemViewCell.name=セルを表示
+item.appliedenergistics2.ItemFacade.name=ケーブル偽装板
+
+item.appliedenergistics2.ItemCrystalSeed.Certus.name=ケルタスクォーツの種
+item.appliedenergistics2.ItemCrystalSeed.Nether.name=ネザークォーツの種
+item.appliedenergistics2.ItemCrystalSeed.Fluix.name=フルーシュの種
+item.appliedenergistics2.ItemMaterial.AdvCard.name=高度カード
+item.appliedenergistics2.ItemMaterial.AnnihilationCore.name=消滅コア
+item.appliedenergistics2.ItemMaterial.BasicCard.name=基本カード
+item.appliedenergistics2.ItemMaterial.BlankPattern.name=ブランクパターン
+item.appliedenergistics2.ItemMaterial.CalcProcessor.name=発展プロセッサ
+item.appliedenergistics2.ItemMaterial.CardCapacity.name=容量カード
+item.appliedenergistics2.ItemMaterial.CardFuzzy.name=ファジーカード
+item.appliedenergistics2.ItemMaterial.CardInverter.name=反転カード
+item.appliedenergistics2.ItemMaterial.CardRedstone.name=レッドストーンカード
+item.appliedenergistics2.ItemMaterial.CardSpeed.name=加速カード
+item.appliedenergistics2.ItemMaterial.Cell2SpatialPart.name=2立方空間ストレージ
+item.appliedenergistics2.ItemMaterial.Cell16SpatialPart.name=16立方空間ストレージ
+item.appliedenergistics2.ItemMaterial.Cell128SpatialPart.name=128立方空間ストレージ
+item.appliedenergistics2.ItemMaterial.Cell1kPart.name=1k MEストレージセル
+item.appliedenergistics2.ItemMaterial.Cell4kPart.name=4k MEストレージセル
+item.appliedenergistics2.ItemMaterial.Cell16kPart.name=16k MEストレージセル
+item.appliedenergistics2.ItemMaterial.Cell64kPart.name=64k MEストレージセル
+item.appliedenergistics2.ItemMaterial.CertusQuartzCrystal.name=ケルタスクォーツ
+item.appliedenergistics2.ItemMaterial.CertusQuartzCrystalCharged.name=チャージケルタスクォーツ
+item.appliedenergistics2.ItemMaterial.CertusQuartzDust.name=ケルタスクォーツの粉
+item.appliedenergistics2.ItemMaterial.EmptyStorageCell.name=MEストレージセル筐体
+item.appliedenergistics2.ItemMaterial.EnderDust.name=エンダーパールの粉
+item.appliedenergistics2.ItemMaterial.EngProcessor.name=上級プロセッサ
+item.appliedenergistics2.ItemMaterial.Flour.name=小麦粉
+item.appliedenergistics2.ItemMaterial.FluixCrystal.name=フルーシュクリスタル
+item.appliedenergistics2.ItemMaterial.FluixDust.name=フルーシュの粉
+item.appliedenergistics2.ItemMaterial.FluixPearl.name=フルーシュパール
+item.appliedenergistics2.ItemMaterial.FormationCore.name=形成コア
+item.appliedenergistics2.ItemMaterial.GoldDust.name=金の粉
+item.appliedenergistics2.ItemMaterial.IronDust.name=鉄の粉
+item.appliedenergistics2.ItemMaterial.IronNugget.name=鉄のナゲット
+item.appliedenergistics2.ItemMaterial.LogicProcessor.name=基本プロセッサ
+item.appliedenergistics2.ItemMaterial.LogicProcessorAsm.name=未完成の基本プロセッサ
+item.appliedenergistics2.ItemMaterial.MatterBall.name=マターボール
+item.appliedenergistics2.ItemMaterial.NetherQuartzDust.name=ネザークォーツの粉
+item.appliedenergistics2.ItemMaterial.PurifiedCertusQuartzCrystal.name=純粋なケルタスクォーツ
+item.appliedenergistics2.ItemMaterial.PurifiedFluixCrystal.name=純粋なフルーシュクリスタル
+item.appliedenergistics2.ItemMaterial.PurifiedNetherQuartzCrystal.name=純粋なネザークォーツ
+item.appliedenergistics2.ItemMaterial.QESingularity.name=量子もつれシンギュラリティ
+item.appliedenergistics2.ItemMaterial.Silicon.name=シリコン
+item.appliedenergistics2.ItemMaterial.Singularity.name=シンギュラリティ
+item.appliedenergistics2.ItemMaterial.Wireless.name=無線受信機
+item.appliedenergistics2.ItemMaterial.WirelessBooster.name=無線ブースター
+item.appliedenergistics2.ItemMaterial.WoodenGear.name=木の歯車
+item.appliedenergistics2.ItemMaterial.EngProcessorPress.name=上級回路の金型
+item.appliedenergistics2.ItemMaterial.CalcProcessorPress.name=発展回路の金型
+item.appliedenergistics2.ItemMaterial.LogicProcessorPress.name=基本回路の金型
+item.appliedenergistics2.ItemMaterial.SiliconPress.name=シリコンの金型
+item.appliedenergistics2.ItemMaterial.EngProcessorPrint.name=上級回路
+item.appliedenergistics2.ItemMaterial.CalcProcessorPrint.name=発展回路
+item.appliedenergistics2.ItemMaterial.LogicProcessorPrint.name=基本回路
+item.appliedenergistics2.ItemMaterial.SiliconPrint.name=シリコン基板
+item.appliedenergistics2.ItemMaterial.NamePress.name=名称銘記プレス
+item.appliedenergistics2.ItemMaterial.SkyDust.name=スカイストーンの粉
+item.appliedenergistics2.ToolColorApplicator.name=MEケーブル染色機
+
+item.appliedenergistics2.ItemPart.AnnihilationPlane.name=消滅プレート
+item.appliedenergistics2.ItemPart.IdentityAnnihilationPlane.name=正体プレート
+item.appliedenergistics2.ItemPart.CableAnchor.name=ケーブルアンカー
+item.appliedenergistics2.ItemPart.CableCovered.name=MEカバーケーブル
+item.appliedenergistics2.ItemPart.CableGlass.name=MEガラスケーブル
+item.appliedenergistics2.ItemPart.CableSmart.name=MEスマートケーブル
+item.appliedenergistics2.ItemPart.CableDense.name=ME高密度ケーブル
+item.appliedenergistics2.ItemPart.StorageMonitor.name=MEストレージモニター
+item.appliedenergistics2.ItemPart.ConversionMonitor.name=ME変換モニター
+item.appliedenergistics2.ItemPart.CraftingTerminal.name=MEクラフトターミナル
+item.appliedenergistics2.ItemPart.SemiDarkMonitor.name=照光パネル
+item.appliedenergistics2.ItemPart.Monitor.name=強照光パネル
+item.appliedenergistics2.ItemPart.DarkMonitor.name=弱照光パネル
+item.appliedenergistics2.ItemPart.ExportBus.name=ME出力バス
+item.appliedenergistics2.ItemPart.FormationPlane.name=ME結像プレート
+item.appliedenergistics2.ItemPart.ImportBus.name=ME入力バス
+item.appliedenergistics2.ItemPart.Interface.name=MEインターフェース
+item.appliedenergistics2.ItemPart.LevelEmitter.name=MEレベルエミッタ
+item.appliedenergistics2.ItemPart.P2PTunnel.name=P2Pトンネル
+item.appliedenergistics2.ItemPart.PatternTerminal.name=MEパターンターミナル
+item.appliedenergistics2.ItemPart.QuartzFiber.name=クォーツ繊維
+item.appliedenergistics2.ItemPart.StorageBus.name=MEストレージバス
+item.appliedenergistics2.ItemPart.Terminal.name=MEターミナル
+item.appliedenergistics2.ItemPart.InvertedToggleBus.name=ME反転切替バス
+item.appliedenergistics2.ItemPart.ToggleBus.name=ME切替バス
+item.appliedenergistics2.ItemPart.CraftingMonitor.name=MEクラフトモニター
+item.appliedenergistics2.ItemPart.InterfaceTerminal.name=MEインターフェースターミナル
+
+item.appliedenergistics2.ItemSpatialStorageCell.128Cubed.name=128立方空間ストレージセル
+item.appliedenergistics2.ItemSpatialStorageCell.16Cubed.name=16立方空間ストレージセル
+item.appliedenergistics2.ItemSpatialStorageCell.2Cubed.name=2立方空間ストレージセル
+
+item.appliedenergistics2.ToolCertusQuartzAxe.name=ケルタスクォーツの 斧
+item.appliedenergistics2.ToolCertusQuartzCuttingKnife.name=ケルタスクォーツのナイフ
+item.appliedenergistics2.ToolCertusQuartzHoe.name=ケルタスクォーツのクワ
+item.appliedenergistics2.ToolCertusQuartzPickaxe.name=ケルタスクォーツのツルハシ
+item.appliedenergistics2.ToolCertusQuartzSpade.name=ケルタスクォーツのシャベル
+item.appliedenergistics2.ToolCertusQuartzSword.name=ケルタスクォーツの剣
+item.appliedenergistics2.ToolCertusQuartzWrench.name=ケルタスクォーツのレンチ
+
+item.appliedenergistics2.ToolNetherQuartzAxe.name=ネザークォーツの 斧
+item.appliedenergistics2.ToolNetherQuartzCuttingKnife.name=ネザークォーツのナイフ
+item.appliedenergistics2.ToolNetherQuartzHoe.name=ネザークォーツのクワ
+item.appliedenergistics2.ToolNetherQuartzPickaxe.name=ネザークォーツのツルハシ
+item.appliedenergistics2.ToolNetherQuartzSpade.name=ネザークォーツのシャベル
+item.appliedenergistics2.ToolNetherQuartzSword.name=ネザークォーツの剣
+item.appliedenergistics2.ToolNetherQuartzWrench.name=ネザークォーツのレンチ
+
+item.appliedenergistics2.ToolPortableCell.name=ポータブルセル
+item.appliedenergistics2.ToolNetworkTool.name=ネットワークツール
+item.appliedenergistics2.ToolChargedStaff.name=チャージ済みの杖
+item.appliedenergistics2.ToolEntropyManipulator.name=エントロピー操縦機
+item.appliedenergistics2.ToolMassCannon.name=マターキャノン
+item.appliedenergistics2.ToolMemoryCard.name=メモリーカード
+item.appliedenergistics2.ToolWirelessTerminal.name=無線アクセスターミナル
+item.appliedenergistics2.ToolBiometricCard.name=生体認証カード
+
+item.appliedenergistics2.ToolDebugCard.name=開発用.デバッグ用カード
+item.appliedenergistics2.ToolReplicatorCard.name=開発用.反復子カード
+
+commands.ae2.usage=Applied Energistics 2のコマンド - コマンドのヘルプ一覧については /ae2 list および /ae2 help を使用します
+commands.ae2.permissions=このコマンドを実行するための十分な権限を持っていません
+commands.ae2.ChunkLogger=チャンクのロードとアンロードをサーバーログに切り替えます(OP)
+commands.ae2.ChunkLoggerOn=チャンクログがオンになりました
+commands.ae2.ChunkLoggerOff=チャンクログがオフになりました
+commands.ae2.Supporters=AE2のサポーター一覧を表示します
+
+// Achievements
+achievement.ae2.Compass=隕石ハンター
+achievement.ae2.Compass.desc=隕石探知コンパスを作る
+achievement.ae2.Presses=未知のテクノロジー
+achievement.ae2.Presses.desc=プロセッサの金型を見つける
+achievement.ae2.SpatialIO=空間の調整
+achievement.ae2.SpatialIO.desc=空間入出力ポートを作る
+achievement.ae2.SpatialIOExplorer=大胆に移動するには
+achievement.ae2.SpatialIOExplorer.desc=空間ストレージに格納する
+achievement.ae2.StorageCell=チェストより優れたもの
+achievement.ae2.StorageCell.desc=ストレージを作る
+achievement.ae2.IOPort=ストレージがごちゃ混ぜ
+achievement.ae2.IOPort.desc=入出力ポートを作る
+achievement.ae2.CraftingTerminal=(非常に)大きなテーブル
+achievement.ae2.CraftingTerminal.desc=クラフトターミナルを作る
+achievement.ae2.PatternTerminal=クラフトの巨匠
+achievement.ae2.PatternTerminal.desc=パターンターミナルを作る
+achievement.ae2.ChargedQuartz=開いた口が塞がらない
+achievement.ae2.ChargedQuartz.desc=チャージドクォーツを見つける
+achievement.ae2.Fluix=人工的
+achievement.ae2.Fluix.desc=フルーシュクリスタルを作成する
+achievement.ae2.Charger=フルーシュの生産
+achievement.ae2.Charger.desc=チャージャーを作る
+achievement.ae2.CrystalGrowthAccelerator=アクセラレータは控えめな表情だ
+achievement.ae2.CrystalGrowthAccelerator.desc=結晶成長アクセラレータを作る
+achievement.ae2.GlassCable=フルーシュエネルギーの接続
+achievement.ae2.GlassCable.desc=MEケーブルを作る
+achievement.ae2.Networking1=ネットワーク初心者
+achievement.ae2.Networking1.desc=ネットワーク上の装置のチャンネルが8個に到達する
+achievement.ae2.Controller=ネットワークの配電盤
+achievement.ae2.Controller.desc=コントローラを作る
+achievement.ae2.Networking2=ネットワークエンジニア
+achievement.ae2.Networking2.desc=ネットワーク上の装置のチャンネルが128個に到達する
+achievement.ae2.Networking3=ネットワーク管理者
+achievement.ae2.Networking3.desc=ネットワーク上の装置のチャンネルが2048個に到達する
+achievement.ae2.P2P=ネットワークを示すポイント
+achievement.ae2.P2P.desc=P2Pトンネルを作る
+achievement.ae2.Recursive=再帰的なネットワーク
+achievement.ae2.Recursive.desc=ストレージバスのインターフェイスを設置する
+achievement.ae2.CraftingCPU=次世代型クラフティング
+achievement.ae2.CraftingCPU.desc=クラフトユニットを作る
+achievement.ae2.Facade=美的なネットワーク
+achievement.ae2.Facade.desc=外装パネルを作る
+achievement.ae2.NetworkTool=ネットワーク診断
+achievement.ae2.NetworkTool.desc=ネットワークツールを作る
+achievement.ae2.PortableCell=ストレージの放浪者
+achievement.ae2.PortableCell.desc=ポータブルストレージを作る
+achievement.ae2.StorageBus=無限の可能性
+achievement.ae2.StorageBus.desc=ストレージバスを作る
+achievement.ae2.QNB=量子トンネル現象
+achievement.ae2.QNB.desc=量子リンクを作る
+
+stat.ae2.ItemsInserted=MEストレージにアイテムを追加した回数
+stat.ae2.ItemsExtracted=MEストレージからアイテムを取り出した回数
+stat.ae2.TurnedCranks=クランクを回した回数
+
+tile.appliedenergistics2.ChiseledQuartzSlabBlock.name=様入りケルタスクォーツのハーフブロック
+tile.appliedenergistics2.FluixSlabBlock.name=フルーシュのハーフブロック
+tile.appliedenergistics2.QuartzPillarSlabBlock.name=柱状ケルタスクォーツのハーフブロック
+tile.appliedenergistics2.QuartzSlabBlock.name=ケルタスクオーツのハーフブロック
+tile.appliedenergistics2.SkyStoneBlockSlabBlock.name=スカイストーンブロックのハーフブロック
+tile.appliedenergistics2.SkyStoneBrickSlabBlock.name=スカイストーンレンガのハーフブロック
+tile.appliedenergistics2.SkyStoneSmallBrickSlabBlock.name=小さなスカイストーンレンガのハーフブロック
+tile.appliedenergistics2.SkyStoneSlabBlock.name=スカイストーンのハーフブロック
+
+tile.appliedenergistics2.ChiseledQuartzStairBlock.name=模様入りケルタスクォーツの階段
+tile.appliedenergistics2.FluixStairBlock.name=フルーシュの階段
+tile.appliedenergistics2.QuartzPillarStairBlock.name=柱状ケルタスクォーツの階段
+tile.appliedenergistics2.QuartzStairBlock.name=ケルタスクオーツの階段
+tile.appliedenergistics2.SkyStoneBlockStairBlock.name=スカイストーンブロックの階段
+tile.appliedenergistics2.SkyStoneBrickStairBlock.name=スカイストーンレンガの階段
+tile.appliedenergistics2.SkyStoneSmallBrickStairBlock.name=小さなスカイストーンレンガの階段
+tile.appliedenergistics2.SkyStoneStairBlock.name=スカイストーンの階段

src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang

@@ -189,8 +189,8 @@ gui.appliedenergistics2.inWorldSingularity=将1个奇点和一个末影珍珠粉
 gui.appliedenergistics2.ChargedQuartz=将未充能赛特斯石英插入充能器充能后,可以得到充能赛特斯石英.
 gui.appliedenergistics2.ChargedQuartzFind=充能赛特斯石英也可以在世界中以普通赛特斯石英一半的几率找到,它的外观类似普通赛特斯石英,除了它会冒出闪电.
 gui.appliedenergistics2.NoSecondOutput=无副产物.
-gui.appliedenergistics2.OfSecondOutput=获得副产物概率%1$s%.
-gui.appliedenergistics2.MultipleOutputs=第一副产概率%1$s%,第二副产概率%2$s%.
+gui.appliedenergistics2.OfSecondOutput=获得副产物概率%1$d%%.
+gui.appliedenergistics2.MultipleOutputs=第一副产概率%1$d%%,第二副产概率%2$d%%.
 gui.appliedenergistics2.SelectAmount=选择数量
 gui.appliedenergistics2.CopyMode=复制模式
 gui.appliedenergistics2.CopyModeDesc=控制当取出存储元件时,是否清空配置格.
@@ -460,6 +460,7 @@ item.appliedenergistics2.ItemPart.InvertedToggleBus.name=ME反相触发总线
 item.appliedenergistics2.ItemPart.ToggleBus.name=ME触发总线
 item.appliedenergistics2.ItemPart.CraftingMonitor.name=ME合成监控器
 item.appliedenergistics2.ItemPart.InterfaceTerminal.name=ME接口终端
+item.appliedenergistics2.ItemPart.InvalidType.name=已禁用
 
 item.appliedenergistics2.ItemSpatialStorageCell.128Cubed.name=128³-空间存储元件
 item.appliedenergistics2.ItemSpatialStorageCell.16Cubed.name=16³-空间存储元件

src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe

@@ -1,13 +1,13 @@
 shaped=
-    mc:gold_ingot mc:iron_ingot _,
-    mc:redstone ae2:ItemMaterial.CalcProcessor mc:iron_ingot,
-    mc:gold_ingot mc:iron_ingot _
+    oredictionary:ingotGold oredictionary:ingotIron _,
+    oredictionary:dustRedstone ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron,
+    oredictionary:ingotGold oredictionary:ingotIron _
     -> 2 ae2:ItemMaterial.BasicCard
     
 shaped=
-    oredictionary:gemDiamond mc:iron_ingot _,
-    mc:redstone ae2:ItemMaterial.CalcProcessor mc:iron_ingot,
-    oredictionary:gemDiamond mc:iron_ingot _
+    oredictionary:gemDiamond oredictionary:ingotIron _,
+    oredictionary:dustRedstone ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron,
+    oredictionary:gemDiamond oredictionary:ingotIron _
     -> 2 ae2:ItemMaterial.AdvCard
 
 shapeless=
@@ -31,5 +31,5 @@ shapeless=
     -> ae2:ItemMaterial.CardSpeed
     
 shapeless=
-    ae2:ItemMaterial.BasicCard mc:crafting_table
+    ae2:ItemMaterial.BasicCard oredictionary:craftingTableWood
     -> ae2:ItemMaterial.CardCrafting

src/main/resources/assets/appliedenergistics2/recipes/materials/circuits.recipe

@@ -1,5 +1,5 @@
 inscribe=
-    mc:gold_ingot ae2:ItemMaterial.LogicProcessorPress
+    oredictionary:ingotGold ae2:ItemMaterial.LogicProcessorPress
     -> ae2:ItemMaterial.LogicProcessorPrint
 
 inscribe=

src/main/resources/assets/appliedenergistics2/recipes/materials/presses.recipe

@@ -1,15 +1,15 @@
 inscribe=
-    mc:iron_block ae2:ItemMaterial.LogicProcessorPress
+    oredictionary:blockIron ae2:ItemMaterial.LogicProcessorPress
     -> ae2:ItemMaterial.LogicProcessorPress
 
 inscribe=
-    mc:iron_block ae2:ItemMaterial.CalcProcessorPress
+    oredictionary:blockIron ae2:ItemMaterial.CalcProcessorPress
     -> ae2:ItemMaterial.CalcProcessorPress
 
 inscribe=
-    mc:iron_block ae2:ItemMaterial.EngProcessorPress
+    oredictionary:blockIron ae2:ItemMaterial.EngProcessorPress
     -> ae2:ItemMaterial.EngProcessorPress
 
 inscribe=
-    mc:iron_block ae2:ItemMaterial.SiliconPress
+    oredictionary:blockIron ae2:ItemMaterial.SiliconPress
     -> ae2:ItemMaterial.SiliconPress

src/main/resources/assets/appliedenergistics2/recipes/materials/processors.recipe

@@ -1,11 +1,11 @@
 press=
-    mc:redstone ae2:ItemMaterial.LogicProcessorPrint ae2:ItemMaterial.SiliconPrint
+    oredictionary:dustRedstone ae2:ItemMaterial.LogicProcessorPrint ae2:ItemMaterial.SiliconPrint
     -> ae2:ItemMaterial.LogicProcessor
 
 press=
-    mc:redstone ae2:ItemMaterial.CalcProcessorPrint ae2:ItemMaterial.SiliconPrint
+    oredictionary:dustRedstone ae2:ItemMaterial.CalcProcessorPrint ae2:ItemMaterial.SiliconPrint
     -> ae2:ItemMaterial.CalcProcessor
 
 press=
-    mc:redstone ae2:ItemMaterial.EngProcessorPrint ae2:ItemMaterial.SiliconPrint
+    oredictionary:dustRedstone ae2:ItemMaterial.EngProcessorPrint ae2:ItemMaterial.SiliconPrint
     -> ae2:ItemMaterial.EngProcessor

src/main/resources/assets/appliedenergistics2/recipes/misc/meteors.recipe

@@ -1,5 +1,5 @@
 shaped=
-    _ mc:iron_ingot _,
-    mc:iron_ingot ae2:ItemMaterial.CertusQuartzCrystalCharged mc:iron_ingot,
-    _ mc:iron_ingot _
+    _ oredictionary:ingotIron _,
+    oredictionary:ingotIron ae2:ItemMaterial.CertusQuartzCrystalCharged oredictionary:ingotIron,
+    _ oredictionary:ingotIron _
     -> ae2:BlockSkyCompass

src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe

@@ -1,3 +1,3 @@
-shapeless= mc:sand oredictionary:dustNetherQuartz	-> 2 ae2:ItemCrystalSeed.Nether
-shapeless= mc:sand oredictionary:dustCertusQuartz	-> 2 ae2:ItemCrystalSeed.Certus
-shapeless= mc:sand oredictionary:dustFluix			-> 2 ae2:ItemCrystalSeed.Fluix
+shapeless= oredictionary:sand oredictionary:dustNetherQuartz	-> 2 ae2:ItemCrystalSeed.Nether
+shapeless= oredictionary:sand oredictionary:dustCertusQuartz	-> 2 ae2:ItemCrystalSeed.Certus
+shapeless= oredictionary:sand oredictionary:dustFluix			-> 2 ae2:ItemCrystalSeed.Fluix

src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe

@@ -1,7 +1,7 @@
 shaped=
     glass glass glass,
     netherCrystal netherCrystal netherCrystal,
-    mc:wooden_slab:* mc:wooden_slab:* mc:wooden_slab:*
+    oredictionary:slabWood oredictionary:slabWood oredictionary:slabWood
     -> mc:daylight_detector
 
 shaped=
@@ -17,5 +17,5 @@ shaped=
     -> mc:iron_ingot
 
 shapeless=
-    mc:iron_ingot
+    oredictionary:ingotIron
     -> 9 ae2:ItemMaterial.IronNugget

src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cellworkbench.recipe

@@ -1,5 +1,5 @@
 shaped=
     wool ae2:ItemMaterial.CalcProcessor wool,
-    mc:iron_ingot mc:chest mc:iron_ingot,
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    oredictionary:ingotIron oredictionary:chestWood oredictionary:ingotIron,
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron
     -> ae2:BlockCellWorkbench

src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal-processing.recipe

@@ -1,11 +1,11 @@
 shaped=
-    mc:iron_ingot cable mc:iron_ingot,
+    oredictionary:ingotIron cable oredictionary:ingotIron,
     ae2:BlockQuartzGlass ae2:BlockFluix ae2:BlockQuartzGlass,
-    mc:iron_ingot cable mc:iron_ingot
+    oredictionary:ingotIron cable oredictionary:ingotIron
     -> ae2:BlockQuartzGrowthAccelerator
 
 shaped=
-    mc:iron_ingot fluixCrystal mc:iron_ingot,
-    mc:iron_ingot _ _,
-    mc:iron_ingot fluixCrystal mc:iron_ingot
+    oredictionary:ingotIron fluixCrystal oredictionary:ingotIron,
+    oredictionary:ingotIron _ _,
+    oredictionary:ingotIron fluixCrystal oredictionary:ingotIron
     -> ae2:BlockCharger

src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy.recipe

@@ -1,13 +1,13 @@
 shaped=
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot,
-    mc:iron_ingot mc:furnace mc:iron_ingot,
-    mc:iron_ingot ae2:BlockEnergyAcceptor mc:iron_ingot
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron,
+    oredictionary:ingotIron mc:furnace oredictionary:ingotIron,
+    oredictionary:ingotIron ae2:BlockEnergyAcceptor oredictionary:ingotIron
     -> ae2:BlockVibrationChamber
 
 shaped=
-    mc:iron_ingot ae2:BlockQuartzGlass mc:iron_ingot,
+    oredictionary:ingotIron ae2:BlockQuartzGlass oredictionary:ingotIron,
     ae2:BlockQuartzGlass fluixCrystal ae2:BlockQuartzGlass,
-    mc:iron_ingot ae2:BlockQuartzGlass mc:iron_ingot
+    oredictionary:ingotIron ae2:BlockQuartzGlass oredictionary:ingotIron
     -> ae2:BlockEnergyAcceptor
     
 shaped=

src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.recipe

@@ -1,5 +1,5 @@
 shaped=
-    mc:iron_ingot mc:sticky_piston mc:iron_ingot,
-    fluixCrystal _ mc:iron_ingot,
-    mc:iron_ingot mc:sticky_piston mc:iron_ingot
+    oredictionary:ingotIron mc:sticky_piston oredictionary:ingotIron,
+    fluixCrystal _ oredictionary:ingotIron,
+    oredictionary:ingotIron mc:sticky_piston oredictionary:ingotIron
     -> ae2:BlockInscriber

src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe

@@ -7,7 +7,7 @@ shapeless=
     -> ae2:ItemPart.Interface
 
 shaped=
-    mc:iron_ingot glass mc:iron_ingot,
+    oredictionary:ingotIron glass oredictionary:ingotIron,
     ae2:ItemMaterial.AnnihilationCore _ ae2:ItemMaterial.FormationCore,
-    mc:iron_ingot glass mc:iron_ingot
+    oredictionary:ingotIron glass oredictionary:ingotIron
     -> ae2:BlockInterface

src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io.recipe

@@ -1,11 +1,11 @@
 shaped=
-    mc:iron_ingot glass mc:iron_ingot,
+    oredictionary:ingotIron glass oredictionary:ingotIron,
     glass oredictionary:dustFluix glass,
-    mc:iron_ingot glass mc:iron_ingot
+    oredictionary:ingotIron glass oredictionary:ingotIron
     -> ae2:BlockCondenser
 
 shaped=
     glass glass glass,
     ae2:BlockDrive cable ae2:BlockDrive,
-    mc:iron_ingot ae2:ItemMaterial.LogicProcessor mc:iron_ingot
+    oredictionary:ingotIron ae2:ItemMaterial.LogicProcessor oredictionary:ingotIron
     -> ae2:BlockIOPort

src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum.recipe

@@ -7,7 +7,7 @@ shaped=
 
 # Quantum Ring
 shaped=
-    mc:iron_ingot ae2:ItemMaterial.LogicProcessor mc:iron_ingot,
+    oredictionary:ingotIron ae2:ItemMaterial.LogicProcessor oredictionary:ingotIron,
     ae2:ItemMaterial.EngProcessor ae2:BlockEnergyCell densecable,
-    mc:iron_ingot ae2:ItemMaterial.LogicProcessor mc:iron_ingot,
+    oredictionary:ingotIron ae2:ItemMaterial.LogicProcessor oredictionary:ingotIron,
     -> ae2:BlockQuantumRing

src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security.recipe

@@ -1,5 +1,5 @@
 shaped=
-    mc:iron_ingot ae2:BlockChest mc:iron_ingot,
+    oredictionary:ingotIron ae2:BlockChest oredictionary:ingotIron,
     cable ae2:ItemMaterial.Cell16kPart cable,
-    mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot
+    oredictionary:ingotIron ae2:ItemMaterial.EngProcessor oredictionary:ingotIron
     -> ae2:BlockSecurity

src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial-io.recipe

@@ -1,7 +1,7 @@
 shaped=
     glass glass glass,
     cable ae2:BlockIOPort cable,
-    mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot
+    oredictionary:ingotIron ae2:ItemMaterial.EngProcessor oredictionary:ingotIron
     -> ae2:BlockSpatialIOPort
 
 shaped=

src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage.recipe

@@ -1,11 +1,11 @@
 shaped=
     glass ae2:ItemPart.Terminal glass,
     cable _ cable,
-    mc:iron_ingot fluixCrystal mc:iron_ingot,
+    oredictionary:ingotIron fluixCrystal oredictionary:ingotIron,
     -> ae2:BlockChest
 
 shaped=
-    mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot,
+    oredictionary:ingotIron ae2:ItemMaterial.EngProcessor oredictionary:ingotIron,
     cable _ cable,
-    mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot
+    oredictionary:ingotIron ae2:ItemMaterial.EngProcessor oredictionary:ingotIron
     -> ae2:BlockDrive

src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe

@@ -1,6 +1,6 @@
 shapeless=
     ae2:CableCovered ae2:CableCovered ae2:CableCovered ae2:CableCovered 
-    mc:redstone mc:glowstone_dust
+    oredictionary:dustRedstone oredictionary:dustGlowstone
     -> ae2:CableDense.Fluix
 
 shapeless=

src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe

@@ -1,6 +1,6 @@
 shapeless=
     ae2:CableCovered
-    mc:redstone mc:glowstone_dust
+    oredictionary:dustRedstone oredictionary:dustGlowstone
     -> ae2:CableSmart.Fluix
 
 shapeless=

src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty.recipe

@@ -1,5 +1,5 @@
 shaped=
-    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-    mc:redstone _ mc:redstone,
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass,
+    oredictionary:dustRedstone _ oredictionary:dustRedstone,
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron
     -> ae2:ItemMaterial.EmptyStorageCell

src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial-components.recipe

@@ -1,17 +1,17 @@
 shaped=
-    mc:glowstone_dust ae2:ItemMaterial.FluixPearl mc:glowstone_dust,
+    oredictionary:dustGlowstone ae2:ItemMaterial.FluixPearl oredictionary:dustGlowstone,
     ae2:ItemMaterial.FluixPearl ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.FluixPearl,
-    mc:glowstone_dust ae2:ItemMaterial.FluixPearl mc:glowstone_dust
+    oredictionary:dustGlowstone ae2:ItemMaterial.FluixPearl oredictionary:dustGlowstone
     -> ae2:ItemMaterial.Cell2SpatialPart
 
 shaped=
-    mc:glowstone_dust ae2:ItemMaterial.Cell2SpatialPart mc:glowstone_dust,
+    oredictionary:dustGlowstone ae2:ItemMaterial.Cell2SpatialPart oredictionary:dustGlowstone,
     ae2:ItemMaterial.Cell2SpatialPart ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.Cell2SpatialPart,
-    mc:glowstone_dust ae2:ItemMaterial.Cell2SpatialPart mc:glowstone_dust
+    oredictionary:dustGlowstone ae2:ItemMaterial.Cell2SpatialPart oredictionary:dustGlowstone
     -> ae2:ItemMaterial.Cell16SpatialPart
 
 shaped=
-    mc:glowstone_dust ae2:ItemMaterial.Cell16SpatialPart mc:glowstone_dust,
+    oredictionary:dustGlowstone ae2:ItemMaterial.Cell16SpatialPart oredictionary:dustGlowstone,
     ae2:ItemMaterial.Cell16SpatialPart ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.Cell16SpatialPart,
-    mc:glowstone_dust ae2:ItemMaterial.Cell16SpatialPart mc:glowstone_dust
+    oredictionary:dustGlowstone ae2:ItemMaterial.Cell16SpatialPart oredictionary:dustGlowstone
     -> ae2:ItemMaterial.Cell128SpatialPart

src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial.recipe

@@ -8,19 +8,19 @@ shapeless=
     ae2:ItemMaterial.Cell128SpatialPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemSpatialStorageCell.128Cubed
 
 shaped=
-    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-    mc:redstone ae2:ItemMaterial.Cell2SpatialPart mc:redstone,
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass,
+    oredictionary:dustRedstone ae2:ItemMaterial.Cell2SpatialPart oredictionary:dustRedstone,
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron
     -> ae2:ItemSpatialStorageCell.2Cubed
 
 shaped=
-    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-    mc:redstone ae2:ItemMaterial.Cell16SpatialPart mc:redstone,
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass,
+    oredictionary:dustRedstone ae2:ItemMaterial.Cell16SpatialPart oredictionary:dustRedstone,
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron
     -> ae2:ItemSpatialStorageCell.16Cubed
 
 shaped=
-    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-    mc:redstone ae2:ItemMaterial.Cell128SpatialPart mc:redstone,
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass,
+    oredictionary:dustRedstone ae2:ItemMaterial.Cell128SpatialPart oredictionary:dustRedstone,
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron
     -> ae2:ItemSpatialStorageCell.128Cubed

src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage-components.recipe

@@ -1,23 +1,23 @@
 shaped=
-    mc:redstone certusCrystal mc:redstone,
+    oredictionary:dustRedstone certusCrystal oredictionary:dustRedstone,
     certusCrystal ae2:ItemMaterial.LogicProcessor certusCrystal,
-    mc:redstone certusCrystal mc:redstone
+    oredictionary:dustRedstone certusCrystal oredictionary:dustRedstone
     -> ae2:ItemMaterial.Cell1kPart
 
 shaped=
-    mc:redstone ae2:ItemMaterial.CalcProcessor mc:redstone,
+    oredictionary:dustRedstone ae2:ItemMaterial.CalcProcessor oredictionary:dustRedstone,
     ae2:ItemMaterial.Cell1kPart ae2:BlockQuartzGlass ae2:ItemMaterial.Cell1kPart,
-    mc:redstone ae2:ItemMaterial.Cell1kPart mc:redstone
+    oredictionary:dustRedstone ae2:ItemMaterial.Cell1kPart oredictionary:dustRedstone
     -> ae2:ItemMaterial.Cell4kPart
 
 shaped=
-    mc:glowstone_dust ae2:ItemMaterial.EngProcessor mc:glowstone_dust,
+    oredictionary:dustGlowstone ae2:ItemMaterial.EngProcessor oredictionary:dustGlowstone,
     ae2:ItemMaterial.Cell4kPart ae2:BlockQuartzGlass ae2:ItemMaterial.Cell4kPart,
-    mc:glowstone_dust ae2:ItemMaterial.Cell4kPart mc:glowstone_dust
+    oredictionary:dustGlowstone ae2:ItemMaterial.Cell4kPart oredictionary:dustGlowstone
     -> ae2:ItemMaterial.Cell16kPart
 
 shaped=
-    mc:glowstone_dust ae2:ItemMaterial.EngProcessor mc:glowstone_dust,
+    oredictionary:dustGlowstone ae2:ItemMaterial.EngProcessor oredictionary:dustGlowstone,
     ae2:ItemMaterial.Cell16kPart ae2:BlockQuartzGlass ae2:ItemMaterial.Cell16kPart,
-    mc:glowstone_dust ae2:ItemMaterial.Cell16kPart mc:glowstone_dust
+    oredictionary:dustGlowstone ae2:ItemMaterial.Cell16kPart oredictionary:dustGlowstone
     -> ae2:ItemMaterial.Cell64kPart

src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage.recipe

@@ -11,25 +11,25 @@ shapeless=
     ae2:ItemMaterial.Cell64kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.64k
     
 shaped=
-    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-    mc:redstone ae2:ItemMaterial.Cell1kPart mc:redstone,
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass,
+    oredictionary:dustRedstone ae2:ItemMaterial.Cell1kPart oredictionary:dustRedstone,
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron
     -> ae2:ItemBasicStorageCell.1k
 
 shaped=
-    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-    mc:redstone ae2:ItemMaterial.Cell4kPart mc:redstone,
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass,
+    oredictionary:dustRedstone ae2:ItemMaterial.Cell4kPart oredictionary:dustRedstone,
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron
     -> ae2:ItemBasicStorageCell.4k
 
 shaped=
-    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-    mc:redstone ae2:ItemMaterial.Cell16kPart mc:redstone,
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass,
+    oredictionary:dustRedstone ae2:ItemMaterial.Cell16kPart oredictionary:dustRedstone,
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron
     -> ae2:ItemBasicStorageCell.16k
 
 shaped=
-    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-    mc:redstone ae2:ItemMaterial.Cell64kPart mc:redstone,
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass,
+    oredictionary:dustRedstone ae2:ItemMaterial.Cell64kPart oredictionary:dustRedstone,
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron
     -> ae2:ItemBasicStorageCell.64k

src/main/resources/assets/appliedenergistics2/recipes/network/cells/view.recipe

@@ -2,7 +2,7 @@ shapeless=
     certusCrystal ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemViewCell
 
 shaped=
-    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-    mc:redstone certusCrystal mc:redstone,
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass,
+    oredictionary:dustRedstone certusCrystal oredictionary:dustRedstone,
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron
     -> ae2:ItemViewCell

src/main/resources/assets/appliedenergistics2/recipes/network/crafting/assembler.recipe

@@ -1,5 +1,5 @@
 shaped=
-    mc:iron_ingot ae2:BlockQuartzGlass mc:iron_ingot,
-    ae2:ItemMaterial.AnnihilationCore mc:crafting_table ae2:ItemMaterial.FormationCore,
-    mc:iron_ingot ae2:BlockQuartzGlass mc:iron_ingot
+    oredictionary:ingotIron ae2:BlockQuartzGlass oredictionary:ingotIron,
+    ae2:ItemMaterial.AnnihilationCore oredictionary:craftingTableWood ae2:ItemMaterial.FormationCore,
+    oredictionary:ingotIron ae2:BlockQuartzGlass oredictionary:ingotIron
     -> ae2:BlockMolecularAssembler

src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe

@@ -1,7 +1,7 @@
 shaped=
-    mc:iron_ingot ae2:ItemMaterial.CalcProcessor mc:iron_ingot,
+    oredictionary:ingotIron ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron,
     cable ae2:ItemMaterial.LogicProcessor cable,
-    mc:iron_ingot ae2:ItemMaterial.CalcProcessor mc:iron_ingot
+    oredictionary:ingotIron ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron
     -> ae2:BlockCraftingUnit:0
 
 # co processor

src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns.recipe

@@ -1,5 +1,5 @@
 shaped=
-    ae2:BlockQuartzGlass mc:glowstone_dust ae2:BlockQuartzGlass,
-    mc:glowstone_dust certusCrystal mc:glowstone_dust,
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    ae2:BlockQuartzGlass oredictionary:dustGlowstone ae2:BlockQuartzGlass,
+    oredictionary:dustGlowstone certusCrystal oredictionary:dustGlowstone,
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron
     -> ae2:ItemMaterial.BlankPattern

src/main/resources/assets/appliedenergistics2/recipes/network/parts/io-buses.recipe

@@ -1,11 +1,11 @@
 shaped=
-    mc:iron_ingot ae2:ItemMaterial.FormationCore mc:iron_ingot,
+    oredictionary:ingotIron ae2:ItemMaterial.FormationCore oredictionary:ingotIron,
     _ mc:piston _
     -> ae2:ItemPart.ExportBus
 
 shaped=
     _ ae2:ItemMaterial.AnnihilationCore _,
-    mc:iron_ingot mc:sticky_piston mc:iron_ingot
+    oredictionary:ingotIron mc:sticky_piston oredictionary:ingotIron
     -> ae2:ItemPart.ImportBus
     
 shapeless=

src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels.recipe

@@ -1,7 +1,7 @@
 shaped=
-    _ mc:glowstone_dust ae2:BlockQuartzGlass,
-    mc:iron_ingot mc:redstone ae2:BlockQuartzGlass,
-    _ mc:glowstone_dust ae2:BlockQuartzGlass
+    _ oredictionary:dustGlowstone ae2:BlockQuartzGlass,
+    oredictionary:ingotIron oredictionary:dustRedstone ae2:BlockQuartzGlass,
+    _ oredictionary:dustGlowstone ae2:BlockQuartzGlass
     -> 3 ae2:ItemPart.SemiDarkMonitor
 
 shapeless=

src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe

@@ -1,23 +1,23 @@
 shaped=
     fluixCrystal fluixCrystal fluixCrystal,
-    mc:iron_ingot ae2:ItemMaterial.FormationCore mc:iron_ingot
+    oredictionary:ingotIron ae2:ItemMaterial.FormationCore oredictionary:ingotIron
     -> ae2:ItemPart.FormationPlane
 
 shaped=
     fluixCrystal fluixCrystal fluixCrystal,
-    mc:iron_ingot ae2:ItemMaterial.AnnihilationCore mc:iron_ingot
+    oredictionary:ingotIron ae2:ItemMaterial.AnnihilationCore oredictionary:ingotIron
     -> ae2:ItemPart.AnnihilationPlane
 
 shaped=
-    mc:iron_ingot fluixCrystal,
+    oredictionary:ingotIron fluixCrystal,
     ae2:ItemMaterial.AnnihilationCore fluixCrystal,
-    mc:iron_ingot fluixCrystal
+    oredictionary:ingotIron fluixCrystal
     -> ae2:ItemPart.AnnihilationPlane
 
 shaped=
-    mc:iron_ingot fluixCrystal,
+    oredictionary:ingotIron fluixCrystal,
     ae2:ItemMaterial.FormationCore fluixCrystal,
-    mc:iron_ingot fluixCrystal
+    oredictionary:ingotIron fluixCrystal
     -> ae2:ItemPart.FormationPlane
 
 shapeless=

src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.recipe

@@ -3,7 +3,7 @@ shapeless=
     -> ae2:ItemPart.Terminal
 
 shapeless=
-    ae2:ItemPart.Terminal mc:crafting_table ae2:ItemMaterial.CalcProcessor
+    ae2:ItemPart.Terminal oredictionary:craftingTableWood ae2:ItemMaterial.CalcProcessor
     -> ae2:ItemPart.CraftingTerminal
 
 shapeless=

src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle-buses.recipe

@@ -1,7 +1,7 @@
 shaped=
-    _ mc:redstone _,
+    _ oredictionary:dustRedstone _,
     cable mc:lever cable,
-    _ mc:redstone _
+    _ oredictionary:dustRedstone _
     -> ae2:ItemPart.ToggleBus
 
 shapeless=

src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe

@@ -1,5 +1,5 @@
 shaped=
-    _ mc:iron_ingot _,
-    mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot,
+    _ oredictionary:ingotIron _,
+    oredictionary:ingotIron ae2:ItemMaterial.EngProcessor oredictionary:ingotIron,
     fluixCrystal fluixCrystal fluixCrystal
     -> ae2:ItemPart.P2PTunnelME

src/main/resources/assets/appliedenergistics2/recipes/network/wireless.recipe

@@ -1,7 +1,7 @@
 shaped=
     _ ae2:ItemMaterial.FluixPearl _,
-    mc:iron_ingot ae2:ItemPart.QuartzFiber mc:iron_ingot,
-    _ mc:iron_ingot _
+    oredictionary:ingotIron ae2:ItemPart.QuartzFiber oredictionary:ingotIron,
+    _ oredictionary:ingotIron _
     -> ae2:ItemMaterial.Wireless
 
 shaped=
@@ -18,5 +18,5 @@ shaped=
 
 shaped=
     oredictionary:dustFluix certusCrystal dustEnder,
-    mc:iron_ingot mc:iron_ingot mc:iron_ingot,
+    oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron,
     -> 2 ae2:ItemMaterial.WirelessBooster

src/main/resources/assets/appliedenergistics2/recipes/oredict.recipe

@@ -9,6 +9,8 @@
 ore=mc:quartz -> crystalNetherQuartz
 ore=mc:wool:* -> blockWool
 ore=mc:stained_hardened_clay:* -> blockStainedHardenedClay
+ore=mc:crafting_table -> craftingTableWood
+ore=mc:chest -> chestWood
 
 # AE2 Ore Dictionary
 # Materials for processing in other machines

src/main/resources/assets/appliedenergistics2/recipes/tools/certus-quartz.recipe

@@ -36,6 +36,6 @@ shaped=
 
 shaped=
     _ _ oredictionary:stickWood,
-    mc:iron_ingot oredictionary:stickWood _,
+    oredictionary:ingotIron oredictionary:stickWood _,
     oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz _
     -> ae2:ToolCertusQuartzCuttingKnife

src/main/resources/assets/appliedenergistics2/recipes/tools/matter-cannon.recipe

@@ -1,5 +1,5 @@
 shaped=
-    mc:iron_ingot mc:iron_ingot ae2:ItemMaterial.FormationCore,
+    oredictionary:ingotIron oredictionary:ingotIron ae2:ItemMaterial.FormationCore,
     ae2:ItemMaterial.Cell4kPart ae2:BlockEnergyCell _,
-    mc:iron_ingot _ _
+    oredictionary:ingotIron _ _
     -> ae2:ToolMassCannon

src/main/resources/assets/appliedenergistics2/recipes/tools/misctools.recipe

@@ -1,11 +1,11 @@
 shaped=
     ae2:ItemMaterial.CertusQuartzCrystalCharged _ _,
-    _ mc:iron_ingot _,
-    _ _ mc:iron_ingot
+    _ oredictionary:ingotIron _,
+    _ _ oredictionary:ingotIron
     -> ae2:ToolChargedStaff
 
 shaped=
     fluixCrystal ae2:BlockEnergyCell _,
-    ae2:ItemMaterial.EngProcessor mc:iron_ingot _,
-    _ _ mc:iron_ingot
+    ae2:ItemMaterial.EngProcessor oredictionary:ingotIron _,
+    _ _ oredictionary:ingotIron
     -> ae2:ToolEntropyManipulator

src/main/resources/assets/appliedenergistics2/recipes/tools/nether-quartz.recipe

@@ -36,6 +36,6 @@ shaped=
 
 shaped=
     _ _ oredictionary:stickWood,
-    mc:iron_ingot oredictionary:stickWood _,
+    oredictionary:ingotIron oredictionary:stickWood _,
     oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz _
     -> ae2:ToolNetherQuartzCuttingKnife

src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe

@@ -3,21 +3,21 @@ shaped=
     -> ae2:ToolPortableCell
     
 shapeless=
-    wrench monitor ae2:ItemMaterial.CalcProcessor mc:chest
+    wrench monitor ae2:ItemMaterial.CalcProcessor oredictionary:chestWood
     -> ae2:ToolNetworkTool
     
 shaped=
-    ae2:ItemMaterial.EngProcessor mc:iron_ingot mc:iron_ingot,
-    mc:gold_ingot mc:redstone mc:gold_ingot
+    ae2:ItemMaterial.EngProcessor oredictionary:ingotIron oredictionary:ingotIron,
+    oredictionary:ingotGold oredictionary:dustRedstone oredictionary:ingotGold
     -> ae2:ToolBiometricCard
 
 shaped=
-    ae2:ItemMaterial.CalcProcessor mc:iron_ingot mc:iron_ingot,
-    mc:gold_ingot mc:redstone mc:gold_ingot
+    ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron oredictionary:ingotIron,
+    oredictionary:ingotGold oredictionary:dustRedstone oredictionary:ingotGold
     -> ae2:ToolMemoryCard
     
 shaped=
-    ae2:ItemMaterial.FormationCore mc:iron_ingot _,
-    mc:iron_ingot ae2:ItemMaterial.Cell4kPart _,
+    ae2:ItemMaterial.FormationCore oredictionary:ingotIron _,
+    oredictionary:ingotIron ae2:ItemMaterial.Cell4kPart _,
     _ _ ae2:BlockEnergyCell
     -> ae2:ToolColorApplicator

src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs.recipe

@@ -96,96 +96,96 @@ shaped=
 
 shaped=
     ae2:PaintBall.White ae2:PaintBall.White ae2:PaintBall.White,
-    ae2:PaintBall.White mc:glowstone_dust ae2:PaintBall.White,
+    ae2:PaintBall.White oredictionary:dustGlowstone ae2:PaintBall.White,
     ae2:PaintBall.White ae2:PaintBall.White ae2:PaintBall.White
     -> 8 ae2:LumenPaintBall.White
 
 shaped=
     ae2:PaintBall.Black ae2:PaintBall.Black ae2:PaintBall.Black,
-    ae2:PaintBall.Black mc:glowstone_dust ae2:PaintBall.Black,
+    ae2:PaintBall.Black oredictionary:dustGlowstone ae2:PaintBall.Black,
     ae2:PaintBall.Black ae2:PaintBall.Black ae2:PaintBall.Black
     -> 8 ae2:LumenPaintBall.Black
 
 shaped=
     ae2:PaintBall.Red ae2:PaintBall.Red ae2:PaintBall.Red,
-    ae2:PaintBall.Red mc:glowstone_dust ae2:PaintBall.Red,
+    ae2:PaintBall.Red oredictionary:dustGlowstone ae2:PaintBall.Red,
     ae2:PaintBall.Red ae2:PaintBall.Red ae2:PaintBall.Red
     -> 8 ae2:LumenPaintBall.Red
 
 shaped=
     ae2:PaintBall.Green ae2:PaintBall.Green ae2:PaintBall.Green,
-    ae2:PaintBall.Green mc:glowstone_dust ae2:PaintBall.Green,
+    ae2:PaintBall.Green oredictionary:dustGlowstone ae2:PaintBall.Green,
     ae2:PaintBall.Green ae2:PaintBall.Green ae2:PaintBall.Green
     -> 8 ae2:LumenPaintBall.Green
 
 shaped=
     ae2:PaintBall.Brown ae2:PaintBall.Brown ae2:PaintBall.Brown,
-    ae2:PaintBall.Brown mc:glowstone_dust ae2:PaintBall.Brown,
+    ae2:PaintBall.Brown oredictionary:dustGlowstone ae2:PaintBall.Brown,
     ae2:PaintBall.Brown ae2:PaintBall.Brown ae2:PaintBall.Brown
     -> 8 ae2:LumenPaintBall.Brown
 
 shaped=
     ae2:PaintBall.Blue ae2:PaintBall.Blue ae2:PaintBall.Blue,
-    ae2:PaintBall.Blue mc:glowstone_dust ae2:PaintBall.Blue,
+    ae2:PaintBall.Blue oredictionary:dustGlowstone ae2:PaintBall.Blue,
     ae2:PaintBall.Blue ae2:PaintBall.Blue ae2:PaintBall.Blue
     -> 8 ae2:LumenPaintBall.Blue
 
 shaped=
     ae2:PaintBall.Purple ae2:PaintBall.Purple ae2:PaintBall.Purple,
-    ae2:PaintBall.Purple mc:glowstone_dust ae2:PaintBall.Purple,
+    ae2:PaintBall.Purple oredictionary:dustGlowstone ae2:PaintBall.Purple,
     ae2:PaintBall.Purple ae2:PaintBall.Purple ae2:PaintBall.Purple
     -> 8 ae2:LumenPaintBall.Purple
 
 shaped=
     ae2:PaintBall.Cyan ae2:PaintBall.Cyan ae2:PaintBall.Cyan,
-    ae2:PaintBall.Cyan mc:glowstone_dust ae2:PaintBall.Cyan,
+    ae2:PaintBall.Cyan oredictionary:dustGlowstone ae2:PaintBall.Cyan,
     ae2:PaintBall.Cyan ae2:PaintBall.Cyan ae2:PaintBall.Cyan
     -> 8 ae2:LumenPaintBall.Cyan
 
 shaped=
     ae2:PaintBall.LightGray ae2:PaintBall.LightGray ae2:PaintBall.LightGray,
-    ae2:PaintBall.LightGray mc:glowstone_dust ae2:PaintBall.LightGray,
+    ae2:PaintBall.LightGray oredictionary:dustGlowstone ae2:PaintBall.LightGray,
     ae2:PaintBall.LightGray ae2:PaintBall.LightGray ae2:PaintBall.LightGray
     -> 8 ae2:LumenPaintBall.LightGray
 
 shaped=
     ae2:PaintBall.Gray ae2:PaintBall.Gray ae2:PaintBall.Gray,
-    ae2:PaintBall.Gray mc:glowstone_dust ae2:PaintBall.Gray,
+    ae2:PaintBall.Gray oredictionary:dustGlowstone ae2:PaintBall.Gray,
     ae2:PaintBall.Gray ae2:PaintBall.Gray ae2:PaintBall.Gray
     -> 8 ae2:LumenPaintBall.Gray
 
 shaped=
     ae2:PaintBall.Pink ae2:PaintBall.Pink ae2:PaintBall.Pink,
-    ae2:PaintBall.Pink mc:glowstone_dust ae2:PaintBall.Pink,
+    ae2:PaintBall.Pink oredictionary:dustGlowstone ae2:PaintBall.Pink,
     ae2:PaintBall.Pink ae2:PaintBall.Pink ae2:PaintBall.Pink
     -> 8 ae2:LumenPaintBall.Pink
 
 shaped=
     ae2:PaintBall.Lime ae2:PaintBall.Lime ae2:PaintBall.Lime,
-    ae2:PaintBall.Lime mc:glowstone_dust ae2:PaintBall.Lime,
+    ae2:PaintBall.Lime oredictionary:dustGlowstone ae2:PaintBall.Lime,
     ae2:PaintBall.Lime ae2:PaintBall.Lime ae2:PaintBall.Lime
     -> 8 ae2:LumenPaintBall.Lime
 
 shaped=
     ae2:PaintBall.Yellow ae2:PaintBall.Yellow ae2:PaintBall.Yellow,
-    ae2:PaintBall.Yellow mc:glowstone_dust ae2:PaintBall.Yellow,
+    ae2:PaintBall.Yellow oredictionary:dustGlowstone ae2:PaintBall.Yellow,
     ae2:PaintBall.Yellow ae2:PaintBall.Yellow ae2:PaintBall.Yellow
     -> 8 ae2:LumenPaintBall.Yellow
 
 shaped=
     ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue,
-    ae2:PaintBall.LightBlue mc:glowstone_dust ae2:PaintBall.LightBlue,
+    ae2:PaintBall.LightBlue oredictionary:dustGlowstone ae2:PaintBall.LightBlue,
     ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue
     -> 8 ae2:LumenPaintBall.LightBlue
 
 shaped=
     ae2:PaintBall.Magenta ae2:PaintBall.Magenta ae2:PaintBall.Magenta,
-    ae2:PaintBall.Magenta mc:glowstone_dust ae2:PaintBall.Magenta,
+    ae2:PaintBall.Magenta oredictionary:dustGlowstone ae2:PaintBall.Magenta,
     ae2:PaintBall.Magenta ae2:PaintBall.Magenta ae2:PaintBall.Magenta
     -> 8 ae2:LumenPaintBall.Magenta
 
 shaped=
     ae2:PaintBall.Orange ae2:PaintBall.Orange ae2:PaintBall.Orange,
-    ae2:PaintBall.Orange mc:glowstone_dust ae2:PaintBall.Orange,
+    ae2:PaintBall.Orange oredictionary:dustGlowstone ae2:PaintBall.Orange,
     ae2:PaintBall.Orange ae2:PaintBall.Orange ae2:PaintBall.Orange
     -> 8 ae2:LumenPaintBall.Orange