misc stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/jared/mysticaltrinkets/blocks/BlockPortal.java
	src/main/java/com/jared/mysticaltrinkets/blocks/MysticalBlocks.java
	src/main/java/com/jared/mysticaltrinkets/items/MysticalItems.java

	src/main/java/com/jared/mysticaltrinkets/items/armor/ItemMysticalBoots.java

	src/main/java/com/jared/mysticaltrinkets/items/armor/ItemMysticalChestplate.java

	src/main/java/com/jared/mysticaltrinkets/items/armor/ItemMysticalHelmet.java

	src/main/java/com/jared/mysticaltrinkets/items/armor/ItemMysticalLeggings.java
	src/main/java/com/jared/mysticaltrinkets/items/tools/MysticalTools.java
	src/main/java/com/jared/mysticaltrinkets/proxies/ClientProxy.java
	src/main/resources/assets/mysticaltrinkets/textures/items/Thumbs.db