Upstream merge.

This commit is contained in:
md_5
2015-01-05 14:32:01 +11:00
committed by Zach Brown
parent 6ae735e2e3
commit 384699a51a
188 changed files with 247 additions and 253 deletions

View File

@@ -1,4 +1,4 @@
From d57e434364dc3456966f6837c2bf0258170d3613 Mon Sep 17 00:00:00 2001
From 687b9034da295f5f73a587e926cea6bdbae5a14b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 10 Jan 2014 15:15:50 +1100
Subject: [PATCH] Fix ItemStack Unbreakable Code