From a9d06e6cfaca305d4fbc2ac6164b1f16403070e3 Mon Sep 17 00:00:00 2001
From: darkrose <lisa@ltmnet.com>
Date: Wed, 4 Dec 2013 22:17:32 +1000
Subject: [PATCH] 1312.00

---
 CMakeLists.txt    |  4 ++--
 doc/changelog.txt | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a9cabe..0317c9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,8 +8,8 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 project(minetest-classic)
 
 # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
-set(VERSION_MAJOR 1311)
-set(VERSION_MINOR 01)
+set(VERSION_MAJOR 1312)
+set(VERSION_MINOR 00)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}")
 
 MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 9751465..2863101 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,39 @@ Minetest-c55 changelog
 This should contain all the major changes.
 For minor stuff, refer to the commit log of the repository.
 
+1312.00: (release 2014-12-04)
+- added http transfer of player skins (buggy, but easier to debug in use)
+- add snow biome at y = 60-200, damage player in cold unless near fire
+- add conifer trees in snow biome
+- allow facedir nodes to also propogate light - no more dark doorways
+- add lava cooling to roughstone and ores when near water (Menche)
+- add dig animation to player
+- fix some wield items
+- add tables, chairs, and beds
+- fix upside down stair/slab placement
+- water freezes to ice in the cold band, melts back to water down low
+- add a basic in-game craft guide
+- add crowbar tool to rotate nodes without losing metadata
+- make 0.3.x show a warning when connecting to classic servers
+- enable smooth lighting for nodeboxes and some special draw types
+- add incinerator for disposing of inventory items
+- increase infotext length slightly
+- complete rewrite of crafting, craftitems, and toolitems
+- make fences and walls not jumpable
+- assorted code cleanups
+- make mese glow slightly when digging
+- pretty up tool progress bars
+- some fixes to new style water
+- give apple trees their own wood and leaves
+- make regular and large trees bigger
+- make trimmed leaves for all 4 leaf types (conifer,regular,apple,jungle)
+- add plank craftitem, replace sticks/wood with plank on most recipes
+- craft sticks from leaves
+- some meshgen improvements
+- let firestarter start fire on lava
+- make nodeboxes align with texture pixels
+- make cobble grow moss when underwater
+
 1311.01: (release 2013-11-14)
 - prevent water being placed inside doors
 - stop fire only burning half of doors