4 Commits

Author	SHA1	Message	Date
Zach Brown	fe913c51c4	Update upstream CB	2016-12-22 15:06:59 -06:00
Zach Brown	a4152b2ad1	Fix missed diff causing lava to move too quickly ... Missed diff from old patch file was causing lava to always move at the faster 'nether' speed, ignoring the slower overworld speed entirely. This is why we use obfuscation helpers now. Fixes GH-521	2016-12-21 15:29:50 -06:00
Zach Brown	f099ddc99e	Fix a merge conflict that was resolved improperly	2016-12-20 18:01:37 -06:00
Zach Brown	33163525f3	Update Paper to MC 1.11.1	2016-12-20 17:45:00 -06:00