Merge branch '1.7/dev' of https://github.com/Chisel-Team/Chisel into 1.7/dev

changelog

@@ -3,7 +3,6 @@ New
 - Lots of new endstone variants
 - Purpur blocks
 - New technical blocks (piping, battery, and more)
-
 Changes
 - Under new management! Name of the project has been changed to "Chisel"
 - Now includes CTMLib 1.2.0-10
@@ -12,7 +11,6 @@ Changes
 - Removed special player rendering
 - Fixed EMC registrations so that they are actually dynamic
 - Lavastone and Waterstone now use the still texture, not flowing
-
 Fixes
 - Fix "The Turkey Bug"
 - Fix crash when an unchiselable item made its way into the autochisel
@@ -20,7 +18,6 @@ Fixes
 - Fix antiblocks not working when smooth lighting is off
 - Fix Botania compat
 - Fix pick block on bookshelves
-
 API
 - Add IConnectable for allowing other blocks to determine if chisel blocks will connect to them