修正merge

conf.lua

@@ -35,5 +35,5 @@ function love.conf(t)
 	M.math,M.data=true,true
 	M.timer,M.graphics,M.font,M.image=true,true,true,true
 	M.mouse,M.touch,M.keyboard,M.joystick=true,true,true,true
-	M.physics,M.thread,M.video=false,true,false
+	M.physics,M.thread,M.video=false,false,false
 end

parts/globalTables.lua

@@ -282,16 +282,6 @@ SETTING={
 	VKAlpha=.3,
 }
 
-ACCOUNT={
-	email=nil,
-	auth_token=nil,
-	access_token=nil,
-
-	username=nil,
-	motto=nil,
-	avatar=nil,
-}
-
 STAT={
 	version=VERSION_NAME,
 	run=0,game=0,time=0,
@@ -310,11 +300,13 @@ for i=1,25 do
 end
 
 ACCOUNT={
+	email=nil,
+	auth_token=nil,
+	access_token=nil,
+
 	username=nil,
 	motto=nil,
 	avatar=nil,
-	auth_token=nil,
-	access_token=nil
 }
 
 keyMap={

parts/tick.lua

@@ -157,7 +157,6 @@ function Tick.httpREQ_newLogin(data)
 			local success,content=json.decode(response.body)
 			if success then
 				LOG.print(text.loginSuccessed..": "..content.message)
-				local _success,_content=json.decode(data)
 				ACCOUNT.email=_content.email
 				ACCOUNT.auth_token=content.auth_token
 				FILE.save(ACCOUNT,"account","")