From 679085b520f32e898a88823b1c2d23a12a1764f1 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun, 18 Aug 2013 00:33:14 +0100
Subject: Bugfix Update [SEE DESC}

Added stained clay, coal block, and hardened clay Block IDs
Added stained clay and carpet block Metas
Fixed bug with sticky retract bailing out but not unsetting arm
Fixed autocomplete not working when not at the first character, fixes
#64
Added furnace recipes for hardened clay and coal and coal blocks
---
 MCServer/furnace.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/furnace.txt b/MCServer/furnace.txt
index e5d4ca70f..31d265ce7 100644
--- a/MCServer/furnace.txt
+++ b/MCServer/furnace.txt
@@ -48,6 +48,7 @@
 363:1 @ 200 = 364:1    # 1 Raw Beef     -> 1 Cooked Beef (steak)
 365:1 @ 200 = 366:1    # 1 Raw Chicken  -> 1 Cooked Chicken
 337:1 @ 200 = 336:1    # 1 Clay         -> 1 Clay Brick
+82:1  @ 200 = 172:1    # 1 Clay Block   -> 1 Hardened Clay
 87:1  @ 200 = 405:1    # 1 NetherRack   -> 1 NetherBrick
 349:1 @ 200 = 350:1    # 1 Raw Fish     -> 1 Cooked Fish
 17:1  @ 200 = 263:1:1  # 1 Log          -> 1 Charcoal
@@ -60,7 +61,8 @@
 #--------------------------
 # Fuels
 
-! 263:1    = 1600   # 1 Charcoal       -> 80 sec
+! 263:1    = 1600   # 1 Coal           -> 80 sec
+! 263:1:1  = 1600   # 1 Charcoal       -> 80 sec
 ! 42:126:1 = 150    # 1 Halfslab       -> 7.5 seconds
 ! 5:1      = 300    # 1 Planks         -> 15 sec
 ! 280:1    = 100    # 1 Stick          -> 5 sec
@@ -73,3 +75,4 @@
 ! 327:1    = 200000 # 1 Lava Bucket    -> 1000 sec
 ! 17:1     = 300    # 1 Wood           -> 15 sec
 ! 6:1      = 100    # 1 Sapling        -> 5 sec
+! 173:1    = 7400   # 1 Coal Block     -> 370 sec, based on https://github.com/minetest/common/commit/e0f5a6fd6936052756e27a05a2bfdd6aa86b38e1 which is a clone of MC
\ No newline at end of file
-- 
cgit v1.2.3


From 9e0b8b5bee6fec15df846334cffc2d8e913c0328 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun, 18 Aug 2013 11:58:19 +0100
Subject: Enhancements to Tabcompletion and Compile Fix

Tab complete now finds the last word and matches accordingly, with a 20%
increase in speed!
Fixed missing comma breaking compilation
---
 MCServer/Plugins/TransAPI | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 MCServer/Plugins/TransAPI

(limited to 'MCServer')

diff --git a/MCServer/Plugins/TransAPI b/MCServer/Plugins/TransAPI
deleted file mode 160000
index 52e1de433..000000000
--- a/MCServer/Plugins/TransAPI
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 52e1de4332a026e58fda843aae98c1f51e57199e
-- 
cgit v1.2.3