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/itemframes/depends.txt
+++ b/itemframes/depends.txt
@ -1,3 +1,3 @@
 default
-homedecor_i18n
+homedecor_common
 mesecons_mvps?
--- a/itemframes/init.lua
+++ b/itemframes/init.lua
@ -1,5 +1,5 @@

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

 local tmp = {}
 screwdriver = screwdriver or {}