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

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Browse Source
This commit is contained in:
AlgorithmX2
2014-04-17 22:52:47 -05:00
parent 323342314c 3d06bb3ba5
commit 18e96644d6
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
me/cache/TickManagerCache.java
Vendored
+1 -1
View File
@@ -68,7 +68,7 @@ public class TickManagerCache implements ITickManager
switch (mod)
{
case FASTER:
tt.setRate( tt.current_rate - 1 );
tt.setRate( tt.current_rate - 2 );
break;
case IDLE:
tt.setRate( tt.request.maxTickRate );
parts/automation/PartImportBus.java
+6 -4
View File
@@ -225,14 +225,16 @@ public class PartImportBus extends PartSharedItemBus implements IGridTickable, I
private boolean importStuff(InventoryAdaptor myAdaptor, IAEItemStack whatToImport, IMEMonitor<IAEItemStack> inv, IEnergySource energy, FuzzyMode fzMode)
{
if ( itemToSend > 64 )
itemToSend = 64;
int toSend = this.itemToSend;
if ( toSend > 64 )
toSend = 64;
ItemStack newItems;
if ( getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
newItems = myAdaptor.removeSimilarItems( itemToSend, whatToImport == null ? null : whatToImport.getItemStack(), fzMode, configDest( inv ) );
newItems = myAdaptor.removeSimilarItems( toSend, whatToImport == null ? null : whatToImport.getItemStack(), fzMode, configDest( inv ) );
else
newItems = myAdaptor.removeItems( itemToSend, whatToImport == null ? null : whatToImport.getItemStack(), configDest( inv ) );
newItems = myAdaptor.removeItems( toSend, whatToImport == null ? null : whatToImport.getItemStack(), configDest( inv ) );
if ( newItems != null )
{