mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-15 19:55:42 +00:00
Code Issues Releases Wiki Activity

And fix the build failing

Browse Source
This commit is contained in:
SquidDev 2019-04-02 21:33:55 +01:00
parent f9e13ca67a
commit 7afc3e5260
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -268,16 +268,14 @@ task compressJson(dependsOn: jar) {
assemble.dependsOn compressJson assemble.dependsOn compressJson
/*
curseforge { curseforge {
apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : '' apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
project { project {
id = '282001' id = '282001'
releaseType = 'release' releaseType = 'beta'
changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${project.version})." changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
} }
} }
*/
publishing { publishing {
publications { publications {

3
src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java
View File

@ -46,11 +46,10 @@ public class PocketServerComputer extends ServerComputer implements IPocketAcces
@Nullable @Nullable
@Override @Override
@Deprecated
public Entity getEntity() public Entity getEntity()
{ {
Entity entity = m_entity; Entity entity = m_entity;
if( entity == null || m_stack == null || entity.removed ) return null; if( entity == null || m_stack == null || !entity.isAlive() ) return null;
if( entity instanceof EntityPlayer ) if( entity instanceof EntityPlayer )
{ {

4
src/main/resources/assets/computercraft/lang/es_es.json
View File

@ -46,8 +46,8 @@
"upgrade.computercraft.wireless_modem_advanced.adjective": "ender", "upgrade.computercraft.wireless_modem_advanced.adjective": "ender",
"upgrade.computercraft.speaker.adjective": "ruidosa", "upgrade.computercraft.speaker.adjective": "ruidosa",
"chat.computercraft.wired_modem.peripheral_connected": "El periférico "%s" se conectó a la red", "chat.computercraft.wired_modem.peripheral_connected": "El periférico \"%s\" se conectó a la red",
"chat.computercraft.wired_modem.peripheral_disconnected": "El periférico "%s" se desconectó de la red", "chat.computercraft.wired_modem.peripheral_disconnected": "El periférico \"%s\" se desconectó de la red",
"gui.computercraft.config.computer_space_limit": "Límite de memoria de ordenadores (en bytes)", "gui.computercraft.config.computer_space_limit": "Límite de memoria de ordenadores (en bytes)",
"gui.computercraft.config.floppy_space_limit": "Límite de memoria de disquetes (en bytes)", "gui.computercraft.config.floppy_space_limit": "Límite de memoria de disquetes (en bytes)",