mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2024-12-04 23:40:00 +00:00
Merge branch 'master' into mc-1.13.x
This commit is contained in:
SquidDev
commit
2182cfbeb7
@ -275,6 +275,10 @@ curseforge {
|
||||
id = '282001'
|
||||
releaseType = 'beta'
|
||||
changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
|
||||
|
||||
relations {
|
||||
incompatible "computercraft"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -134,7 +134,7 @@ public final class MainThread
|
||||
// Of course, we'll go over the MAX_TICK_TIME most of the time, but eventually that overrun will accumulate
|
||||
// and we'll skip a whole tick - bringing the average back down again.
|
||||
currentTick++;
|
||||
budget += Math.min( budget + ComputerCraft.maxMainGlobalTime, ComputerCraft.maxMainGlobalTime );
|
||||
budget = Math.min( budget + ComputerCraft.maxMainGlobalTime, ComputerCraft.maxMainGlobalTime );
|
||||
canExecute = budget > 0;
|
||||
|
||||
// Cool down any warm computers.
|
||||
|
||||
@ -224,7 +224,7 @@ final class MainThreadExecutor implements IWorkMonitor
|
||||
{
|
||||
state = State.COOLING;
|
||||
currentTick = MainThread.currentTick();
|
||||
budget += Math.min( budget + ComputerCraft.maxMainComputerTime, ComputerCraft.maxMainComputerTime );
|
||||
budget = Math.min( budget + ComputerCraft.maxMainComputerTime, ComputerCraft.maxMainComputerTime );
|
||||
if( budget < ComputerCraft.maxMainComputerTime ) return false;
|
||||
|
||||
state = State.COOL;
|
||||
|
||||
195
src/main/resources/assets/computercraft/lang/zh_cn.lang
Normal file
195
src/main/resources/assets/computercraft/lang/zh_cn.lang
Normal file
@ -0,0 +1,195 @@
|
||||
itemGroup.computercraft=CC: Tweaked
|
||||
|
||||
tile.computercraft:computer.name=计算机
|
||||
tile.computercraft:advanced_computer.name=高级计算机
|
||||
tile.computercraft:drive.name=磁盘驱动器
|
||||
tile.computercraft:printer.name=打印机
|
||||
tile.computercraft:monitor.name=显示器
|
||||
tile.computercraft:advanced_monitor.name=高级显示器
|
||||
tile.computercraft:wireless_modem.name=无线调制解调器
|
||||
tile.computercraft:wired_modem.name=有线调制解调器
|
||||
tile.computercraft:cable.name=网络电缆
|
||||
tile.computercraft:command_computer.name=命令电脑
|
||||
tile.computercraft:advanced_modem.name=末影调制解调器
|
||||
tile.computercraft:speaker.name=扬声器
|
||||
|
||||
tile.computercraft:turtle.name=海龟
|
||||
tile.computercraft:turtle.upgraded.name=%s海龟
|
||||
tile.computercraft:turtle.upgraded_twice.name=%s%s海龟
|
||||
tile.computercraft:advanced_turtle.name=高级海龟
|
||||
tile.computercraft:advanced_turtle.upgraded.name=高级%s海龟
|
||||
tile.computercraft:advanced_turtle.upgraded_twice.name=高级%s%s海龟
|
||||
|
||||
item.computercraft:disk.name=软盘
|
||||
item.computercraft:treasure_disk.name=软盘
|
||||
item.computercraft:page.name=打印纸
|
||||
item.computercraft:pages.name=打印纸
|
||||
item.computercraft:book.name=打印书
|
||||
|
||||
item.computercraft:pocket_computer.name=手提计算机
|
||||
item.computercraft:pocket_computer.upgraded.name=%s手提计算机
|
||||
item.computercraft:advanced_pocket_computer.name=高级手提计算机
|
||||
item.computercraft:advanced_pocket_computer.upgraded.name=高级%s手提计算机
|
||||
|
||||
upgrade.minecraft:diamond_sword.adjective=战斗
|
||||
upgrade.minecraft:diamond_shovel.adjective=挖掘
|
||||
upgrade.minecraft:diamond_pickaxe.adjective=采掘
|
||||
upgrade.minecraft:diamond_axe.adjective=伐木
|
||||
upgrade.minecraft:diamond_hoe.adjective=耕种
|
||||
upgrade.computercraft:wireless_modem.adjective=无线
|
||||
upgrade.minecraft:crafting_table.adjective=合成
|
||||
upgrade.computercraft:advanced_modem.adjective=末影
|
||||
upgrade.computercraft:speaker.adjective=喧闹
|
||||
|
||||
chat.computercraft.wired_modem.peripheral_connected=Peripheral "%s"连接到网络
|
||||
chat.computercraft.wired_modem.peripheral_disconnected=Peripheral "%s"与网络断开连接
|
||||
|
||||
# Command descriptions, usage and any additional messages.
|
||||
commands.computercraft.synopsis=各种控制计算机的命令.
|
||||
commands.computercraft.desc=/computercraft命令提供各种调试和管理工具，用于控制和与计算机交互.
|
||||
|
||||
commands.computercraft.help.synopsis=为特定的命令提供帮助
|
||||
commands.computercraft.help.desc=
|
||||
commands.computercraft.help.usage=[command]
|
||||
commands.computercraft.help.no_children=%s没有子命令
|
||||
commands.computercraft.help.no_command=没有这样的命令'%s'
|
||||
|
||||
commands.computercraft.dump.synopsis=显示计算机的状态.
|
||||
commands.computercraft.dump.desc=显示所有计算机的状态或某台计算机的特定信息. 你可以指定计算机的实例id (例如. 123), 计算机id (例如. #123)或标签(例如. "@My Computer").
|
||||
commands.computercraft.dump.usage=[id]
|
||||
commands.computercraft.dump.action=查看有关此计算机的更多信息
|
||||
|
||||
commands.computercraft.shutdown.synopsis=远程关闭计算机.
|
||||
commands.computercraft.shutdown.desc=关闭列出的计算机或全部计算机（如果未指定）. 你可以指定计算机的实例id (例如. 123), 计算机id (例如. #123)或标签(例如. "@My Computer").
|
||||
commands.computercraft.shutdown.usage=[ids...]
|
||||
commands.computercraft.shutdown.done=关闭%s/%s计算机
|
||||
|
||||
commands.computercraft.turn_on.synopsis=远程打开计算机.
|
||||
commands.computercraft.turn_on.desc=打开列出的计算机. 你可以指定计算机的实例id (例如. 123), 计算机id (例如. #123)或标签(例如. "@My Computer").
|
||||
commands.computercraft.turn_on.usage=[ids...]
|
||||
commands.computercraft.turn_on.done=打开%s/%s计算机
|
||||
|
||||
commands.computercraft.tp.synopsis=传送到特定的计算机.
|
||||
commands.computercraft.tp.desc=传送到计算机的位置. 你可以指定计算机的实例id (例如. 123)或计算机id (例如. #123).
|
||||
commands.computercraft.tp.usage=<id>
|
||||
commands.computercraft.tp.action=传送到这台电脑
|
||||
commands.computercraft.tp.not_entity=无法为非玩家打开终端
|
||||
commands.computercraft.tp.not_there=无法在世界上定位电脑
|
||||
|
||||
commands.computercraft.view.synopsis=查看计算机的终端.
|
||||
commands.computercraft.view.desc=打开计算机的终端，允许远程控制计算机. 这不提供对海龟库存的访问. 你可以指定计算机的实例id (例如. 123)或计算机id (例如. #123).
|
||||
commands.computercraft.view.usage=<id>
|
||||
commands.computercraft.view.action=查看此计算机
|
||||
commands.computercraft.view.not_player=无法为非玩家打开终端
|
||||
|
||||
commands.computercraft.track.synopsis=跟踪计算机的执行时间.
|
||||
commands.computercraft.track.desc=跟踪计算机执行的时间以及它们处理的事件数. 这以/forge track类似的方式呈现信息，可用于诊断滞后.
|
||||
|
||||
commands.computercraft.track.start.synopsis=开始跟踪所有计算机
|
||||
commands.computercraft.track.start.desc=开始跟踪所有计算机的执行时间和事件计数. 这将放弃先前运行的结果.
|
||||
commands.computercraft.track.start.usage=
|
||||
commands.computercraft.track.start.stop=运行%s以停止跟踪并查看结果
|
||||
|
||||
commands.computercraft.track.stop.synopsis=停止跟踪所有计算机
|
||||
commands.computercraft.track.stop.desc=停止跟踪所有计算机的事件和执行时间
|
||||
commands.computercraft.track.stop.usage=
|
||||
commands.computercraft.track.stop.action=点击停止跟踪
|
||||
commands.computercraft.track.stop.not_enabled=目前没有跟踪计算机
|
||||
|
||||
commands.computercraft.track.dump.synopsis=输出最新的跟踪结果
|
||||
commands.computercraft.track.dump.desc=输出计算机跟踪的最新结果.
|
||||
commands.computercraft.track.dump.usage=[kind]
|
||||
commands.computercraft.track.dump.no_timings=没有时间可用
|
||||
commands.computercraft.track.dump.no_field=未知字节'%s'
|
||||
commands.computercraft.track.dump.computer=计算器
|
||||
|
||||
commands.computercraft.reload.synopsis=重新加载ComputerCraft配置文件
|
||||
commands.computercraft.reload.desc=重新加载ComputerCraft配置文件
|
||||
commands.computercraft.reload.usage=
|
||||
commands.computercraft.reload.done=重新加载配置
|
||||
|
||||
commands.computercraft.queue.synopsis=将computer_command事件发送到命令计算机
|
||||
commands.computercraft.queue.desc=发送computer_command事件到命令计算机,并传递其他参数. 这主要是为地图制作者设计的, 作为/trigger更加计算机友好的版本. 任何玩家都可以运行命令, 这很可能是通过文本组件的点击事件完成的.
|
||||
commands.computercraft.queue.usage=<id> [args...]
|
||||
|
||||
commands.computercraft.generic.no_position=<无位置>
|
||||
commands.computercraft.generic.position=%s, %s, %s
|
||||
commands.computercraft.generic.yes=Y
|
||||
commands.computercraft.generic.no=N
|
||||
commands.computercraft.generic.exception=未处理的异常(%s)
|
||||
commands.computercraft.generic.additional_rows=%d额外的行…
|
||||
|
||||
commands.computercraft.argument.no_matching=没有计算机匹配'%s'
|
||||
commands.computercraft.argument.many_matching=多台计算机匹配'%s' (实例%s)
|
||||
commands.computercraft.argument.not_number='%s'不是一个数字
|
||||
|
||||
# Names for the various tracking fields.
|
||||
tracking_field.computercraft.tasks.name=任务
|
||||
tracking_field.computercraft.total.name=总计时间
|
||||
tracking_field.computercraft.average.name=平均时间
|
||||
tracking_field.computercraft.max.name=最大时间
|
||||
|
||||
tracking_field.computercraft.server_count.name=服务器任务计数
|
||||
tracking_field.computercraft.server_time.name=服务器任务时间
|
||||
|
||||
tracking_field.computercraft.peripheral.name=外围设备呼叫
|
||||
tracking_field.computercraft.fs.name=文件系统操作
|
||||
tracking_field.computercraft.turtle.name=海龟行动
|
||||
|
||||
tracking_field.computercraft.http.name=HTTP需求
|
||||
tracking_field.computercraft.http_upload.name=HTTP上传
|
||||
tracking_field.computercraft.http_download.name=HTTP下载
|
||||
|
||||
tracking_field.computercraft.websocket_incoming.name=Websocket传入
|
||||
tracking_field.computercraft.websocket_outgoing.name=Websocket传出
|
||||
|
||||
tracking_field.computercraft.coroutines_created.name=协同创建
|
||||
tracking_field.computercraft.coroutines_dead.name=协同处理
|
||||
|
||||
# Misc tooltips
|
||||
gui.computercraft.tooltip.copy=复制到剪贴板
|
||||
gui.computercraft.tooltip.computer_id=(计算机ID: %s)
|
||||
gui.computercraft.tooltip.disk_id=(磁盘ID: %s)
|
||||
|
||||
# Config options
|
||||
gui.computercraft:config.computer_space_limit=计算机空间限制(字节)
|
||||
gui.computercraft:config.floppy_space_limit=软盘空间限制(字节)
|
||||
gui.computercraft:config.maximum_open_files=每台计算机打开的最大文件数
|
||||
gui.computercraft:config.disable_lua51_features=禁用Lua 5.1功能
|
||||
gui.computercraft:config.default_computer_settings=默认计算机设置
|
||||
gui.computercraft:config.debug_enabled=启用debug库
|
||||
gui.computercraft:config.log_computer_errors=记录计算机错误
|
||||
|
||||
gui.computercraft:config.execution=执行
|
||||
gui.computercraft:config.execution.computer_threads=计算机线程数
|
||||
gui.computercraft:config.execution.max_main_global_time=服务器全局tick时间限制
|
||||
gui.computercraft:config.execution.max_main_computer_time=服务器计算机tick时间限制
|
||||
|
||||
gui.computercraft:config.http=HTTP
|
||||
gui.computercraft:config.http.enabled=启用HTTP API
|
||||
gui.computercraft:config.http.websocket_enabled=启用websockets
|
||||
gui.computercraft:config.http.whitelist=HTTP白名单
|
||||
gui.computercraft:config.http.blacklist=HTTP黑名单
|
||||
|
||||
gui.computercraft:config.http.timeout=Timeout
|
||||
gui.computercraft:config.http.max_requests=最大并发请求数
|
||||
gui.computercraft:config.http.max_download=最大响应数据大小
|
||||
gui.computercraft:config.http.max_upload=最大请求数据大小
|
||||
gui.computercraft:config.http.max_websockets=最大并发websockets数
|
||||
gui.computercraft:config.http.max_websocket_message=最大websockets消息大小
|
||||
|
||||
gui.computercraft:config.peripheral=外围设备
|
||||
gui.computercraft:config.peripheral.command_block_enabled=启用命令方块外设
|
||||
gui.computercraft:config.peripheral.modem_range=调制解调器范围(默认)
|
||||
gui.computercraft:config.peripheral.modem_high_altitude_range=调制解调器范围(高海拔)
|
||||
gui.computercraft:config.peripheral.modem_range_during_storm=调制解调器范围(恶劣天气)
|
||||
gui.computercraft:config.peripheral.modem_high_altitude_range_during_storm=调制解调器范围(高海拔, 恶劣天气)
|
||||
gui.computercraft:config.peripheral.max_notes_per_tick=计算机一次可以播放的最大音符数量
|
||||
|
||||
gui.computercraft:config.turtle=海龟
|
||||
gui.computercraft:config.turtle.need_fuel=启用燃料
|
||||
gui.computercraft:config.turtle.normal_fuel_limit=海龟燃料限制
|
||||
gui.computercraft:config.turtle.advanced_fuel_limit=高级海龟燃料限制
|
||||
gui.computercraft:config.turtle.obey_block_protection=海龟服从方块保护
|
||||
gui.computercraft:config.turtle.can_push=海龟可以推动实体
|
||||
gui.computercraft:config.turtle.disabled_actions=禁用海龟动作
|
||||
@ -25,6 +25,7 @@ local secondary = {
|
||||
"it_it",
|
||||
"pt_br",
|
||||
"sv_se",
|
||||
"zh_cn",
|
||||
}
|
||||
|
||||
local verbose = false
|
||||
|
||||
Loading…
Reference in New Issue
Block a user