From f6a2fdf4284fc4f08822ecb36295e9bf0278e4a3 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Tue, 2 Mar 2021 03:54:16 -0500 Subject: [PATCH] move 3d printers to home_workshop_machines mod and fix-up translation details (hopefully :P ) --- computers/README.txt | 2 -- computers/aliases.lua | 2 -- computers/init.lua | 1 - computers/locale/computers.de.tr | 6 +---- computers/locale/computers.es.tr | 6 +---- computers/locale/computers.fr.tr | 6 +---- computers/locale/computers.it.tr | 6 +---- computers/locale/computers.ms.tr | 6 +---- computers/locale/computers.pt.tr | 6 +---- computers/locale/computers.pt_BR.tr | 6 +---- computers/locale/computers.ru.tr | 6 +---- computers/locale/computers.zh_CN.tr | 6 +---- computers/locale/template.txt | 6 +---- computers/mod.conf | 2 +- .../init.lua | 25 +++++++++++------- .../locale/home_workshop_machines.de.tr | 6 +++++ home_workshop_machines/locale/template.txt | 6 +++++ home_workshop_machines/mod.conf | 3 +++ ...workshop_machines_3dprinter_bedflinger.obj | 0 ...ome_workshop_machines_3dprinter_corexy.obj | 0 .../home_workshop_machines_3dprinter.png | Bin ...shop_machines_3dprinter_bedflinger_inv.png | Bin ...e_workshop_machines_3dprinter_filament.png | Bin 23 files changed, 41 insertions(+), 66 deletions(-) rename computers/printers.lua => home_workshop_machines/init.lua (57%) create mode 100644 home_workshop_machines/locale/home_workshop_machines.de.tr create mode 100644 home_workshop_machines/locale/template.txt create mode 100644 home_workshop_machines/mod.conf rename computers/models/computers_3dprinter_bedflinger.obj => home_workshop_machines/models/home_workshop_machines_3dprinter_bedflinger.obj (100%) rename computers/models/computers_3dprinter_corexy.obj => home_workshop_machines/models/home_workshop_machines_3dprinter_corexy.obj (100%) rename computers/textures/computers_3dprinter.png => home_workshop_machines/textures/home_workshop_machines_3dprinter.png (100%) rename computers/textures/computers_3dprinter_bedflinger_inv.png => home_workshop_machines/textures/home_workshop_machines_3dprinter_bedflinger_inv.png (100%) rename computers/textures/computers_3dprinter_filament.png => home_workshop_machines/textures/home_workshop_machines_3dprinter_filament.png (100%) diff --git a/computers/README.txt b/computers/README.txt index a8ab9af..f7fccde 100644 --- a/computers/README.txt +++ b/computers/README.txt @@ -35,8 +35,6 @@ These are the items currently defined by this mod: "computers:server", "computers:server_on", "computers:printer", -"computers:3dprinter_bedflinger", -"computers:3dprinter_corexy", "computers:tetris_arcade", There's also a `computers:computer' alias to `computers:babytower'. diff --git a/computers/aliases.lua b/computers/aliases.lua index 9499796..bd3e1fd 100644 --- a/computers/aliases.lua +++ b/computers/aliases.lua @@ -21,6 +21,4 @@ minetest.register_alias("computer:tower_on", "computers:tower") minetest.register_alias("computer:server", "computers:server") minetest.register_alias("computer:server_on", "computers:server_on") minetest.register_alias("computer:printer", "computers:printer") -minetest.register_alias("computer:3dprinter_bedflinger", "computers:3dprinter_bedflinger") -minetest.register_alias("computer:3dprinter_corexy", "computers:3dprinter_corexy") minetest.register_alias("computer:tetris_arcade", "computers:tetris_arcade") diff --git a/computers/init.lua b/computers/init.lua index f422620..c017277 100644 --- a/computers/init.lua +++ b/computers/init.lua @@ -93,7 +93,6 @@ end local MODPATH = minetest.get_modpath("computers") dofile(MODPATH.."/computers.lua") -dofile(MODPATH.."/printers.lua") dofile(MODPATH.."/recipes.lua") dofile(MODPATH.."/gaming.lua") dofile(MODPATH.."/aliases.lua") diff --git a/computers/locale/computers.de.tr b/computers/locale/computers.de.tr index 437c64d..0d0485c 100644 --- a/computers/locale/computers.de.tr +++ b/computers/locale/computers.de.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter=Z Inspektor SheFriendSOO=Freundin S00 Snapple Piepad=Apfel-Ei-Pat WIFI Router=WiFi-Router - -### printers.lua ### - -3D Printer ("bedflinger")=3D Drucker ("Bettschubser") Printer-Scanner Combo=Multifunktionsdrucker ### tetris.lua ### diff --git a/computers/locale/computers.es.tr b/computers/locale/computers.es.tr index 66ec244..f0d5a4d 100644 --- a/computers/locale/computers.es.tr +++ b/computers/locale/computers.es.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=Enrutador WIFI - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=Impresora y escáner combinados ### tetris.lua ### diff --git a/computers/locale/computers.fr.tr b/computers/locale/computers.fr.tr index 4b170d9..91784b4 100644 --- a/computers/locale/computers.fr.tr +++ b/computers/locale/computers.fr.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=Routeur WiFi - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=Imprimante multi-fonction ### tetris.lua ### diff --git a/computers/locale/computers.it.tr b/computers/locale/computers.it.tr index b8a72ee..0a639cb 100644 --- a/computers/locale/computers.it.tr +++ b/computers/locale/computers.it.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router= - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo= ### tetris.lua ### diff --git a/computers/locale/computers.ms.tr b/computers/locale/computers.ms.tr index 89841cc..e33788e 100644 --- a/computers/locale/computers.ms.tr +++ b/computers/locale/computers.ms.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=Penghala WIFI - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=Pencetak Semua Dalam Satu ### tetris.lua ### diff --git a/computers/locale/computers.pt.tr b/computers/locale/computers.pt.tr index f2824ed..caad3ce 100644 --- a/computers/locale/computers.pt.tr +++ b/computers/locale/computers.pt.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=Roteador WIFI - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=Tudo em Um Impressora-Scaner ### tetris.lua ### diff --git a/computers/locale/computers.pt_BR.tr b/computers/locale/computers.pt_BR.tr index f2824ed..caad3ce 100644 --- a/computers/locale/computers.pt_BR.tr +++ b/computers/locale/computers.pt_BR.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=Roteador WIFI - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=Tudo em Um Impressora-Scaner ### tetris.lua ### diff --git a/computers/locale/computers.ru.tr b/computers/locale/computers.ru.tr index 3e835f2..a5cca85 100644 --- a/computers/locale/computers.ru.tr +++ b/computers/locale/computers.ru.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=WIFI-роутер - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=МФУ ### tetris.lua ### diff --git a/computers/locale/computers.zh_CN.tr b/computers/locale/computers.zh_CN.tr index c725e41..b4c6729 100644 --- a/computers/locale/computers.zh_CN.tr +++ b/computers/locale/computers.zh_CN.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=无线路由器 - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=打印扫描一体机 ### tetris.lua ### diff --git a/computers/locale/template.txt b/computers/locale/template.txt index 2e84c9b..ce997f6 100644 --- a/computers/locale/template.txt +++ b/computers/locale/template.txt @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router= - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo= ### tetris.lua ### diff --git a/computers/mod.conf b/computers/mod.conf index a9a844b..64381f0 100644 --- a/computers/mod.conf +++ b/computers/mod.conf @@ -1,3 +1,3 @@ name = computers -depends = default, basic_materials, unifieddyes +depends = default, basic_materials optional_depends = screwdriver diff --git a/computers/printers.lua b/home_workshop_machines/init.lua similarity index 57% rename from computers/printers.lua rename to home_workshop_machines/init.lua index 50abf25..3089440 100644 --- a/computers/printers.lua +++ b/home_workshop_machines/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("computers") +local S = minetest.get_translator("home_workshop_machines") -- "bedflinger" style 3D Printer (Prusa i3 or equivalent) @@ -7,19 +7,19 @@ local cbox = { fixed = {-0.25, -0.25, -0.5, 0.3, 0.3, 0.25 } } -minetest.register_node("computers:3dprinter_bedflinger", { +minetest.register_node("home_workshop_machines:3dprinter_bedflinger", { description = S('3D Printer ("bedflinger" design)'), - inventory_image = "computers_3dprinter_bedflinger_inv.png", + inventory_image = "home_workshop_machines_3dprinter_bedflinger_inv.png", tiles = { - { name = "computers_3dprinter.png", color = 0xffffffff }, - "computers_3dprinter_filament.png" + { name = "home_workshop_machines_3dprinter.png", color = 0xffffffff }, + "home_workshop_machines_3dprinter_filament.png" }, paramtype = "light", walkable = true, groups = {snappy=3, ud_param2_colorable = 1}, sound = default.node_sound_wood_defaults(), drawtype = "mesh", - mesh = "computers_3dprinter_bedflinger.obj", + mesh = "home_workshop_machines_3dprinter_bedflinger.obj", paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", selection_box = cbox, @@ -38,18 +38,18 @@ cbox = { fixed = {-0.4375, -0.5, -0.5, 0.4375, 0.5, 0.375 } } -minetest.register_node("computers:3dprinter_corexy", { +minetest.register_node("home_workshop_machines:3dprinter_corexy", { description = S('3D Printer (CoreXY design)'), tiles = { - { name = "computers_3dprinter.png", color = 0xffffffff }, - "computers_3dprinter_filament.png" + { name = "home_workshop_machines_3dprinter.png", color = 0xffffffff }, + "home_workshop_machines_3dprinter_filament.png" }, paramtype = "light", walkable = true, groups = {snappy=3, ud_param2_colorable = 1}, sound = default.node_sound_wood_defaults(), drawtype = "mesh", - mesh = "computers_3dprinter_corexy.obj", + mesh = "home_workshop_machines_3dprinter_corexy.obj", paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", selection_box = cbox, @@ -60,3 +60,8 @@ minetest.register_node("computers:3dprinter_corexy", { on_dig = unifieddyes.on_dig, on_rotate = unifieddyes.fix_after_screwdriver_nsew, }) + +minetest.register_alias("computer:3dprinter_bedflinger", "home_workshop_machines:3dprinter_bedflinger") +minetest.register_alias("computers:3dprinter_bedflinger", "home_workshop_machines:3dprinter_bedflinger") +minetest.register_alias("computer:3dprinter_corexy", "home_workshop_machines:3dprinter_corexy") +minetest.register_alias("computers:3dprinter_corexy", "home_workshop_machines:3dprinter_corexy") diff --git a/home_workshop_machines/locale/home_workshop_machines.de.tr b/home_workshop_machines/locale/home_workshop_machines.de.tr new file mode 100644 index 0000000..11ac392 --- /dev/null +++ b/home_workshop_machines/locale/home_workshop_machines.de.tr @@ -0,0 +1,6 @@ +# textdomain: home_workshop_machines + +### init.lua ### + +3D Printer ("bedflinger" design)=3D Drucker ("Bettschubser") +3D Printer (CoreXY design)= diff --git a/home_workshop_machines/locale/template.txt b/home_workshop_machines/locale/template.txt new file mode 100644 index 0000000..cbf2dbf --- /dev/null +++ b/home_workshop_machines/locale/template.txt @@ -0,0 +1,6 @@ +# textdomain: home_workshop_machines + +### init.lua ### + +3D Printer ("bedflinger" design)= +3D Printer (CoreXY design)= diff --git a/home_workshop_machines/mod.conf b/home_workshop_machines/mod.conf new file mode 100644 index 0000000..9371db0 --- /dev/null +++ b/home_workshop_machines/mod.conf @@ -0,0 +1,3 @@ +name = home_workshop_machines +depends = default, unifieddyes +optional_depends = screwdriver diff --git a/computers/models/computers_3dprinter_bedflinger.obj b/home_workshop_machines/models/home_workshop_machines_3dprinter_bedflinger.obj similarity index 100% rename from computers/models/computers_3dprinter_bedflinger.obj rename to home_workshop_machines/models/home_workshop_machines_3dprinter_bedflinger.obj diff --git a/computers/models/computers_3dprinter_corexy.obj b/home_workshop_machines/models/home_workshop_machines_3dprinter_corexy.obj similarity index 100% rename from computers/models/computers_3dprinter_corexy.obj rename to home_workshop_machines/models/home_workshop_machines_3dprinter_corexy.obj diff --git a/computers/textures/computers_3dprinter.png b/home_workshop_machines/textures/home_workshop_machines_3dprinter.png similarity index 100% rename from computers/textures/computers_3dprinter.png rename to home_workshop_machines/textures/home_workshop_machines_3dprinter.png diff --git a/computers/textures/computers_3dprinter_bedflinger_inv.png b/home_workshop_machines/textures/home_workshop_machines_3dprinter_bedflinger_inv.png similarity index 100% rename from computers/textures/computers_3dprinter_bedflinger_inv.png rename to home_workshop_machines/textures/home_workshop_machines_3dprinter_bedflinger_inv.png diff --git a/computers/textures/computers_3dprinter_filament.png b/home_workshop_machines/textures/home_workshop_machines_3dprinter_filament.png similarity index 100% rename from computers/textures/computers_3dprinter_filament.png rename to home_workshop_machines/textures/home_workshop_machines_3dprinter_filament.png