From dc9546a684cacc7ed23c2d54e8482b535a3a49b2 Mon Sep 17 00:00:00 2001
From: Luke Puchner-Hardman <x.lukk3.x@gmail.com>
Date: Tue, 23 Sep 2014 14:39:34 +0200
Subject: [PATCH] Added "[sheet" to the texture special commands.

"[sheet:WxH:X,Y" assumes the base image is a tilesheet with W*H tiles on it and crops to the tile at position X,Y.
Basically it works like "[verticalframe" but in 2d.
For testing, I combined the four default_chest images into one.
---
 src/tile.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/tile.cpp b/src/tile.cpp
index 03114324e..d2b88a79c 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -1590,7 +1590,6 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			}
 		}
 		/*
-<<<<<<< HEAD
 			[colorize:color
 			Overlays image with given color
 			color = color as ColorString