mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'mc-1.13.x' into mc-1.14-fabric

This commit is contained in:
SquidDev 2019-06-02 18:41:53 +01:00
parent 725dfa764f b6715bd812
commit 45e84e1ede
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
View File

@ -44,7 +44,7 @@ public TurtleMultiModel( BakedModel baseModel, BakedModel overlayModel, Matrix4f
@Nonnull
@Override
public List<BakedQuad> getQuads( BlockState state, Direction side, Random rand )
public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand )
{
if( side != null )
{

3
src/main/resources/data/computercraft/lua/rom/apis/keys.lua
View File

@ -7,6 +7,9 @@
-- they relied on Minecraft's character mappings. However, if CC emulators have
-- taught me anything, it's that emulating LWJGL's weird key handling is nigh-on
-- impossible.
local expect = _G["~expect"]
local tKeys = {}
tKeys[32] = 'space'
tKeys[39] = 'apostrophe'