diff --git a/Applications/3D Print.app/Main.lua b/Applications/3D Print.app/Main.lua index 5768735f..f562809e 100644 --- a/Applications/3D Print.app/Main.lua +++ b/Applications/3D Print.app/Main.lua @@ -71,7 +71,8 @@ end -------------------------------------------------------------------------------- -local localization = system.getCurrentScriptLocalization() +local currentScriptDirectory = filesystem.path(system.getCurrentScript()) +local localization = system.getLocalization(currentScriptDirectory .. "Localizations/") local currentLayer = 0 local model local savePath @@ -661,11 +662,7 @@ end -------------------------------------------------------------------------------- -if args[1] and options.o then - load(args[1]) -else - new() -end +load(options.o and args[1] or (currentScriptDirectory .. "Sample.3dm")) window:resize(window.width, window.height) workspace:draw() diff --git a/Applications/3D Print.app/Sample.3dm b/Applications/3D Print.app/Sample.3dm new file mode 100644 index 00000000..489d71de --- /dev/null +++ b/Applications/3D Print.app/Sample.3dm @@ -0,0 +1,27 @@ +{ + label = "Beer", + tooltip = "Cold wheat beer... mmmmm", + shapes = { + { 0, 0, 2, 7, 1, 5, texture = "minecraft:blocks/log_spruce" }, + { 1, 0, 1, 6, 1, 6, texture = "minecraft:blocks/log_spruce" }, + { 2, 0, 0, 5, 1, 7, texture = "minecraft:blocks/log_spruce" }, + { 0, 1, 2, 1, 7, 5, texture = "minecraft:blocks/log_spruce" }, + { 1, 1, 1, 2, 7, 2, texture = "minecraft:blocks/log_spruce" }, + { 1, 1, 5, 2, 7, 6, texture = "minecraft:blocks/log_spruce" }, + { 2, 1, 0, 5, 7, 1, texture = "minecraft:blocks/log_spruce" }, + { 2, 1, 6, 5, 7, 7, texture = "minecraft:blocks/log_spruce" }, + { 5, 1, 1, 6, 7, 2, texture = "minecraft:blocks/log_spruce" }, + { 5, 1, 5, 6, 7, 6, texture = "minecraft:blocks/log_spruce" }, + { 6, 1, 2, 7, 7, 5, texture = "minecraft:blocks/log_spruce" }, + { 7, 1, 3, 9, 2, 4, texture = "minecraft:blocks/stone" }, + { 5, 2, 0, 6, 8, 1, texture = "minecraft:blocks/snow", tint = 16771749 }, + { 6, 2, 1, 7, 8, 2, texture = "minecraft:blocks/snow", tint = 16771749 }, + { 8, 2, 3, 9, 6, 4, texture = "minecraft:blocks/stone" }, + { 7, 5, 3, 9, 6, 4, texture = "minecraft:blocks/stone" }, + { 1, 6, 2, 6, 7, 5, texture = "minecraft:blocks/snow", tint = 16771749 }, + { 2, 6, 1, 5, 8, 5, texture = "minecraft:blocks/snow", tint = 16771749 }, + { 2, 6, 5, 5, 7, 6, texture = "minecraft:blocks/snow", tint = 16771749 }, + { 3, 7, 0, 6, 8, 5, texture = "minecraft:blocks/snow", tint = 16771749 }, + { 3, 8, 1, 6, 9, 4, texture = "minecraft:blocks/snow", tint = 16771749 } + } +} \ No newline at end of file diff --git a/Installer/Files.cfg b/Installer/Files.cfg index 760d1e74..03dfdb12 100644 --- a/Installer/Files.cfg +++ b/Installer/Files.cfg @@ -48,6 +48,7 @@ { path="Libraries/Compressor.lua", id=1079 }, { path="Libraries/SHA-256.lua", id=104 }, { path="Libraries/Internet.lua", id=1095 }, + { path="Libraries/BigLetters.lua", id=391 }, -- Scripts { path="OS.lua", id=106 }, -- System icons @@ -143,6 +144,7 @@ -- 3D Print { path="Applications/3D Print.app/Main.lua", id=859, shortcut = true }, "Applications/3D Print.app/Icon.pic", + "Applications/3D Print.app/Sample.3dm", "Applications/3D Print.app/Localizations/English.lang", "Applications/3D Print.app/Localizations/Russian.lang", "Applications/3D Print.app/Localizations/French.lang", @@ -152,7 +154,6 @@ }, optional = { { path="Libraries/JSON.lua", id=103 }, - { path="Libraries/BigLetters.lua", id=391 }, "Libraries/MeowEngine/Main.lua", "Libraries/OpenComputersGL/Main.lua", "Libraries/OpenComputersGL/Renderer.lua",