From 0c60dcb264966e6e48008aff2a5907ac81ccf4e7 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Fri, 25 Dec 2020 23:33:25 +0800
Subject: [PATCH] =?UTF-8?q?0.12.X:=20=E5=9C=A3=E8=AF=9E=E5=BF=AB=E4=B9=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf.lua            |  4 ++--
 parts/updateLog.lua | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/conf.lua b/conf.lua
index 45351076..2883edf3 100644
--- a/conf.lua
+++ b/conf.lua
@@ -1,5 +1,5 @@
-VERSION_CODE=1225
-VERSION_NAME="Alpha V0.12.25"
+VERSION_CODE=1226
+VERSION_NAME="Alpha V0.12.X"
 love.setDeprecationOutput(false)
 function love.conf(t)
 	t.identity="Techmino"--Saving folder
diff --git a/parts/updateLog.lua b/parts/updateLog.lua
index 0ba35047..5f32b0cb 100644
--- a/parts/updateLog.lua
+++ b/parts/updateLog.lua
@@ -45,6 +45,17 @@ local S=[=[
 				任意尺寸屏幕的UI; 3D背景
 				热更新; 工程编译到字节码; 超60帧; 跳帧开关
 
+0.12.X: 圣诞快乐 Merry Christmas
+		新增:
+				新增BGM:mXmas
+		改动:
+				调整magicblock的音质
+				升级i2的踢墙表
+		修复:
+				o1旋转后锁定报错
+				自定义模式开ai报错
+				非20G高重力块穿模
+
 0.12.25: N连块 N-mino
 		新增:
 				加入1~3连块