Merge commit 'df089a2f04fc44774e8dc722cc5d9948f94e5de5' into HEAD

Zframework/image.lua

@@ -2,7 +2,6 @@ local IMG={}
 function IMG.init(list)
     IMG.init=nil
 
-    local null=love.graphics.newCanvas(1,1)
     setmetatable(IMG,{__index=function(self,name)
         if type(list[name])=='table'then
             self[name]={}
@@ -13,7 +12,7 @@ function IMG.init(list)
             self[name]=love.graphics.newImage(list[name])
         else
             LOG("No IMG: "..name)
-            self[name]=null
+            self[name]=PAPER
         end
         return self[name]
     end})

Zframework/init.lua

@@ -1,4 +1,4 @@
-NONE={}function NULL()end
+NONE={}function NULL()end PAPER=love.graphics.newCanvas(1,1)
 EDITING=""
 LOADED=false
 

main.lua

@@ -117,7 +117,7 @@ MODES={}--Loaded modes and information
 
 setmetatable(TEXTURE,{__index=function(self,k)
     MES.new('warn',"No texture called: "..k)
-    self[k]=love.graphics.newCanvas(1,1)
+    self[k]=PAPER
     return self[k]
 end})
 

parts/RSlist.lua

@@ -376,8 +376,8 @@ do
             },--R
             false,--Y
             {
-                [01]={'+0+0','-1+0','-1+1','+0+1','+1+0','-1+2','-2+0','+0-2'},
+                [01]={'+0+0','-1+0','-1+1','+0+1','+1+0','+1+1','-1+2','-2+0','+0-2'},
-                [10]={'+0+0','+1+0','-1+0','+0-1','+1-1','+1-2','+2+0','+0+2'},
+                [10]={'+0+0','+1+0','-1+0','+0-1','-1-1','+1-1','+1-2','+2+0','+0+2'},
                 [03]={'+0+0','-1+0','+1-1','+0-2','+0-3','+1+0','+1-2','+1-3','+0+1','-1+1'},
                 [30]={'+0+0','-1+0','+1-1','+1-2','+1+0','+0-2','+1-3','-1+2','+0+3','-1+3'},
                 [12]={'+0+0','-1+0','+1-1','-1-1','+1-2','+1+0','+0-2','+1-3','-1+2','+0+3','-1+3'},

parts/language/lang_en.lua

@@ -848,9 +848,9 @@ return{
         "Soon you'll be able to play against friends and foes all over the world.",
         "Split clear coming soon!",
         "sudo rm -rf /*",
-        "Techmino is a combination of Technique and Tetromino.",
+        "Techmino is a portmanteau of \"technique\" and \"tetromino\".",
-        "Techmino has a Nspire-CX edition!",
         "Techmino is so fun!",
+        "Techmino on Nspire-CX: yes it exists, no it's not the same game.",
         "TetroDictionary is now available in English.",
         "Most of the music tracks in this game are made using Beepbox.",
         "The names that appeared in the background of the Staff page is a list of our sponsors.",
@@ -872,7 +872,7 @@ return{
         "You can connect a keyboard to your phone or tablet (not functional on iOS though).",
         "You can customize the key mappings in settings!",
         "You can open the save directory from the Stats page.",
-        "You can perform a spin with 28 of the 29 minoes in this game; the exception being O1.",
+        "You can perform a spin with all of the minoes in this game.",
         "You can set the spawning orientation for each piece.",
         "ZS JL T O I",
         {C.C,"Also try 15puzzle!"},

parts/language/lang_zh.lua

@@ -794,6 +794,7 @@ return{
         "报时机器人：新的一天开始了",
         "本游戏还在测试中，出各种问题都是有可能的哦",
         "本游戏使用精简版字体，可能有些特殊字符不能正确显示",
+        "别催了，在做了！",
         "不要大力拍打或滑动哦",
         "不要卖弱不要卖弱不要卖弱",
         "不知道有多少人玩游戏的时候会关心游戏是谁做的",
@@ -801,9 +802,7 @@ return{
         "彩色消除即将到来！",
         "草（日本语）",
         "车万方块是一家（暴论",
-        "成就系统在做了！",
         "吃键？真的吗？建议回放看看到底按没按到，按了多久",
-        "触摸板打osu也很好！",
         "凑数tip什么时候能站起来！",
         "打铁.png",
         "打铁",
@@ -852,8 +851,9 @@ return{
         "你今天的人品值是(满分100):"..math.random(100),
         "你们考虑过Z酱的感受吗？没有！你们只考虑你自己。",
         "你有一个好",
-        "你这场地是金子堆的还是块是金子做的",
+        "你这块是金子做的还是垃圾行是金子做的",
         "你准备好了吗？",
+        "配乐是有考虑到模式氛围的哦",
         "请谨慎向没有方块经验的玩家推荐，会对本游戏的生存环境造成影响，感谢配合。",
         "请勿大力敲打设备！敲坏了就没有Techmino玩了",
         "请勿使用三只手游玩",
@@ -880,7 +880,6 @@ return{
         "物理hold了解一下",
         "希望极简率没事",
         "希望你们都能喜欢Z……哦不是，喜欢Techmino",
-        "喜欢本游戏的话可以到应用商店下载",
         "享受Tech的特色旋转系统！",
         "写不出那种很酷的音乐(哭",
         "要盯着bug不放",
@@ -896,7 +895,7 @@ return{
         "中文方块百科全书：tetris.huijiwiki.com",
         "众所周知俄罗斯方块是经典编程练手游戏(？",
         "众所周知mac不能拿来玩游戏",
-        "作业都没做完别玩手机",
+        "作业没做完别玩手机",
         "作者40行sub26了",
         "作者电脑上装了11个方块",
         "作者浏览器收藏夹里有6个方块",