mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-11-22 02:19:44 +00:00
Merge branch 'main' into update-base-pack
This commit is contained in:
commit
607bb64307
23 changed files with 173 additions and 36 deletions
|
|
@ -3,5 +3,6 @@
|
|||
<panel id='content_panel' size='480,100' color='#00000080' scrollable='true' max-length='400'>
|
||||
<!-- content is generated in script -->
|
||||
</panel>
|
||||
<button onclick="delete_content(report)" context="world">@Delete Content</button>
|
||||
<button onclick='menu:back()'>@Back to Main Menu</button>
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,18 @@
|
|||
content_report = nil
|
||||
|
||||
function delete_content()
|
||||
local units = {}
|
||||
for i, entry in ipairs(content_report.content) do
|
||||
table.insert(units, entry.name)
|
||||
end
|
||||
local request = {
|
||||
units = units
|
||||
}
|
||||
app.delete_world_content(content_report.world, request, true)
|
||||
end
|
||||
|
||||
function on_open(report)
|
||||
content_report = report
|
||||
for i, entry in ipairs(report.content) do
|
||||
document.content_panel:add(gui.template("content_entry", entry))
|
||||
end
|
||||
|
|
|
|||
|
|
@ -410,7 +410,7 @@ require("core:io_stream").wrap_bytearray = require "core:internal/stream_provide
|
|||
|
||||
network.__as_stream = require "core:internal/stream_providers/socket"
|
||||
|
||||
math.randomseed(time.uptime() * 1536227939)
|
||||
math.randomseed(time.precise_utc_time())
|
||||
|
||||
rules = require "core:internal/rules"
|
||||
time.schedules = {}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ error.dependency-version-not-met=Dependency pack version is not met.
|
|||
world.delete-confirm=Do you want to delete world forever?
|
||||
world.generators.default=Default
|
||||
world.generators.flat=Flat
|
||||
world.delete-content-confirm=Delete missing content from the world __**(irreversible)**__?
|
||||
|
||||
editor.info.tooltip=CTRL+S - Save\nCTRL+R - Run\nCTRL+Z - Undo\nCTRL+Y - Redo
|
||||
devtools.traceback=Traceback (most recent call first)
|
||||
|
|
|
|||
|
|
@ -81,6 +81,8 @@ world.upgrade-request=Формат мира устарел! Конвертиро
|
|||
world.convert-with-loss=Конвертировать мир с потерями?
|
||||
world.convert-block-layouts=Есть изменения в полях блоков! Конвертировать мир?
|
||||
world.delete-confirm=Удалить мир безвозвратно?
|
||||
world.Delete Content=Удалить контент
|
||||
world.delete-content-confirm=Удалить отсутствующий контент из мира __**(безвозвратно)**__?
|
||||
|
||||
# Настройки
|
||||
settings.Ambient=Фон
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue