mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-06 00:22:58 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into mc-1.14.x

Browse Source
This commit is contained in:
SquidDev
2019-11-25 09:15:20 +00:00
parent 2d4a87adc9 121802a683
commit 642351af1a
80 changed files with 577 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java
View File

@@ -28,7 +28,7 @@ import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
import static dan200.computercraft.core.apis.ArgumentHelper.*;
import static dan200.computercraft.api.lua.ArgumentHelper.*;
public class TurtleAPI implements ILuaAPI
{

2
src/main/java/dan200/computercraft/shared/turtle/blocks/BlockTurtle.java
View File

@@ -73,7 +73,7 @@ public class BlockTurtle extends BlockComputerBase<TileTurtle> implements IWater
@Deprecated
public BlockRenderType getRenderType( BlockState state )
{
return BlockRenderType.INVISIBLE;
return BlockRenderType.ENTITYBLOCK_ANIMATED;
}
@Nonnull

2
src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java
View File

@@ -155,7 +155,7 @@ public class TurtleBrain implements ITurtleAccess
}
/**
* Read common data for saving and client synchronisation
* Read common data for saving and client synchronisation.
*
* @param nbt The tag to read from
*/

2
src/main/java/dan200/computercraft/shared/turtle/upgrades/CraftingTablePeripheral.java
View File

@@ -15,7 +15,7 @@ import dan200.computercraft.shared.turtle.core.TurtleCraftCommand;
import javax.annotation.Nonnull;
import static dan200.computercraft.core.apis.ArgumentHelper.optInt;
import static dan200.computercraft.api.lua.ArgumentHelper.optInt;
public class CraftingTablePeripheral implements IPeripheral
{