Merge branch 'master' into nalc-1.2

2019-05-04 19:25:15 +02:00
parent 5d4c64d3b2 854e96d4c0
commit 1520d27a73
834 changed files with 5613 additions and 5985 deletions
--- a/plasmascreen/README.md
+++ b/plasmascreen/README.md
@ -12,5 +12,3 @@ the mod may occasionally refuse to place it (or it just appears for a moment).
 Just move over a bit, so that your target position is more directly in front
 of you.

-Code, textures and model are WTFPL.
-
--- a/plasmascreen/depends.txt
+++ b/plasmascreen/depends.txt
@ -1,2 +1,3 @@
 default
-homedecor
+homedecor_common
+homedecor_electronics
--- a/plasmascreen/init.lua
+++ b/plasmascreen/init.lua
@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 screwdriver = screwdriver or {}