mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-25 19:07:39 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mc-1.15.x' into mc-1.16.x

Browse Source
This commit is contained in:
Jonathan Coates
2021-01-06 22:39:54 +00:00
committed by Jummit
parent a72a5e6deb
commit 19054684c6
6 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/dan200/computercraft/api/IUpgradeBase.java
View File

@@ -1,3 +1,8 @@
/*
* This file is part of the public ComputerCraft API - http://www.computercraft.info
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
* For help using the API, and posting your mods, visit the forums at computercraft.info.
*/
package dan200.computercraft.api;
import dan200.computercraft.api.pocket.IPocketUpgrade;

8
src/main/java/dan200/computercraft/shared/common/ColourableRecipe.java
View File

@@ -65,11 +65,9 @@ public final class ColourableRecipe extends SpecialCraftingRecipe {
if (stack.isEmpty()) {
continue;
}
if (stack.getItem() instanceof IColouredItem) {
colourable = stack;
} else {
DyeColor dye = ColourUtils.getStackColour(stack);
else
{
DyeColor dye = ColourUtils.getStackColour( stack );
if( dye != null ) tracker.addColour( dye );
}
}